Changeset 14179 in josm


Ignore:
Timestamp:
2018-08-22T22:55:16+02:00 (11 months ago)
Author:
Don-vip
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/appveyor.yml

    r14168 r14179  
    1515            $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_))
    1616        }
     17  # we want to push test result artifact even if the tests fail, so uploading manually
     18  - 7z a test-results.zip test\report\TEST*.xml
     19  - ps: Push-AppveyorArtifact test-results.zip
    1720artifacts:
    1821  - path: dist\josm-custom.*
     
    2023  - path: pmd-josm.xml
    2124  - path: spotbugs-josm.xml
    22   - path: test\report
    23     type: zip
    2425  - path: hs_err_pid*.log
  • trunk/test/unit/org/openstreetmap/josm/testutils/PluginServer.java

    r14153 r14179  
    2626import com.github.tomakehurst.wiremock.junit.WireMockRule;
    2727import com.google.common.collect.ImmutableList;
     28import com.google.common.collect.Streams;
    2829
    2930public class PluginServer {
     
    118119
    119120                if (jarPath.startsWith(filesRootPath)) {
    120                     return filesRootPath.relativize(jarPath).toString();
     121                    // would just use .toString() but need to force use of *forward slash* path separators on all platforms
     122                    return Streams.stream(filesRootPath.relativize(jarPath)).map(p -> p.toString()).collect(Collectors.joining("/"));
    121123                }
    122124            }
Note: See TracChangeset for help on using the changeset viewer.