microprofile-rest-client-tck: tests failed on Windows (#198)

Signed-off-by: Alexey Markevich <[email protected]>

Author: Alexey Markevich

tck/src/main/java/org/eclipse/microprofile/rest/client/tck/ssl/AbstractSslTest.java

@@ -163,6 +163,10 @@ private static void copyResourceTo(String resource, Path directory) {
         }
     }
 
+    static String filePath(File file) {
+        return file.toURI().toString();
+    }
+
     @BeforeClass
     public static void initHttpsServer() {
         initializeCertificateLocations();

tck/src/main/java/org/eclipse/microprofile/rest/client/tck/ssl/SslMutualTest.java

@@ -66,25 +66,25 @@ public static WebArchive createDeployment() {
         // @formatter:off
         String config =
             configLine(JsonPClient.class, "uri", BASE_URI_STRING) +
-            configLine(ClientWithTruststore.class, "trustStore", clientTruststore.getAbsolutePath()) +
+            configLine(ClientWithTruststore.class, "trustStore", filePath(clientTruststore)) +
             configLine(ClientWithTruststore.class, "trustStorePassword", PASSWORD) +
             configLine(ClientWithTruststore.class, "uri", BASE_URI_STRING) +
 
-            configLine(ClientWithKeystoreAndTruststore.class, "trustStore", clientTruststore.getAbsolutePath()) +
+            configLine(ClientWithKeystoreAndTruststore.class, "trustStore", filePath(clientTruststore)) +
             configLine(ClientWithKeystoreAndTruststore.class, "trustStorePassword", PASSWORD) +
-            configLine(ClientWithKeystoreAndTruststore.class, "keyStore", clientKeystore.getAbsolutePath()) +
+            configLine(ClientWithKeystoreAndTruststore.class, "keyStore", filePath(clientKeystore)) +
             configLine(ClientWithKeystoreAndTruststore.class, "keyStorePassword", PASSWORD) +
             configLine(ClientWithKeystoreAndTruststore.class, "uri", BASE_URI_STRING) +
 
-            configLine(ClientWithKeystoreFromClasspathAndTruststore.class, "trustStore", clientTruststore.getAbsolutePath()) +
+            configLine(ClientWithKeystoreFromClasspathAndTruststore.class, "trustStore", filePath(clientTruststore)) +
             configLine(ClientWithKeystoreFromClasspathAndTruststore.class, "trustStorePassword", PASSWORD) +
             configLine(ClientWithKeystoreFromClasspathAndTruststore.class, "keyStore", "classpath:/META-INF/" + clientKeystoreFromClasspath) +
             configLine(ClientWithKeystoreFromClasspathAndTruststore.class, "keyStorePassword", PASSWORD) +
             configLine(ClientWithKeystoreFromClasspathAndTruststore.class, "uri", BASE_URI_STRING) +
 
-            configLine(ClientWithNonMatchingStore.class, "trustStore", clientTruststore.getAbsolutePath()) +
+            configLine(ClientWithNonMatchingStore.class, "trustStore", filePath(clientTruststore)) +
             configLine(ClientWithNonMatchingStore.class, "trustStorePassword", PASSWORD) +
-            configLine(ClientWithNonMatchingStore.class, "keyStore", serverKeystore.getAbsolutePath()) +
+            configLine(ClientWithNonMatchingStore.class, "keyStore", filePath(serverKeystore)) +
             configLine(ClientWithNonMatchingStore.class, "keyStorePassword", PASSWORD) +
             configLine(ClientWithNonMatchingStore.class, "uri", BASE_URI_STRING);
         // @formatter:on

tck/src/main/java/org/eclipse/microprofile/rest/client/tck/ssl/SslTrustStoreTest.java

@@ -30,7 +30,6 @@
 
 import javax.inject.Inject;
 import javax.ws.rs.ProcessingException;
-import java.io.File;
 import java.security.KeyStore;
 
 import static org.eclipse.microprofile.rest.client.tck.utils.ConfigUtil.configLine;
@@ -82,10 +81,6 @@ public static WebArchive createDeployment() {
         return webArchive;
     }
 
-    private static String filePath(File file) {
-        return String.format("file:%s", file.getAbsolutePath());
-    }
-
     @Test(expectedExceptions = ProcessingException.class)
     public void shouldFailWithSelfSignedKeystore() {
         RestClientBuilder.newBuilder()