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

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

Files:

• dialogs/relation/sort/RelationSorterTest.java (modified) (1 diff)
• dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (modified) (1 diff)
• layer/geoimage/CorrelateGpxWithImagesTest.java (modified) (1 diff)
• layer/gpx/GpxDrawHelperTest.java (modified) (5 diffs)
• mappaint/mapcss/ChildOrParentSelectorTest.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);
             }

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java

@@ -46 +46 @@
     @Test
     public void testAutoGuess() throws Exception {
-        final GpxData gpx = GpxReaderTest.parseGpxData("data_nodist/2094047.gpx");
+        final GpxData gpx = GpxReaderTest.parseGpxData("nodist/data/2094047.gpx");
         final ImageEntry i0 = new ImageEntry();
         i0.setExifTime(DateUtils.fromString("2016:01:03 11:59:54")); // 4 sec before start of GPX

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java

@@ -60 +60 @@
     @Test
     public void testNone() throws IOException, SAXException {
-        final List<String> colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of(), 10);
+        final List<String> colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of(), 10);
         assertEquals("[#000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000]", colors.toString());
     }
@@ -72 +72 @@
     @Test
     public void testVelocity() throws IOException, SAXException {
-        final List<String> colors = calculateColors("data_nodist/2094047.gpx",
+        final List<String> colors = calculateColors("nodist/data/2094047.gpx",
                 ImmutableMap.of("colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), 10);
         assertEquals("[#000000, #FFAD00, #FFA800, #FFA800, #FF9E00, #FF9400, #FF7000, #FF7000, #FF8000, #FF9400]", colors.toString());
@@ -85 +85 @@
     @Test
     public void testVelocityDynamic() throws IOException, SAXException {
-        final List<String> colors = calculateColors("data_nodist/2094047.gpx",
+        final List<String> colors = calculateColors("nodist/data/2094047.gpx",
                 ImmutableMap.of("colormode.dynamic-range", "true",
                         "colormode", Integer.toString(ColorMode.VELOCITY.toIndex())),
@@ -100 +100 @@
     @Test
     public void testDirection() throws IOException, SAXException {
-        final List<String> colors = calculateColors("data_nodist/2094047.gpx",
+        final List<String> colors = calculateColors("nodist/data/2094047.gpx",
                 ImmutableMap.of("colormode", Integer.toString(ColorMode.DIRECTION.toIndex())), 10);
         assertEquals("[#000000, #EAEC25, #EDEA26, #EDE525, #ECD322, #EBB81D, #E85A0D, #E73708, #E84D0B, #EA8A15]", colors.toString());
@@ -113 +113 @@
     @Test
     public void testTime() throws IOException, SAXException {
-        final List<String> colors = calculateColors("data_nodist/2094047.gpx",
+        final List<String> colors = calculateColors("nodist/data/2094047.gpx",
                 ImmutableMap.of("colormode", Integer.toString(ColorMode.TIME.toIndex())), 10);
         assertEquals("[#000000, #FF0000, #FF0000, #FF0500, #FF0500, #FF0A00, #FF0A00, #FF1F00, #FF2E00, #FF3300]", colors.toString());

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.java

@@ -192 +192 @@
     @Test
     public void testContains() throws Exception {
-        ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get("data_nodist/amenity-in-amenity.osm")), null);
+        ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get("nodist/data/amenity-in-amenity.osm")), null);
         ChildOrParentSelector css = parse("node[tag(\"amenity\") = parent_tag(\"amenity\")] ∈ *[amenity] {}");
         assertFalse(css.matches(new Environment(ds.getPrimitiveById(123, OsmPrimitiveType.NODE))));