Changeset 32624 in osm for applications/editors/josm/plugins/wikipedia/test/unit/org

Timestamp:

2016-07-10T22:56:50+02:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: refactor WikipediaEntry fields for clarification

File:

• applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java (modified) (3 diffs)

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

@@ -133 +133 @@
     @Test
     public void testGetBrowserUrl() {
-        final WikipediaEntry entry = new WikipediaEntry("Sternheim & Emanuel", "de", "Sternheim & Emanuel");
+        final WikipediaEntry entry = new WikipediaEntry("de", "Sternheim & Emanuel");
         assertThat(entry.getBrowserUrl(), is("https://de.wikipedia.org/wiki/Sternheim_%26_Emanuel"));
     }
@@ -156 +156 @@
             @Override
             public boolean evaluate(WikipediaEntry entry) {
-                return "Q865406".equals(entry.wikipediaArticle) && "wikidata".equals(entry.wikipediaLang) && "Birgitzer Alm".equals(entry.name);
+                return "Q865406".equals(entry.wikipediaArticle) && "wikidata".equals(entry.wikipediaLang) && "Birgitzer Alm".equals(entry.label);
             }
         }));
@@ -192 +192 @@
     @Test
     public void testWIWOSMStatus() throws Exception {
-        final WikipediaEntry entry1 = new WikipediaEntry(null, "en", "Vienna");
-        final WikipediaEntry entry2 = new WikipediaEntry(null, "en", "London");
-        final WikipediaEntry entry3 = new WikipediaEntry(null, "en", "a-non-existing-article");
+        final WikipediaEntry entry1 = new WikipediaEntry("en", "Vienna");
+        final WikipediaEntry entry2 = new WikipediaEntry("en", "London");
+        final WikipediaEntry entry3 = new WikipediaEntry("en", "a-non-existing-article");
         WikipediaApp.updateWIWOSMStatus("en", Arrays.asList(entry1, entry2, entry3));
         assertThat(entry1.getWiwosmStatus(), is(true));