Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (revision 32890) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (revision 32891) @@ -36,5 +36,4 @@ import org.wikipedia.data.WikidataEntry; import org.wikipedia.data.WikipediaEntry; -import org.wikipedia.data.WikipediaLangArticle; import org.wikipedia.tools.XPath; @@ -153,5 +152,5 @@ final String url = "https://tools.wmflabs.org/wiwosm/osmjson/getGeoJSON.php?action=check&lang=" + wikipediaLang; try { - final String articles = entries.stream().map(i -> i.wikipediaArticle).collect(Collectors.joining(",")); + final String articles = entries.stream().map(i -> i.article).collect(Collectors.joining(",")); final String requestBody = "articles=" + Utils.encodeUrl(articles); try (final BufferedReader reader = HttpClient.create(new URL(url), "POST").setReasonForRequest("Wikipedia") @@ -174,5 +173,5 @@ } for (WikipediaEntry i : entries) { - i.setWiwosmStatus(status.get(i.wikipediaArticle)); + i.setWiwosmStatus(status.get(i.article)); } } @@ -184,5 +183,5 @@ return Stream .of("wikipedia", "wikipedia:" + wikipediaLang) - .map(key -> WikipediaLangArticle.parseTag(key, p.get(key))) + .map(key -> WikipediaEntry.parseTag(key, p.get(key))) .filter(Objects::nonNull) .filter(wp -> wikipediaLang.equals(wp.lang)) @@ -267,5 +266,5 @@ "?action=wbgetentities" + "&props=labels|descriptions" + - "&ids=" + entries.stream().map(x -> x.wikipediaArticle).collect(Collectors.joining("|")) + + "&ids=" + entries.stream().map(x -> x.article).collect(Collectors.joining("|")) + "&format=xml"; final Collection languages = new ArrayList<>(); @@ -281,10 +280,10 @@ final Document xml = newDocumentBuilder().parse(in); for (final WikipediaEntry entry : entries) { - final Node entity = X_PATH.evaluateNode("//entity[@id='" + entry.wikipediaArticle + "']", xml); + final Node entity = X_PATH.evaluateNode("//entity[@id='" + entry.article + "']", xml); if (entity == null) { continue; } r.add(new WikidataEntry( - entry.wikipediaArticle, + entry.article, getFirstField(languages, "label", entity), entry.coordinate, @@ -309,5 +308,5 @@ } - public static Collection getInterwikiArticles(String wikipediaLang, String article) { + public static Collection getInterwikiArticles(String wikipediaLang, String article) { try { final String url = getSiteUrl(wikipediaLang) + "/w/api.php" + @@ -323,5 +322,5 @@ final String lang = X_PATH.evaluateString("@lang", node); final String name = node.getTextContent(); - return new WikipediaLangArticle(lang, name); + return new WikipediaEntry(lang, name); }).collect(Collectors.toList()); } Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/FetchWikidataAction.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/FetchWikidataAction.java (revision 32890) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/FetchWikidataAction.java (revision 32891) @@ -29,5 +29,5 @@ import org.openstreetmap.josm.tools.Utils; import org.wikipedia.WikipediaApp; -import org.wikipedia.data.WikipediaLangArticle; +import org.wikipedia.data.WikipediaEntry; import org.wikipedia.gui.GuiUtils; @@ -52,5 +52,5 @@ private boolean canceled = false; private final List commands = new ArrayList<>(); - private final Collection notFound = new ArrayList<>(); + private final Collection notFound = new ArrayList<>(); public Fetcher(Collection selection) { @@ -85,5 +85,5 @@ final Map r = new HashMap<>(); for (final OsmPrimitive i : selection) { - final WikipediaLangArticle tag = WikipediaLangArticle.parseTag("wikipedia", i.get("wikipedia")); + final WikipediaEntry tag = WikipediaEntry.parseTag("wikipedia", i.get("wikipedia")); if (tag != null) { if (!r.containsKey(tag.lang)) { @@ -114,5 +114,5 @@ final MultiMap byArticle = new MultiMap<>(); final List commands = new ArrayList<>(); - final List notFound = new ArrayList<>(); + final List notFound = new ArrayList<>(); PrimitivesWithWikipedia(String lang) { @@ -139,5 +139,5 @@ } } else { - final WikipediaLangArticle article = new WikipediaLangArticle(lang, wikipedia); + final WikipediaEntry article = new WikipediaEntry(lang, wikipedia); Main.warn(tr("No Wikidata ID found for: {0}", article)); notFound.add(article); @@ -154,5 +154,5 @@ } - List getNotFound() { + List getNotFound() { return notFound; } Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/WikipediaAddNamesAction.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/WikipediaAddNamesAction.java (revision 32890) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/actions/WikipediaAddNamesAction.java (revision 32891) @@ -17,5 +17,5 @@ import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog; import org.wikipedia.WikipediaApp; -import org.wikipedia.data.WikipediaLangArticle; +import org.wikipedia.data.WikipediaEntry; public class WikipediaAddNamesAction extends JosmAction { @@ -29,5 +29,5 @@ @Override public void actionPerformed(ActionEvent e) { - final WikipediaLangArticle wp = WikipediaLangArticle.parseTag("wikipedia", getWikipediaValue()); + final WikipediaEntry wp = WikipediaEntry.parseTag("wikipedia", getWikipediaValue()); List tags = new ArrayList<>(); WikipediaApp.getInterwikiArticles(wp.lang, wp.article).stream() @@ -41,5 +41,5 @@ } - private boolean useWikipediaLangArticle(WikipediaLangArticle i) { + private boolean useWikipediaLangArticle(WikipediaEntry i) { return (!Main.pref.getBoolean("wikipedia.filter-iso-languages", true) || Arrays.asList(Locale.getISOLanguages()).contains(i.lang)) Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/data/WikidataEntry.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/data/WikidataEntry.java (revision 32890) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/data/WikidataEntry.java (revision 32891) @@ -20,5 +20,5 @@ @Override public Tag createWikipediaTag() { - return new Tag("wikidata", wikipediaArticle); + return new Tag("wikidata", article); } @@ -26,5 +26,5 @@ public String getLabelText() { final String descriptionInParen = description == null ? "" : (" (" + description + ")"); - return getLabelText(label, wikipediaArticle + descriptionInParen); + return getLabelText(label, article + descriptionInParen); } Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/data/WikipediaEntry.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/data/WikipediaEntry.java (revision 32890) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/data/WikipediaEntry.java (revision 32891) @@ -9,25 +9,67 @@ import java.util.Comparator; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class WikipediaEntry implements Comparable { + public final String lang; + public final String article; public final String label; - public final String wikipediaLang, wikipediaArticle; public final LatLon coordinate; private Boolean wiwosmStatus; - public WikipediaEntry(String wikipediaLang, String wikipediaArticle) { - this(wikipediaLang, wikipediaArticle, null, null); + public WikipediaEntry(String lang, String article) { + this(lang, article, null, null); } - public WikipediaEntry(String wikipediaLang, String wikipediaArticle, String label, LatLon coordinate) { + public WikipediaEntry(String lang, String article, String label, LatLon coordinate) { + this.lang = lang; + this.article = article; this.label = label; - this.wikipediaLang = wikipediaLang; - this.wikipediaArticle = wikipediaArticle; this.coordinate = coordinate; } + static WikipediaEntry parseFromUrl(String url) { + if (url == null) { + return null; + } + // decode URL for nicer value + url = Utils.decodeUrl(url); + // extract Wikipedia language and + final Matcher m = Pattern.compile("(https?:)?//(\\w*)\\.wikipedia\\.org/wiki/(.*)").matcher(url); + if (!m.matches()) { + return null; + } + return new WikipediaEntry(m.group(2), m.group(3)); + } + + public static WikipediaEntry parseTag(String key, String value) { + if (value == null) { + return null; + } else if (value.startsWith("http")) { + //wikipedia=http... + return WikipediaEntry.parseFromUrl(value); + } else if (value.contains(":")) { + //wikipedia=[lang]:[article] + //wikipedia:[lang]=[lang]:[article] + final String[] item = Utils.decodeUrl(value).split(":", 2); + final String article = item[1].replace("_", " "); + return new WikipediaEntry(item[0], article); + } else if (key.startsWith("wikipedia:")) { + //wikipedia:[lang]=[lang]:[article] + //wikipedia:[lang]=[article] + final String lang = key.split(":", 2)[1]; + final String[] item = Utils.decodeUrl(value).split(":", 2); + final String article = item[item.length == 2 ? 1 : 0].replace("_", " "); + return new WikipediaEntry(lang, article); + } else { + return null; + } + } + public Tag createWikipediaTag() { - return new Tag("wikipedia", wikipediaLang + ":" + wikipediaArticle); + return new Tag("wikipedia", lang + ":" + article); } @@ -41,14 +83,14 @@ public String getBrowserUrl() { - return WikipediaApp.getSiteUrl(wikipediaLang) + "/wiki/" + Utils.encodeUrl(wikipediaArticle.replace(" ", "_")); + return WikipediaApp.getSiteUrl(lang) + "/wiki/" + Utils.encodeUrl(article.replace(" ", "_")); } public String getLabelText() { - return wikipediaArticle; + return article; } @Override public String toString() { - return wikipediaArticle; + return article; } @@ -57,6 +99,20 @@ return Comparator .comparing(x -> x.label, AlphanumComparator.getInstance()) - .thenComparing(x -> x.wikipediaArticle, AlphanumComparator.getInstance()) + .thenComparing(x -> x.article, AlphanumComparator.getInstance()) .compare(this, o); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + final WikipediaEntry that = (WikipediaEntry) o; + return Objects.equals(lang, that.lang) && + Objects.equals(article, that.article); + } + + @Override + public int hashCode() { + return Objects.hash(lang, article); + } } Index: plications/editors/josm/plugins/wikipedia/src/org/wikipedia/data/WikipediaLangArticle.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/data/WikipediaLangArticle.java (revision 32890) +++ (revision ) @@ -1,75 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.wikipedia.data; - -import org.openstreetmap.josm.tools.Utils; - -import java.util.Objects; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class WikipediaLangArticle { - - public final String lang, article; - - public WikipediaLangArticle(String lang, String article) { - this.lang = lang; - this.article = article; - } - - public static WikipediaLangArticle parseFromUrl(String url) { - if (url == null) { - return null; - } - // decode URL for nicer value - url = Utils.decodeUrl(url); - // extract Wikipedia language and - final Matcher m = Pattern.compile("(https?:)?//(\\w*)\\.wikipedia\\.org/wiki/(.*)").matcher(url); - if (!m.matches()) { - return null; - } - return new WikipediaLangArticle(m.group(2), m.group(3)); - } - - public static WikipediaLangArticle parseTag(String key, String value) { - if (value == null) { - return null; - } else if (value.startsWith("http")) { - //wikipedia=http... - return parseFromUrl(value); - } else if (value.contains(":")) { - //wikipedia=[lang]:[article] - //wikipedia:[lang]=[lang]:[article] - final String[] item = Utils.decodeUrl(value).split(":", 2); - final String article = item[1].replace("_", " "); - return new WikipediaLangArticle(item[0], article); - } else if (key.startsWith("wikipedia:")) { - //wikipedia:[lang]=[lang]:[article] - //wikipedia:[lang]=[article] - final String lang = key.split(":", 2)[1]; - final String[] item = Utils.decodeUrl(value).split(":", 2); - final String article = item[item.length == 2 ? 1 : 0].replace("_", " "); - return new WikipediaLangArticle(lang, article); - } else { - return null; - } - } - - @Override - public String toString() { - return lang + ":" + article; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - final WikipediaLangArticle that = (WikipediaLangArticle) o; - return Objects.equals(lang, that.lang) && - Objects.equals(article, that.article); - } - - @Override - public int hashCode() { - return Objects.hash(lang, article); - } -} Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikipediaToggleDialog.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikipediaToggleDialog.java (revision 32890) +++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/gui/WikipediaToggleDialog.java (revision 32891) @@ -79,5 +79,5 @@ Main.map.mapView.zoomTo(bbox); } - final String search = Optional.ofNullable(entry.label).orElse(entry.wikipediaArticle).replaceAll("\\(.*\\)", ""); + final String search = Optional.ofNullable(entry.label).orElse(entry.article).replaceAll("\\(.*\\)", ""); SearchAction.search(search, SearchAction.SearchMode.replace); } @@ -95,5 +95,5 @@ label.setIcon(ImageProvider.getIfAvailable("misc", "grey_check")); label.setToolTipText(/* I18n: WIWOSM server already links Wikipedia article to object/s */ tr("Available via WIWOSM server")); - } else if (articles.contains(entry.wikipediaArticle)) { + } else if (articles.contains(entry.article)) { label.setIcon(ImageProvider.getIfAvailable("misc", "green_check")); label.setToolTipText(/* I18n: object/s from dataset contain link to Wikipedia article */ tr("Available in local dataset")); @@ -124,5 +124,5 @@ private String getLanguageOfFirstItem() { try { - return list.getModel().getElementAt(0).wikipediaLang; + return list.getModel().getElementAt(0).lang; } catch (ArrayIndexOutOfBoundsException ignore) { return wikipediaLang.get(); @@ -176,5 +176,5 @@ publish(entries.toArray(new WikipediaEntry[entries.size()])); WikipediaApp.partitionList(entries, 20).forEach(chunk -> { - WikipediaApp.updateWIWOSMStatus(chunk.get(0).wikipediaLang, chunk); + WikipediaApp.updateWIWOSMStatus(chunk.get(0).lang, chunk); list.repaint(); }); @@ -342,5 +342,5 @@ final LatLon latLon = entry.coordinate != null ? entry.coordinate - : WikipediaApp.getCoordinateForArticle(entry.wikipediaLang, entry.wikipediaArticle); + : WikipediaApp.getCoordinateForArticle(entry.lang, entry.article); if (latLon == null) { return; Index: /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java (revision 32890) +++ /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java (revision 32891) @@ -7,5 +7,4 @@ import org.wikipedia.data.WikidataEntry; import org.wikipedia.data.WikipediaEntry; -import org.wikipedia.data.WikipediaLangArticle; import java.util.Arrays; @@ -52,14 +51,14 @@ @Test public void testGetInterwikiArticles1() { - final Collection iw = WikipediaApp.getInterwikiArticles("de", "Österreich"); - assertThat(iw, hasItem(new WikipediaLangArticle("en", "Austria"))); - assertThat(iw, hasItem(new WikipediaLangArticle("no", "Østerrike"))); - assertThat(iw, hasItem(new WikipediaLangArticle("ko", "오스트리아"))); + final Collection iw = WikipediaApp.getInterwikiArticles("de", "Österreich"); + assertThat(iw, hasItem(new WikipediaEntry("en", "Austria"))); + assertThat(iw, hasItem(new WikipediaEntry("no", "Østerrike"))); + assertThat(iw, hasItem(new WikipediaEntry("ko", "오스트리아"))); } @Test public void testGetInterwikiArticles2() { - final Collection iw = WikipediaApp.getInterwikiArticles("en", "Ampersand"); - assertThat(iw, hasItem(new WikipediaLangArticle("fi", "&"))); + final Collection iw = WikipediaApp.getInterwikiArticles("en", "Ampersand"); + assertThat(iw, hasItem(new WikipediaEntry("fi", "&"))); } @@ -76,5 +75,5 @@ new LatLon(52.5179786, 13.3753321), new LatLon(52.5192215, 13.3768705)); final long c = entries.stream() - .filter(entry -> "Reichstagsgebäude".equals(entry.wikipediaArticle) && "de".equals(entry.wikipediaLang)) + .filter(entry -> "Reichstagsgebäude".equals(entry.article) && "de".equals(entry.lang)) .count(); assertEquals(1, c); @@ -85,6 +84,6 @@ final List de = WikipediaApp.getWikidataEntriesForQuery("de", "Österreich", Locale.GERMAN); final List en = WikipediaApp.getWikidataEntriesForQuery("de", "Österreich", Locale.ENGLISH); - assertThat(de.get(0).wikipediaArticle, is("Q40")); - assertThat(de.get(0).wikipediaLang, is("wikidata")); + assertThat(de.get(0).article, is("Q40")); + assertThat(de.get(0).lang, is("wikidata")); assertThat(de.get(0).label, is("Österreich")); assertThat(de.get(0).description, is("Staat in Mitteleuropa")); @@ -98,5 +97,5 @@ new LatLon(47.20, 11.30), new LatLon(47.22, 11.32)); final long c = entries.stream() - .filter(entry -> "Q865406".equals(entry.wikipediaArticle) && "wikidata".equals(entry.wikipediaLang) && "Birgitzer Alm".equals(entry.label)) + .filter(entry -> "Q865406".equals(entry.article) && "wikidata".equals(entry.lang) && "Birgitzer Alm".equals(entry.label)) .count(); assertEquals(1, c); Index: /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaEntryTest.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaEntryTest.java (revision 32890) +++ /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaEntryTest.java (revision 32891) @@ -5,7 +5,70 @@ import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.*; public class WikipediaEntryTest { + + @Test + public void testParseFromUrl1() { + final WikipediaEntry actual = WikipediaEntry.parseFromUrl("https://de.wikipedia.org/wiki/Österreich"); + assertThat(actual.article, is("Österreich")); + assertThat(actual.lang, is("de")); + } + + @Test + public void testParseFromUrl2() { + final WikipediaEntry actual = WikipediaEntry.parseFromUrl("http://de.wikipedia.org/wiki/%C3%96sterreich"); + assertThat(actual.article, is("Österreich")); + assertThat(actual.lang, is("de")); + } + + @Test + public void testParseFromUrl3() { + final WikipediaEntry actual = WikipediaEntry.parseFromUrl("http://de.wikipedia.org/wiki/Sternheim_%26_Emanuel"); + assertThat(actual.article, is("Sternheim_&_Emanuel")); + assertThat(actual.lang, is("de")); + } + + @Test + public void testParseFromUrl4() { + final WikipediaEntry actual = WikipediaEntry.parseFromUrl("//de.wikipedia.org/wiki/Reichstagsgeb%C3%A4ude"); + assertThat(actual.article, is("Reichstagsgebäude")); + assertThat(actual.lang, is("de")); + } + + @Test + public void testParseFromTag0() { + final WikipediaEntry actual = WikipediaEntry.parseTag("wikipedia", "Österreich"); + assertThat(actual, nullValue()); + } + + @Test + public void testParseFromTag1() { + final WikipediaEntry actual = WikipediaEntry.parseTag("wikipedia", "de:Österreich"); + assertThat(actual.article, is("Österreich")); + assertThat(actual.lang, is("de")); + } + + @Test + public void testParseFromTag2() { + final WikipediaEntry actual = WikipediaEntry.parseTag("wikipedia:de", "Österreich"); + assertThat(actual.article, is("Österreich")); + assertThat(actual.lang, is("de")); + } + + @Test + public void testParseFromTag3() { + final WikipediaEntry actual = WikipediaEntry.parseTag("wikipedia:de", "de:Österreich"); + assertThat(actual.article, is("Österreich")); + assertThat(actual.lang, is("de")); + } + + @Test + public void testParseFromTag4() { + final WikipediaEntry actual = WikipediaEntry.parseTag("wikipedia", "https://de.wikipedia.org/wiki/Österreich"); + assertThat(actual.article, is("Österreich")); + assertThat(actual.lang, is("de")); + } @Test Index: plications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaLangArticleTest.java =================================================================== --- /applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaLangArticleTest.java (revision 32890) +++ (revision ) @@ -1,74 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.wikipedia.data; - -import org.junit.Test; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.*; - -public class WikipediaLangArticleTest { - - @Test - public void testParseFromUrl1() { - final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("https://de.wikipedia.org/wiki/Österreich"); - assertThat(actual.article, is("Österreich")); - assertThat(actual.lang, is("de")); - } - - @Test - public void testParseFromUrl2() { - final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("http://de.wikipedia.org/wiki/%C3%96sterreich"); - assertThat(actual.article, is("Österreich")); - assertThat(actual.lang, is("de")); - } - - @Test - public void testParseFromUrl3() { - final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("http://de.wikipedia.org/wiki/Sternheim_%26_Emanuel"); - assertThat(actual.article, is("Sternheim_&_Emanuel")); - assertThat(actual.lang, is("de")); - } - - @Test - public void testParseFromUrl4() { - final WikipediaLangArticle actual = WikipediaLangArticle.parseFromUrl("//de.wikipedia.org/wiki/Reichstagsgeb%C3%A4ude"); - assertThat(actual.article, is("Reichstagsgebäude")); - assertThat(actual.lang, is("de")); - } - - @Test - public void testParseFromTag0() { - final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia", "Österreich"); - assertThat(actual, nullValue()); - } - - @Test - public void testParseFromTag1() { - final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia", "de:Österreich"); - assertThat(actual.article, is("Österreich")); - assertThat(actual.lang, is("de")); - } - - @Test - public void testParseFromTag2() { - final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia:de", "Österreich"); - assertThat(actual.article, is("Österreich")); - assertThat(actual.lang, is("de")); - } - - @Test - public void testParseFromTag3() { - final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia:de", "de:Österreich"); - assertThat(actual.article, is("Österreich")); - assertThat(actual.lang, is("de")); - } - - @Test - public void testParseFromTag4() { - final WikipediaLangArticle actual = WikipediaLangArticle.parseTag("wikipedia", "https://de.wikipedia.org/wiki/Österreich"); - assertThat(actual.article, is("Österreich")); - assertThat(actual.lang, is("de")); - } - -}