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

Timestamp:

2016-07-21T12:20:41+02:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: switch to Java 8

File:

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

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

@@ -5 +5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.tools.Predicate;
-import org.openstreetmap.josm.tools.Predicates;
-import org.openstreetmap.josm.tools.Utils;
 import org.wikipedia.WikipediaApp.WikipediaEntry;
 import org.wikipedia.WikipediaApp.WikipediaLangArticle;
@@ -20 +17 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -142 +140 @@
         final List<WikipediaEntry> entries = WikipediaApp.getEntriesFromCoordinates("de",
                 new LatLon(52.5179786, 13.3753321), new LatLon(52.5192215, 13.3768705));
-        assertTrue(Utils.exists(entries, new Predicate<WikipediaEntry>() {
-            @Override
-            public boolean evaluate(WikipediaEntry entry) {
-                return "Reichstagsgebäude".equals(entry.wikipediaArticle) && "de".equals(entry.wikipediaLang);
-            }
-        }));
+        final long c = entries.stream()
+                .filter(entry -> "Reichstagsgebäude".equals(entry.wikipediaArticle) && "de".equals(entry.wikipediaLang))
+                .count();
+        assertEquals(1, c);
     }
 
@@ -166 +162 @@
         final List<WikipediaEntry> entries = WikipediaApp.getEntriesFromCoordinates("wikidata",
                 new LatLon(47.20, 11.30), new LatLon(47.22, 11.32));
-        assertTrue(Utils.exists(entries, new Predicate<WikipediaEntry>() {
-            @Override
-            public boolean evaluate(WikipediaEntry entry) {
-                return "Q865406".equals(entry.wikipediaArticle) && "wikidata".equals(entry.wikipediaLang) && "Birgitzer Alm".equals(entry.label);
-            }
-        }));
+        final long c = entries.stream()
+                .filter(entry -> "Q865406".equals(entry.wikipediaArticle) && "wikidata".equals(entry.wikipediaLang) && "Birgitzer Alm".equals(entry.label))
+                .count();
+        assertEquals(1, c);
     }
 
@@ -219 +213 @@
     public void testCategoriesForPrefix() throws Exception {
         final List<String> categories = WikipediaApp.getCategoriesForPrefix("de", "Gemeinde in Öster");
-        assertTrue(Utils.exists(categories, Predicates.equalTo("Gemeinde in Österreich")));
+        assertTrue(categories.contains("Gemeinde in Österreich"));
     }
 }