Changeset 14179 in josm

Timestamp:

2018-08-22T22:55:16+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16680 - Unit tests: fix for windows (patch by ris)

Location:

trunk

Files:

• appveyor.yml (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/testutils/PluginServer.java (modified) (2 diffs)

trunk/appveyor.yml

@@ -15 +15 @@
             $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_))
         }
+  # we want to push test result artifact even if the tests fail, so uploading manually
+  - 7z a test-results.zip test\report\TEST*.xml
+  - ps: Push-AppveyorArtifact test-results.zip
 artifacts:
   - path: dist\josm-custom.*
@@ -20 +23 @@
   - path: pmd-josm.xml
   - path: spotbugs-josm.xml
-  - path: test\report
-    type: zip
   - path: hs_err_pid*.log

trunk/test/unit/org/openstreetmap/josm/testutils/PluginServer.java

@@ -26 +26 @@
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Streams;
 
 public class PluginServer {
@@ -118 +119 @@
 
                 if (jarPath.startsWith(filesRootPath)) {
-                    return filesRootPath.relativize(jarPath).toString();
+                    // would just use .toString() but need to force use of *forward slash* path separators on all platforms
+                    return Streams.stream(filesRootPath.relativize(jarPath)).map(p -> p.toString()).collect(Collectors.joining("/"));
                 }
             }