Fix unit tests on Windows

Author: nictas

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applications/ReactorApplicationsV2Test.java

@@ -1002,10 +1002,10 @@ public void upload() throws IOException {
                             "{\"sha1\":\"ff84f89760317996b9dd180ab996b079f418396f\",\"fn\":\"path/to/code.jar\",\"size\":123}]" +
                             "\r\n" + "--" + boundary + "\r\n" +
                             "content-disposition: form-data; name=\"application\"; filename=\"application.zip\"\r\n" +
-                            "content-length: 13\r\n" +
+                            "content-length: 12\r\n" +
                             "content-type: application/zip\r\n" +
                             "\r\n" +
-                            "test-content\n" +
+                            "test-content" +
                             "\r\n" +
                             "--" + boundary + "--");
                 }))
@@ -1058,9 +1058,9 @@ public void uploadDroplet() throws IOException {
                     assertThat(body.readString(Charset.defaultCharset()))
                         .isEqualTo("\r\n" + "--" + boundary + "\r\n" +
                             "content-disposition: form-data; name=\"droplet\"; filename=\"test-droplet.tgz\"\r\n" +
-                            "content-length: 13\r\n" +
+                            "content-length: 12\r\n" +
                             "\r\n" +
-                            "test-content\n" +
+                            "test-content" +
                             "\r\n" +
                             "--" + boundary + "--");
                 }))

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/buildpacks/ReactorBuildpacksTest.java

@@ -280,10 +280,10 @@ public void upload() throws IOException {
                     assertThat(body.readString(Charset.defaultCharset()))
                         .isEqualTo("\r\n--" + boundary + "\r\n" +
                             "content-disposition: form-data; name=\"buildpack\"; filename=\"test-filename\"\r\n" +
-                            "content-length: 13\r\n" +
+                            "content-length: 12\r\n" +
                             "content-type: application/zip\r\n" +
                             "\r\n" +
-                            "test-content\n" +
+                            "test-content" +
                             "\r\n" +
                             "--" + boundary + "--");
                 }))

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/packages/ReactorPackagesTest.java

@@ -471,10 +471,10 @@ public void upload() throws IOException {
                     assertThat(body.readString(Charset.defaultCharset()))
                         .isEqualTo("\r\n--" + boundary + "\r\n" +
                             "content-disposition: form-data; name=\"bits\"; filename=\"application.zip\"\r\n" +
-                            "content-length: 13\r\n" +
+                            "content-length: 12\r\n" +
                             "content-type: application/zip\r\n" +
                             "\r\n" +
-                            "test-content\n" +
+                            "test-content" +
                             "\r\n" +
                             "--" + boundary + "--");
                 }))

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v2/apps/test-application.zip

@@ -1 +1 @@
-test-content
+test-content

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v2/apps/test-droplet.tgz

@@ -1 +1 @@
-test-content
+test-content

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v2/buildpacks/test-buildpack.zip

@@ -1 +1 @@
-test-content
+test-content

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/packages/test-package.zip

@@ -1 +1 @@
-test-content
+test-content

cloudfoundry-operations/pom.xml

@@ -91,6 +91,11 @@
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java

@@ -16,6 +16,7 @@
 
 package org.cloudfoundry.operations.applications;
 
+import org.apache.commons.lang3.SystemUtils;
 import org.junit.Test;
 import org.springframework.core.io.ClassPathResource;
 
@@ -30,6 +31,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.operations.applications.ApplicationHealthCheck.NONE;
 import static org.cloudfoundry.operations.applications.ApplicationHealthCheck.PORT;
+import static org.junit.Assume.assumeTrue;
 
 public final class ApplicationManifestUtilsTest {
 
@@ -512,7 +514,18 @@ public void testDiskQuotaAndMemoryParsing() throws Exception {
     }
 
     @Test
-    public void write() throws IOException {
+    public void windowsWrite() throws IOException {
+        assumeTrue(SystemUtils.IS_OS_WINDOWS);
+        write("c:\\alpha-path", "fixtures/manifest-echo-windows.yml");
+    }
+
+    @Test
+    public void unixWrite() throws IOException {
+        assumeTrue(SystemUtils.IS_OS_UNIX);
+        write("/alpha-path", "fixtures/manifest-echo-unix.yml");
+    }
+
+    private void write(String path, String expectedManifest) throws IOException {
         Path out = Files.createTempFile("test-manifest-", ".yml");
 
         ApplicationManifestUtils.write(out, Arrays.asList(
@@ -525,7 +538,7 @@ public void write() throws IOException {
                 .instances(-1)
                 .memory(512)
                 .noRoute(true)
-                .path(Paths.get("/alpha-path"))
+                .path(Paths.get(path))
                 .randomRoute(true)
                 .route(Route.builder()
                     .route("alpha-route-1")
@@ -555,7 +568,7 @@ public void write() throws IOException {
                 .instances(-1)
                 .noHostname(true)
                 .noRoute(true)
-                .path(Paths.get("c:\\alpha-path"))
+                .path(Paths.get(path))
                 .randomRoute(true)
                 .stack("alpha-stack")
                 .timeout(-1)
@@ -565,7 +578,7 @@ public void write() throws IOException {
                 .service("alpha-instance-2")
                 .build()));
 
-        List<String> expected = Files.readAllLines(new ClassPathResource("fixtures/manifest-echo.yml").getFile().toPath());
+        List<String> expected = Files.readAllLines(new ClassPathResource(expectedManifest).getFile().toPath());
         List<String> actual = Files.readAllLines(out);
 
         assertThat(actual).isEqualTo(expected);

cloudfoundry-operations/src/test/resources/fixtures/manifest-echo-unix.yml

@@ -0,0 +1,49 @@
+---
+applications:
+- buildpack: alpha-buildpack
+  command: alpha-command
+  disk_quota: 512M
+  env:
+    ALPHA_KEY_1: alpha-value-1
+    ALPHA_KEY_2: alpha-value-2
+  health-check-http-endpoint: alpha-health-check-http-endpoint
+  instances: -1
+  memory: 512M
+  name: alpha-application-1
+  no-route: true
+  path: /alpha-path
+  random-route: true
+  routes:
+  - route: alpha-route-1
+  - route: alpha-route-2
+  services:
+  - alpha-instance-1
+  - alpha-instance-2
+  stack: alpha-stack
+  timeout: -1
+- buildpack: alpha-buildpack
+  command: alpha-command
+  domains:
+  - alpha-domain
+  - alpha-domains-1
+  - alpha-domains-2
+  env:
+    ALPHA_KEY_1: alpha-value-1
+    ALPHA_KEY_2: alpha-value-2
+  health-check-http-endpoint: alpha-health-check-http-endpoint
+  health-check-type: port
+  hosts:
+  - alpha-host
+  - alpha-hosts-1
+  - alpha-hosts-2
+  instances: -1
+  name: alpha-application-2
+  no-hostname: true
+  no-route: true
+  path: /alpha-path
+  random-route: true
+  services:
+  - alpha-instance-1
+  - alpha-instance-2
+  stack: alpha-stack
+  timeout: -1