Changeset 10657 in josm for trunk/test/unit

Timestamp:

2016-07-27T02:08:34+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, see #12890 - use Java 8 Predicates

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/CreateMultipolygonActionTest.groovy (modified) (4 diffs)
• actions/OrthogonalizeActionTest.java (modified) (2 diffs)
• data/validation/tests/MapCSSTagCheckerTest.java (modified) (2 diffs)
• tools/GeometryTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Way
 import org.openstreetmap.josm.io.OsmReader
-import org.openstreetmap.josm.tools.Utils
+import org.openstreetmap.josm.tools.SubclassFilteredCollection
 
 class CreateMultipolygonActionTest {
@@ -45 +45 @@
     public void testCreate2() {
         def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
-        def ways = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1."))
+        def ways = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1."))
         def mp = CreateMultipolygonAction.createMultipolygonCommand(ways as Collection<Way>, null)
         assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1.1:inner, 1.1.2:inner]"
@@ -53 +53 @@
     public void testUpdate1() {
         def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
-        def ways = Utils.filter(ds.getWays(), SearchCompiler.compile(regexpSearch("ref=\".*1\$\"")))
+        def ways = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile(regexpSearch("ref=\".*1\$\"")))
         def mp = CreateMultipolygonAction.createMultipolygonCommand(ways as Collection<Way>, null)
         assert mp.b.getMembersCount() == 3
         assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer]"
-        def ways2 = Utils.filter(ds.getWays(), SearchCompiler.compile(regexpSearch("ref=1.2")))
+        def ways2 = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile(regexpSearch("ref=1.2")))
         def mp2 = CreateMultipolygonAction.createMultipolygonCommand(ways2 as Collection<Way>, mp.b)
         assert mp2.b.getMembersCount() == 4
@@ -66 +66 @@
     public void testUpdate2() {
         def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
-        def ways = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1.1"))
+        def ways = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1.1"))
         def mp = CreateMultipolygonAction.createMultipolygonCommand(ways as Collection<Way>, null)
         assert getRefToRoleMap(mp.b).toString() == "[1:outer, 1.1.1:inner]"
-        def ways2 = Utils.filter(ds.getWays(), SearchCompiler.compile(regexpSearch("ref=1.1 OR ref=1.2 OR ref=1.1.2")))
+        def ways2 = SubclassFilteredCollection.filter(ds.getWays(), SearchCompiler.compile(regexpSearch("ref=1.1 OR ref=1.2 OR ref=1.1.2")))
         def mp2 = CreateMultipolygonAction.createMultipolygonCommand(ways2 as Collection<Way>, mp.b)
         assert getRefToRoleMap(mp2.b).toString() == "[1:outer, 1.1:inner, 1.1.1:outer, 1.1.2:outer, 1.2:inner]"

trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java

@@ -20 +20 @@
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.tools.Geometry;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -87 +87 @@
             final DataSet ds = OsmReader.parseDataSet(in, null);
             for (String s : search) {
-                ds.addSelected(Utils.filter(ds.allPrimitives(), SearchCompiler.compile(s)));
+                ds.addSelected(SubclassFilteredCollection.filter(ds.allPrimitives(), SearchCompiler.compile(s)));
             }
             OrthogonalizeAction.orthogonalize(ds.getSelected()).executeCommand();

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -71 +71 @@
         final Node n1 = new Node();
         n1.put("natural", "marsh");
-        assertTrue(check.evaluate(n1));
+        assertTrue(check.test(n1));
         assertEquals("natural=marsh is deprecated", check.getErrorForPrimitive(n1).getMessage());
         assertEquals(Severity.WARNING, check.getErrorForPrimitive(n1).getSeverity());
@@ -78 +78 @@
         final Node n2 = new Node();
         n2.put("natural", "wood");
-        assertFalse(check.evaluate(n2));
+        assertFalse(check.test(n2));
         assertEquals("The key is natural and the value is marsh",
                 MapCSSTagChecker.TagCheck.insertArguments(check.rule.selectors.get(0), "The key is {0.key} and the value is {0.value}", null));

trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java

@@ -71 +71 @@
         try (FileInputStream in = new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm")) {
             DataSet ds = OsmReader.parseDataSet(in, null);
-            Way closedWay = (Way) Utils.filter(ds.allPrimitives(), SearchCompiler.compile("landuse=forest")).iterator().next();
+            Way closedWay = (Way) SubclassFilteredCollection.filter(ds.allPrimitives(),
+                    SearchCompiler.compile("landuse=forest")).iterator().next();
             Assert.assertEquals(5760015.7353515625, Geometry.closedWayArea(closedWay), 1e-3);
             Assert.assertEquals(5760015.7353515625, Geometry.computeArea(closedWay), 1e-3);
@@ -101 +102 @@
         try (FileInputStream in = new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm")) {
             DataSet ds = OsmReader.parseDataSet(in, null);
-            Way closedWay = (Way) Utils.filter(ds.allPrimitives(), SearchCompiler.compile("landuse=forest")).iterator().next();
+            Way closedWay = (Way) SubclassFilteredCollection.filter(ds.allPrimitives(),
+                    SearchCompiler.compile("landuse=forest")).iterator().next();
             Geometry.AreaAndPerimeter areaAndPerimeter = Geometry.getAreaAndPerimeter(closedWay.getNodes());
             Assert.assertEquals(12495000., areaAndPerimeter.getArea(), 1e-3);