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

Timestamp:

2016-08-30T10:52:38+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: reorganize (separate classes, packages)

Location:

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

Files:

• WikipediaAppTest.java (modified) (3 diffs)
• gui (added)
• gui/WikidataTagCellRendererTest.java (moved) (moved from applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikidataTagCellRendererTest.java ) (2 diffs)

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

@@ -1 +1 @@
 package org.wikipedia;
 
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.wikipedia.WikipediaApp.WikipediaEntry;
-import org.wikipedia.WikipediaApp.WikipediaLangArticle;
+import org.wikipedia.data.WikidataEntry;
+import org.wikipedia.data.WikipediaEntry;
+import org.wikipedia.data.WikipediaLangArticle;
 
 import java.util.Arrays;
@@ -152 +151 @@
     @Test
     public void testForQuery() throws Exception {
-        final List<WikipediaApp.WikidataEntry> de = WikipediaApp.getWikidataEntriesForQuery("de", "Österreich", Locale.GERMAN);
-        final List<WikipediaApp.WikidataEntry> en = WikipediaApp.getWikidataEntriesForQuery("de", "Österreich", Locale.ENGLISH);
+        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"));
@@ -191 +190 @@
         // not found -> null
         assertThat(WikipediaApp.getLabelForWikidata("Q" + Long.MAX_VALUE, Locale.ENGLISH), nullValue());
-        final WikipediaApp.WikidataEntry q84 = new WikipediaApp.WikidataEntry("Q84", null, null, null);
-        final WikipediaApp.WikidataEntry q1741 = new WikipediaApp.WikidataEntry("Q1741", null, null, null);
-        final List<WikipediaApp.WikidataEntry> twoLabels = WikipediaApp.getLabelForWikidata(Arrays.asList(q84, q1741), Locale.GERMAN);
+        final WikidataEntry q84 = new WikidataEntry("Q84", null, null, null);
+        final WikidataEntry q1741 = new WikidataEntry("Q1741", null, null, null);
+        final List<WikidataEntry> twoLabels = WikipediaApp.getLabelForWikidata(Arrays.asList(q84, q1741), Locale.GERMAN);
         assertThat(twoLabels.get(0).label, is("London"));
         assertThat(twoLabels.get(1).label, is("Wien"));

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/gui/WikidataTagCellRendererTest.java

@@ -1 @@
-package org.wikipedia;
+package org.wikipedia.gui;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -14 +14 @@
 import org.junit.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.wikipedia.gui.WikidataTagCellRenderer;
 
 public class WikidataTagCellRendererTest {