Changeset 16006 in josm for trunk/test/functional

Timestamp:

2020-03-03T02:12:44+01:00 (5 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/functional/org/openstreetmap/josm/gui

Files:

• GettingStartedTest.java (modified) (1 diff)
• mappaint/StyleCacheTest.java (modified) (1 diff)

trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java

@@ -40 +40 @@
     @Test
     public void testImageReplacementStatic() {
-        final String html = "the download button <img src=\"/browser/trunk/images/download.png?format=raw\" " +
-                "alt=\"source:trunk/images/download.png\" title=\"source:trunk/images/download.png\" />.";
+        final String html = "the download button <img src=\"/browser/trunk/resources/images/download.png?format=raw\" " +
+                "alt=\"source:trunk/resources/images/download.png\" title=\"source:trunk/resources/images/download.png\" />.";
         assertFalse(GettingStarted.fixImageLinks(html).equals(html));
 

trunk/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java

@@ -63 +63 @@
 
         try (
-            InputStream fisC = Compression.getUncompressedFileInputStream(new File("data_nodist/neubrandenburg.osm.bz2"));
+            InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2"));
         ) {
             dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE);