More CI Fixes

This commit further tweaks what versions of Cloud Foundry some tests will work against,
and improves the resilience of some tests.

Signed-off-by: Paul Harris <harrisp@vmware.com>

Author: twoseat

integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java

@@ -107,7 +107,7 @@ public void listApplicationRoutesByDomain() {
             .flatMap(function((domainId, spaceId) -> Mono.zip(
                 createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
                 Mono.just(domainId),
-                createRouteId(this.cloudFoundryClient, domainId, "listByDomain", spaceId)
+                createRouteId(this.cloudFoundryClient, domainId, "listApplicationRoutesByDomain", spaceId)
             )))
             .delayUntil(function((applicationId, domainId, routeId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)))
             .flatMapMany(function((applicationId, domainId, ignore) -> PaginationUtils.requestClientV3Resources(page ->
@@ -120,7 +120,7 @@ public void listApplicationRoutesByDomain() {
             .map(RouteResource::getMetadata)
             .map(Metadata::getLabels)
             .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listByDomain-key", "test-listByDomain-value"))
+            .expectNext(Collections.singletonMap("test-listApplicationRoutesByDomain-key", "test-listApplicationRoutesByDomain-value"))
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
@@ -139,7 +139,7 @@ public void listApplicationRoutesByHost() {
             ))
             .flatMap(function((domainId, spaceId) -> Mono.zip(
                 createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
-                createRouteId(this.cloudFoundryClient, domainId, hostName, "listByHost", null, null, spaceId)
+                createRouteId(this.cloudFoundryClient, domainId, hostName, "listApplicationRoutesByHost", null, null, spaceId)
             )))
             .flatMap(function((applicationId, routeId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
                 .thenReturn(applicationId)))
@@ -150,11 +150,11 @@ public void listApplicationRoutesByHost() {
                         .host(hostName)
                         .page(page)
                         .build())))
-            .filter(route -> route.getMetadata().getLabels().containsKey("test-listByHost-key"))
+            .filter(route -> route.getMetadata().getLabels().containsKey("test-listApplicationRoutesByHost-key"))
             .map(RouteResource::getMetadata)
             .map(Metadata::getLabels)
             .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listByHost-key", "test-listByHost-value"))
+            .expectNext(Collections.singletonMap("test-listApplicationRoutesByHost-key", "test-listApplicationRoutesByHost-value"))
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
@@ -164,29 +164,30 @@ public void listApplicationRoutesByHost() {
     public void listApplicationRoutesByLabelSelector() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
+        String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
             .flatMap(organizationId -> Mono.zip(
                 createDomainId(this.cloudFoundryClient, domainName, organizationId),
-                this.spaceId
+                createSpaceId(this.cloudFoundryClient, organizationId, spaceName)
             ))
             .flatMap(function((domainId, spaceId) -> Mono.zip(
                 createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
-                createRouteId(this.cloudFoundryClient, domainId, "listByLabelSelector", spaceId)
+                createRouteId(this.cloudFoundryClient, domainId, "listApplicationRoutesByLabelSelector", spaceId)
             )))
             .flatMapMany(function((applicationId, routeId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
                 .thenReturn(applicationId)))
             .flatMap(applicationId -> PaginationUtils.requestClientV3Resources(page ->
                 this.cloudFoundryClient.applicationsV3()
                     .listRoutes(ListApplicationRoutesRequest.builder()
                         .applicationId(applicationId)
-                        .labelSelector("test-listByLabelSelector-key=test-listByLabelSelector-value")
+                        .labelSelector("test-listApplicationRoutesByLabelSelector-key=test-listApplicationRoutesByLabelSelector-value")
                         .page(page)
                         .build())))
             .map(RouteResource::getMetadata)
             .map(Metadata::getLabels)
             .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listByLabelSelector-key", "test-listByLabelSelector-value"))
+            .expectNext(Collections.singletonMap("test-listApplicationRoutesByLabelSelector-key", "test-listApplicationRoutesByLabelSelector-value"))
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
@@ -209,7 +210,7 @@ public void listApplicationRoutesByOrganizationId() {
             .flatMap(function((domainId, organizationId, spaceId) -> Mono.zip(
                 createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
                 Mono.just(organizationId),
-                createRouteId(this.cloudFoundryClient, domainId, "listByOrganizationId", spaceId)
+                createRouteId(this.cloudFoundryClient, domainId, "listApplicationRoutesByOrganizationId", spaceId)
             )))
             .delayUntil(function((applicationId, organizationId, routeId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)))
             .flatMapMany(function((applicationId, organizationId, ignore) -> PaginationUtils.requestClientV3Resources(page ->
@@ -222,7 +223,7 @@ public void listApplicationRoutesByOrganizationId() {
             .map(RouteResource::getMetadata)
             .map(Metadata::getLabels)
             .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listByOrganizationId-key", "test-listByOrganizationId-value"))
+            .expectNext(Collections.singletonMap("test-listApplicationRoutesByOrganizationId-key", "test-listApplicationRoutesByOrganizationId-value"))
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
@@ -242,7 +243,7 @@ public void listApplicationRoutesByPath() {
 
             .flatMap(function((domainId, spaceId) -> Mono.zip(
                 createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
-                createRouteId(this.cloudFoundryClient, domainId, null, "listByPath", path, null, spaceId)
+                createRouteId(this.cloudFoundryClient, domainId, null, "listApplicationRoutesByPath", path, null, spaceId)
             )))
             .flatMapMany(function((applicationId, routeId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
                 .thenReturn(applicationId)))
@@ -253,11 +254,11 @@ public void listApplicationRoutesByPath() {
                         .path(path)
                         .page(page)
                         .build())))
-            .filter(route -> route.getMetadata().getLabels().containsKey("test-listByPath-key"))
+            .filter(route -> route.getMetadata().getLabels().containsKey("test-listApplicationRoutesByPath-key"))
             .map(RouteResource::getMetadata)
             .map(Metadata::getLabels)
             .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listByPath-key", "test-listByPath-value"))
+            .expectNext(Collections.singletonMap("test-listApplicationRoutesByPath-key", "test-listApplicationRoutesByPath-value"))
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
@@ -278,7 +279,7 @@ public void listApplicationRoutesByPort() {
 
             .flatMap(function((domainId, spaceId) -> Mono.zip(
                 createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
-                createRouteId(this.cloudFoundryClient, domainId, null, "listByPort", null, port, spaceId)
+                createRouteId(this.cloudFoundryClient, domainId, null, "listApplicationRoutesByPort", null, port, spaceId)
             )))
             .flatMapMany(function((applicationId, routeId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
                 .thenReturn(applicationId)))
@@ -289,11 +290,11 @@ public void listApplicationRoutesByPort() {
                         .port(port)
                         .page(page)
                         .build())))
-            .filter(route -> route.getMetadata().getLabels().containsKey("test-listByPort-key"))
+            .filter(route -> route.getMetadata().getLabels().containsKey("test-listApplicationRoutesByPort-key"))
             .map(RouteResource::getMetadata)
             .map(Metadata::getLabels)
             .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listByPort-key", "test-listByPort-value"))
+            .expectNext(Collections.singletonMap("test-listApplicationRoutesByPort-key", "test-listApplicationRoutesByPort-value"))
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
@@ -303,16 +304,17 @@ public void listApplicationRoutesByPort() {
     public void listApplicationRoutesBySpaceId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
+        String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
             .flatMap(organizationId -> Mono.zip(
                 createDomainId(this.cloudFoundryClient, domainName, organizationId),
-                this.spaceId
+                createSpaceId(this.cloudFoundryClient, organizationId, spaceName)
             ))
 
             .flatMap(function((domainId, spaceId) -> Mono.zip(
                 createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
-                createRouteId(this.cloudFoundryClient, domainId, "listBySpaceId", spaceId),
+                createRouteId(this.cloudFoundryClient, domainId, "listApplicationRoutesBySpaceId", spaceId),
                 Mono.just(spaceId)
             )))
             .delayUntil(function((applicationId, routeId, spaceId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
@@ -324,11 +326,11 @@ public void listApplicationRoutesBySpaceId() {
                         .page(page)
                         .spaceId(spaceId)
                         .build()))))
-            .filter(route -> route.getMetadata().getLabels().containsKey("test-listBySpaceId-key"))
+            .filter(route -> route.getMetadata().getLabels().containsKey("test-listApplicationRoutesBySpaceId-key"))
             .map(RouteResource::getMetadata)
             .map(Metadata::getLabels)
             .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listBySpaceId-key", "test-listBySpaceId-value"))
+            .expectNext(Collections.singletonMap("test-listApplicationRoutesBySpaceId-key", "test-listApplicationRoutesBySpaceId-value"))
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }

integration-test/src/test/java/org/cloudfoundry/client/v3/RoutesTest.java

@@ -71,7 +71,7 @@ public final class RoutesTest extends AbstractIntegrationTest {
     @Autowired
     private Mono<String> spaceId;
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void create() {
         String domainName = this.nameFactory.getDomainName();
@@ -110,7 +110,7 @@ public void create() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void get() {
         String domainName = this.nameFactory.getDomainName();
@@ -134,7 +134,7 @@ public void get() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void insertDestinations() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -171,7 +171,7 @@ public void insertDestinations() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void list() {
         String domainName = this.nameFactory.getDomainName();
@@ -228,7 +228,7 @@ public void listByApplicationId() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listByDomain() {
         String domainName = this.nameFactory.getDomainName();
@@ -254,7 +254,7 @@ public void listByDomain() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listByHost() {
         String domainName = this.nameFactory.getDomainName();
@@ -281,15 +281,16 @@ public void listByHost() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listByLabelSelector() {
         String domainName = this.nameFactory.getDomainName();
+        String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
             .flatMap(organizationId -> Mono.zip(
                 createDomainId(this.cloudFoundryClient, domainName, organizationId),
-                this.spaceId
+                createSpaceId(this.cloudFoundryClient, organizationId, spaceName)
             ))
             .flatMap(function((domainId, spaceId) -> requestCreateRoute(this.cloudFoundryClient, domainId, "listByLabelSelector", spaceId)
                 .thenReturn(domainId)))
@@ -307,7 +308,7 @@ public void listByLabelSelector() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listByOrganizationId() {
         String domainName = this.nameFactory.getDomainName();
@@ -336,7 +337,7 @@ public void listByOrganizationId() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listByPath() {
         String domainName = this.nameFactory.getDomainName();
@@ -389,15 +390,16 @@ public void listByPort() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listBySpaceId() {
         String domainName = this.nameFactory.getDomainName();
+        String spaceName = this.nameFactory.getSpaceName();
 
         this.organizationId
             .flatMap(organizationId -> Mono.zip(
                 createDomainId(this.cloudFoundryClient, domainName, organizationId),
-                this.spaceId
+                createSpaceId(this.cloudFoundryClient, organizationId, spaceName)
             ))
             .flatMap(function((domainId, spaceId) -> createRouteId(this.cloudFoundryClient, domainId, "listBySpaceId", spaceId)
                 .thenReturn(spaceId)))
@@ -416,7 +418,7 @@ public void listBySpaceId() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listDestinations() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -451,7 +453,7 @@ public void listDestinations() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listDestinationsByApplicationId() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -487,7 +489,7 @@ public void listDestinationsByApplicationId() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listDestinationsById() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -523,7 +525,7 @@ public void listDestinationsById() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void removeDestinations() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -557,7 +559,7 @@ public void removeDestinations() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void replaceDestinations() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -594,7 +596,7 @@ public void replaceDestinations() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void update() {
         String domainName = this.nameFactory.getDomainName();