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/v2/SpacesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/SpacesTest.java index 54fc74e861..ee2e2fa6f6 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/SpacesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/SpacesTest.java @@ -24,6 +24,7 @@ import java.time.Instant; import java.util.Collections; import java.util.Date; +import java.util.List; import java.util.function.Function; import java.util.function.UnaryOperator; import org.cloudfoundry.AbstractIntegrationTest; @@ -109,7 +110,6 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; @@ -1885,13 +1885,9 @@ public void listServicesFilterByLabel() { .verify(Duration.ofMinutes(5)); } - // TODO: Await https://github.com/cloudfoundry/cloud_controller_ng/issues/856 for this test to - // work - @Disabled( - "Await https://github.com/cloudfoundry/cloud_controller_ng/issues/856 for this test to" - + " work") @Test public void listServicesFilterByServiceBrokerId() { + List expectedValues = List.of(this.serviceName, this.serviceName + "-shareable"); Mono.zip(this.serviceBrokerId, this.spaceId) .flatMapMany( function( @@ -1903,9 +1899,10 @@ public void listServicesFilterByServiceBrokerId() { builder.serviceBrokerId(serviceBrokerId)))) .map(response -> response.getEntity().getLabel()) .as(StepVerifier::create) - .expectNext(this.serviceName) + .consumeNextWith(element -> assertThat(element).isIn(expectedValues)) + .consumeNextWith(element -> assertThat(element).isIn(expectedValues)) .expectComplete() - .verify(Duration.ofMinutes(5)); + .verify(Duration.ofMinutes(10)); } @Test 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)); } diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/PackagesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/PackagesTest.java index 967923af84..e35bf3a026 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/PackagesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/PackagesTest.java @@ -30,9 +30,9 @@ import org.cloudfoundry.client.v3.packages.CreatePackageRequest; import org.cloudfoundry.client.v3.packages.GetPackageRequest; import org.cloudfoundry.client.v3.packages.Package; +import org.cloudfoundry.client.v3.packages.PackageRelationships; import org.cloudfoundry.client.v3.packages.PackageType; import org.cloudfoundry.client.v3.packages.UploadPackageRequest; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; @@ -40,7 +40,6 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -@Disabled("Until Packages are no longer experimental") public final class PackagesTest extends AbstractIntegrationTest { @Autowired private CloudFoundryClient cloudFoundryClient; @@ -81,6 +80,19 @@ public void upload() { .create( CreatePackageRequest.builder() .type(PackageType.BITS) + .relationships( + PackageRelationships.builder() + .application( + ToOneRelationship + .builder() + .data( + Relationship + .builder() + .id( + applicationId) + .build()) + .build()) + .build()) .build())) .map(Package::getId) .flatMap( 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) diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java index 39d956f801..0c9e107053 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java @@ -125,11 +125,13 @@ public void getTokenByClientCredentials() { .verify(Duration.ofMinutes(5)); } - // TODO: Ready to Implement - Await https://github.com/cloudfoundry/cf-java-client/issues/862 to - // get passcode - @Disabled( - "Ready to Implement - Await https://github.com/cloudfoundry/cf-java-client/issues/862" - + " to get passcode") + // When implemented, will fix issue: https://github.com/cloudfoundry/cf-java-client/issues/910. + // Could be done similarly to "getTokenByAuthorizationCode". + // First user_token grant type must be implented. + // See: https://docs.cloudfoundry.org/api/uaa/index.html#user-token-grant + // Then this endpoint must be called first, to create the token. + // See: https://docs.cloudfoundry.org/api/uaa/index.html#saml2-bearer-grant + @Disabled("Ready to Implement") @Test public void getTokenByOneTimePasscode() { this.uaaClient