Changeset 10991 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java

Timestamp:

2016-09-11T02:15:50+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13570 - Coastline validator doesn't report some problems and is slow (patch by Gerd Petermann, modified)

File:

• trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 import org.junit.Rule;
@@ -22 +17 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -90 +82 @@
     @Test
     public void testMultipolygonFile() throws Exception {
-        try (InputStream is = new FileInputStream("data_nodist/multipolygon.osm")) {
-            for (Relation r : OsmReader.parseDataSet(is, null).getRelations()) {
-                if (r.isMultipolygon()) {
-                    String name = DefaultNameFormatter.getInstance().format(r);
-                    String codes = r.get("josm_error_codes");
-                    if (codes != null) {
-                        List<TestError> errors = new ArrayList<>();
-                        for (org.openstreetmap.josm.data.validation.Test test : Arrays.asList(MULTIPOLYGON_TEST, RELATION_TEST)) {
-                            test.initialize();
-                            test.startTest(null);
-                            test.visit(r);
-                            test.endTest();
-                            errors.addAll(test.getErrors());
-                        }
-                        Set<Integer> expectedCodes = new TreeSet<>();
-                        for (String code : codes.split(",")) {
-                            expectedCodes.add(Integer.parseInt(code));
-                        }
-                        Set<Integer> actualCodes = new TreeSet<>();
-                        for (TestError error : errors) {
-                            Integer code = error.getCode();
-                            assertTrue(name + " does not expect JOSM error code " + code + ": " + error.getDescription(),
-                                    expectedCodes.contains(code));
-                            actualCodes.add(code);
-                        }
-                        assertEquals(name + " " + expectedCodes + " => " + actualCodes,
-                                expectedCodes.size(), actualCodes.size());
-                    } else if (r.hasKey("name") && (r.getName().startsWith("06") || r.getName().startsWith("07"))) {
-                        fail(name + " lacks josm_error_codes tag");
-                    }
-                }
-            }
-        }
+        ValidatorTestUtils.testSampleFile("data_nodist/multipolygon.osm",
+                ds -> ds.getRelations().stream().filter(Relation::isMultipolygon).collect(Collectors.toList()),
+                name -> name.startsWith("06") || name.startsWith("07"), MULTIPOLYGON_TEST, RELATION_TEST);
     }
 }