Changeset 14179 in josm for trunk/test/unit/org

Timestamp:

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

Author:

Don-vip

Message:

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

File:

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

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("/"));
                 }
             }