Changeset 16006 in josm for trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation

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/gui/dialogs/relation/sort

Files:

• RelationSorterTest.java (modified) (1 diff)
• WayConnectionTypeCalculatorTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java

@@ -45 +45 @@
     public void loadData() throws IllegalDataException, IOException {
         if (testDataset == null) {
-            try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/relation_sort.osm"))) {
+            try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/relation_sort.osm"))) {
                 testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
             }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java

@@ -52 +52 @@
     public void loadData() throws IllegalDataException, IOException {
         if (testDataset == null) {
-            try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/relation_sort.osm"))) {
+            try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/relation_sort.osm"))) {
                 testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
             }