Changeset 16006 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation

Timestamp:

2020-03-03T02:12:44+01:00 (4 years ago)

Author:

Don-vip

Message:

see #18140 - reorganization of data(_nodist), images(_nodist), styles(_nodist), IDE and native files in a more practical file tree.

• Everything belonging to the jar is now in resources (data, images, styles)
• Everything not belonging to the jar is now in nodist (data, images, styles)
• Everything related to OS native functions is now in native (linux, macosx, windows)
• Everything related to an IDE is now in ide (eclipse, netbeans)

Location:

trunk/test/unit/org/openstreetmap/josm/data/validation/tests

Files:

• CoastlinesTest.java (modified) (1 diff)
• MultipolygonTestTest.java (modified) (1 diff)
• TurnRestrictionTestTest.java (modified) (1 diff)
• UnconnectedWaysTest.java (modified) (1 diff)

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

@@ -31 +31 @@
     @Test
     public void testCoastlineFile() throws Exception {
-        ValidatorTestUtils.testSampleFile("data_nodist/coastlines.osm",
+        ValidatorTestUtils.testSampleFile("nodist/data/coastlines.osm",
                 ds -> ds.getWays().stream().filter(
                         w -> "coastline".equals(w.get("natural"))).collect(Collectors.toList()),

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

@@ -38 +38 @@
         final MultipolygonTest MULTIPOLYGON_TEST = new MultipolygonTest();
         final RelationChecker RELATION_TEST = new RelationChecker();
-        ValidatorTestUtils.testSampleFile("data_nodist/multipolygon.osm",
+        ValidatorTestUtils.testSampleFile("nodist/data/multipolygon.osm",
                 ds -> ds.getRelations().stream().filter(Relation::isMultipolygon).collect(Collectors.toList()),
                 name -> name.startsWith("06") || name.startsWith("07") || name.startsWith("08"), MULTIPOLYGON_TEST, RELATION_TEST);

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

@@ -29 +29 @@
     @Test
     public void testTurnrestrictionFile() throws Exception {
-        ValidatorTestUtils.testSampleFile("data_nodist/restriction.osm",
+        ValidatorTestUtils.testSampleFile("nodist/data/restriction.osm",
                 ds -> ds.getRelations(),
                 name -> name.startsWith("E"), TURNRESTRICTION_TEST, RELATION_TEST);

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

@@ -49 +49 @@
     @Test
     public void testTicket6313() throws IOException, IllegalDataException, FileNotFoundException {
-        try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/UnconnectedWaysTest.osm"))) {
+        try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/UnconnectedWaysTest.osm"))) {
             final DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
             MainApplication.getLayerManager().addLayer(new OsmDataLayer(ds, null, null));