Changeset 32891 in osm for applications/editors/josm/plugins/wikipedia/test

Timestamp:

2016-08-30T13:26:57+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: refactoring (merge WikipediaLangArticle into WikipediaEntry)

Location:

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia

Files:

• WikipediaAppTest.java (modified) (5 diffs)
• data/WikipediaEntryTest.java (modified) (1 diff)
• data/WikipediaLangArticleTest.java (deleted)

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java

@@ -7 +7 @@
 import org.wikipedia.data.WikidataEntry;
 import org.wikipedia.data.WikipediaEntry;
-import org.wikipedia.data.WikipediaLangArticle;
 
 import java.util.Arrays;
@@ -52 +51 @@
     @Test
     public void testGetInterwikiArticles1() {
-        final Collection<WikipediaLangArticle> 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<WikipediaEntry> 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<WikipediaLangArticle> iw = WikipediaApp.getInterwikiArticles("en", "Ampersand");
-        assertThat(iw, hasItem(new WikipediaLangArticle("fi", "&")));
+        final Collection<WikipediaEntry> iw = WikipediaApp.getInterwikiArticles("en", "Ampersand");
+        assertThat(iw, hasItem(new WikipediaEntry("fi", "&")));
     }
 
@@ -76 +75 @@
                 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 +84 @@
         final List<WikidataEntry> de = WikipediaApp.getWikidataEntriesForQuery("de", "Österreich", Locale.GERMAN);
         final List<WikidataEntry> 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 +97 @@
                 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);

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/data/WikipediaEntryTest.java

@@ -5 +5 @@
 
 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