From 62cd4518e4e27f04678009dde55d3e2e309289db Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Thu, 11 Jun 2026 01:20:05 +0200 Subject: [PATCH 1/2] Minor fixes to some integration tests. InfoTest fails if running against a CF where v2 API is disabled. OrganizationsTest fails when running in kind-deployment landscape. The package "serviceInstances" (with capital "I") does not match the package declaration in the contained class. This creates problems in Eclipse on Windows. --- .../ReactorServiceInstancesV3Test.java | 0 .../org/cloudfoundry/client/v2/InfoTest.java | 11 +++++++++-- .../client/v3/OrganizationsTest.java | 16 +++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) rename cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/{serviceInstances => serviceinstances}/ReactorServiceInstancesV3Test.java (100%) diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceinstances/ReactorServiceInstancesV3Test.java similarity index 100% rename from cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java rename to cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceinstances/ReactorServiceInstancesV3Test.java diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java index a4395079a5..b94c87a187 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java @@ -43,8 +43,15 @@ public void info() { .consumeNextWith( response -> { Version expected = Version.valueOf(SUPPORTED_API_VERSION); - Version actual = Version.valueOf(response.getApiVersion()); - + Version actual; + String version = response.getApiVersion(); + if (version == null || version.isEmpty()) { + assertThat("CF API v2 is disabled") + .isEqualTo(response.getSupport()); + actual = Version.of(0, 0, 0); + } else { + actual = Version.valueOf(version); + } assertThat(actual).isLessThanOrEqualTo(expected); }) .expectComplete() diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationsTest.java index e3da7d85e6..b62945d504 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/OrganizationsTest.java @@ -183,7 +183,21 @@ public void getDefaultDomain() { .map(GetOrganizationDefaultDomainResponse::getName) .as(StepVerifier::create) .consumeNextWith( - name -> assertThat(name).contains("apps.", ".shepherd.tanzu.broadcom.net")) + name -> { + assertThat(name) + .satisfiesAnyOf( + nameParam -> + assertThat(nameParam) + .contains( + "apps.", + ".shepherd.tanzu.broadcom.net"), + nameParam -> + assertThat(nameParam) + .contains( + "apps.", + ".127-0-0-1.nip.io")); // when + // testing with kind-deploy. + }) .expectComplete() .verify(Duration.ofMinutes(5)); } From 2d87c86fde287a8eccad704a94edcf884fbd878b Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Thu, 11 Jun 2026 15:10:57 +0200 Subject: [PATCH 2/2] Fix ApplicationsTest.pushNewDocker The old docker image was outdated and did not work on recent docker versions. Switching to the image of a better supported test application. --- .../test/java/org/cloudfoundry/operations/ApplicationsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java index 13b9fc1d3b..d84a820794 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java @@ -2020,7 +2020,7 @@ private static Mono createDockerApplication( .push( PushApplicationRequest.builder() .diskQuota(512) - .dockerImage("cloudfoundry/lattice-app") + .dockerImage("cloudfoundry/grace") .healthCheckType(ApplicationHealthCheck.PORT) .memory(64) .name(name)