Test Uploading Directories

nebhale · nebhale · commit 918a24d9bdfe · 2017-03-13T11:58:32.000-07:00
Previously, all testing of application upload was done with archives.  This
change adds tests at both the client and operations layer to ensure that
directory upload works as well.
diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ApplicationsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ApplicationsTest.java
@@ -827,6 +827,30 @@ public void uploadAndDownloadAsyncFalse() throws TimeoutException, InterruptedEx
             .verify(Duration.ofMinutes(5));
     }
 
+    @Test
+    public void uploadDirectory() {
+        String applicationName = this.nameFactory.getApplicationName();
+
+        this.spaceId
+            .then(spaceId -> createApplicationId(this.cloudFoundryClient, spaceId, applicationName))
+            .then(applicationId -> {
+                try {
+                    return this.cloudFoundryClient.applicationsV2()
+                        .upload(UploadApplicationRequest.builder()
+                            .application(new ClassPathResource("test-application").getFile().toPath())
+                            .async(true)
+                            .applicationId(applicationId)
+                            .build())
+                        .then(job -> JobUtils.waitForCompletion(this.cloudFoundryClient, Duration.ofMinutes(5), job));
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            })
+            .as(StepVerifier::create)
+            .expectComplete()
+            .verify(Duration.ofMinutes(5));
+    }
+
     private static Consumer<Tuple2<String, AbstractApplicationResource>> applicationIdAndNameEquality(String name) {
         Assert.notNull(name, "name must not be null");
 
diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java
@@ -168,6 +168,16 @@ public void getStopped() throws TimeoutException, InterruptedException, IOExcept
             .verify(Duration.ofMinutes(5));
     }
 
+    @Test
+    public void pushDirectory() throws TimeoutException, InterruptedException, IOException {
+        String applicationName = this.nameFactory.getApplicationName();
+
+        createApplication(this.cloudFoundryOperations, new ClassPathResource("test-application").getFile().toPath(), applicationName, false)
+            .as(StepVerifier::create)
+            .expectComplete()
+            .verify(Duration.ofMinutes(5));
+    }
+
     @Test
     public void pushDomainNotFound() throws TimeoutException, InterruptedException, IOException {
         String applicationName = this.nameFactory.getApplicationName();
diff --git a/integration-test/src/test/resources/test-application/Staticfile b/integration-test/src/test/resources/test-application/Staticfile
diff --git a/integration-test/src/test/resources/test-application/index.html b/integration-test/src/test/resources/test-application/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Hello Web!</title>
+</head>
+<body>
+<p>Hello Web!</p>
+</body>
+</html>
