diff --git a/.github/workflows/ci-java-8-and-11.yml b/.github/workflows/ci-java-8-and-11.yml index 27082a618a..b0eda0b9b9 100644 --- a/.github/workflows/ci-java-8-and-11.yml +++ b/.github/workflows/ci-java-8-and-11.yml @@ -33,6 +33,8 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Build with Maven run: ./mvnw clean package -Dgpg.skip + - name: Compile integration tests + run: ./mvnw -Pintegration-test test-compile compile - if: ${{ matrix.java != 8 }} name: Check style with Spotless run: ./mvnw spotless:check diff --git a/integration-test/pom.xml b/integration-test/pom.xml index e1b541e150..c7f8e86a6e 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -76,6 +76,18 @@ ${project.version} test + + org.hamcrest + hamcrest-junit + 2.0.0.0 + test + + + junit + junit + + + org.immutables value @@ -91,11 +103,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - diff --git a/integration-test/src/test/java/org/cloudfoundry/AbstractIntegrationTest.java b/integration-test/src/test/java/org/cloudfoundry/AbstractIntegrationTest.java index b84496bff2..d4fac05732 100644 --- a/integration-test/src/test/java/org/cloudfoundry/AbstractIntegrationTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/AbstractIntegrationTest.java @@ -16,16 +16,14 @@ package org.cloudfoundry; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TestName; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; @@ -34,36 +32,40 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Method; +import java.util.Optional; import java.util.function.Consumer; import static org.assertj.core.api.Assertions.assertThat; import static org.cloudfoundry.util.tuple.TupleUtils.consumer; -@RunWith(SpringRunner.class) -@ContextConfiguration(classes = IntegrationTestConfiguration.class) +@SpringJUnitConfig(classes = IntegrationTestConfiguration.class) public abstract class AbstractIntegrationTest { private final Logger logger = LoggerFactory.getLogger("cloudfoundry-client.test"); - @Rule - public final TestName testName = new TestName(); - - @Autowired - @Rule - public CloudFoundryVersionConditionalRule cloudFoundryVersion; + public String testName; @Autowired protected NameFactory nameFactory; - @Before - public void testEntry() { + @Autowired + @RegisterExtension + public CloudFoundryVersionConditionalRule cloudFoundryVersionConditionalRule; + + @BeforeEach + public void testEntry(TestInfo testInfo) { + Optional testMethod = testInfo.getTestMethod(); + if (testMethod.isPresent()) { + this.testName = testMethod.get().getName(); + } this.logger.debug(">> {} <<", getTestName()); } - @After + @AfterEach public final void testExit() { - this.logger.debug("<< {} >>", getTestName()); - } + this.logger.debug("<< {} >>", getTestName()); + } protected static Mono getBytes(String path) { try (InputStream in = new FileInputStream(new File("src/test/resources", path)); ByteArrayOutputStream out = new ByteArrayOutputStream()) { @@ -81,11 +83,11 @@ protected static Mono getBytes(String path) { } protected static Consumer> tupleEquality() { - return consumer((expected, actual) -> assertThat(actual).isEqualTo(expected)); - } + return consumer((expected, actual) -> assertThat(actual).isEqualTo(expected)); + } private String getTestName() { - return String.format("%s.%s", this.getClass().getSimpleName(), this.testName.getMethodName()); - } + return String.format("%s.%s", this.getClass().getSimpleName(), this.testName); + } -} +} \ No newline at end of file diff --git a/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersionConditionalRule.java b/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersionConditionalRule.java index 173b68bbe8..938be083fd 100644 --- a/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersionConditionalRule.java +++ b/integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersionConditionalRule.java @@ -17,17 +17,17 @@ package org.cloudfoundry; import com.github.zafarkhaja.semver.Version; -import org.junit.Assume; -import org.junit.rules.MethodRule; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.Statement; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; import org.springframework.core.annotation.AnnotationUtils; +import java.lang.reflect.AnnotatedElement; import java.util.Optional; import static org.cloudfoundry.CloudFoundryVersion.UNSPECIFIED; -final class CloudFoundryVersionConditionalRule implements MethodRule { +final class CloudFoundryVersionConditionalRule implements ExecutionCondition { private final Version server; @@ -36,23 +36,17 @@ final class CloudFoundryVersionConditionalRule implements MethodRule { } @Override - public Statement apply(Statement base, FrameworkMethod method, Object target) { - return new Statement() { + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + AnnotatedElement element = context.getElement().orElse(null); - @Override - public void evaluate() throws Throwable { - IfCloudFoundryVersion annotation = Optional.ofNullable(AnnotationUtils.findAnnotation(method.getMethod(), IfCloudFoundryVersion.class)) - .orElse(AnnotationUtils.findAnnotation(method.getDeclaringClass(), IfCloudFoundryVersion.class)); + IfCloudFoundryVersion annotation = AnnotationUtils.findAnnotation(element, IfCloudFoundryVersion.class); - boolean enabled = Optional.ofNullable(annotation) + boolean enabled = Optional.ofNullable(annotation) .map(c -> isTestEnabled(c, CloudFoundryVersionConditionalRule.this.server)) .orElse(true); - Assume.assumeTrue(String.format("Cloud Foundry version required by @IfCloudFoundryVersion is not valid for test method [%s].", method.getMethod()), enabled); - - base.evaluate(); - } - }; + return enabled ? ConditionEvaluationResult.enabled("Test enabled") : ConditionEvaluationResult.disabled(String.format("Cloud Foundry version required by @IfCloudFoundryVersion is not valid for test method [%s].", element)); + } private static boolean isTestEnabled(IfCloudFoundryVersion condition, Version server) { 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 index 32e273c10e..c382a682d0 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ApplicationsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ApplicationsTest.java @@ -69,6 +69,7 @@ import org.cloudfoundry.util.OperationUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.util.Assert; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java index 444433cf9b..72039529f0 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java @@ -20,6 +20,7 @@ import org.cloudfoundry.client.CloudFoundryClient; import org.cloudfoundry.client.v2.blobstores.DeleteBlobstoreBuildpackCachesRequest; import org.cloudfoundry.util.JobUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/BuildpacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/BuildpacksTest.java index 947fa424e8..96d5d67c97 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/BuildpacksTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/BuildpacksTest.java @@ -30,6 +30,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Flux; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java index 9042864216..d6252f5e98 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java @@ -45,6 +45,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java index f354682504..27b386712b 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java @@ -22,6 +22,7 @@ import org.cloudfoundry.client.v2.events.GetEventRequest; import org.cloudfoundry.client.v2.events.ListEventsRequest; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java index 4d65910362..74df21b802 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java @@ -22,6 +22,7 @@ import org.cloudfoundry.client.v2.featureflags.GetFeatureFlagRequest; import org.cloudfoundry.client.v2.featureflags.ListFeatureFlagsRequest; import org.cloudfoundry.client.v2.featureflags.SetFeatureFlagRequest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; 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 70b92b6615..624f020438 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 @@ -20,6 +20,7 @@ import org.cloudfoundry.AbstractIntegrationTest; import org.cloudfoundry.client.CloudFoundryClient; import org.cloudfoundry.client.v2.info.GetInfoRequest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java index 81df89392f..df0502d307 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java @@ -23,6 +23,7 @@ import org.cloudfoundry.client.v2.organizations.DeleteOrganizationRequest; import org.cloudfoundry.util.DelayUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java index b9b1b0c1bf..b032330a93 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java @@ -29,6 +29,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java index fa18fc1d85..e65c0df7a7 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationsTest.java @@ -87,6 +87,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/PrivateDomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/PrivateDomainsTest.java index d1fd29709d..aead1bd3a5 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/PrivateDomainsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/PrivateDomainsTest.java @@ -44,6 +44,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java index d56a526afa..ea1e201d08 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java @@ -33,6 +33,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java index 7232e7aaab..8096644df3 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java @@ -41,6 +41,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/SecurityGroupsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/SecurityGroupsTest.java index a3256df3c4..bdab4055cf 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/SecurityGroupsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/SecurityGroupsTest.java @@ -45,6 +45,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java index f9a482729f..7de601eecc 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java @@ -34,6 +34,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java index 96e7fc3118..b12c5dbd5f 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java @@ -29,6 +29,7 @@ import org.cloudfoundry.client.v2.spaces.CreateSpaceResponse; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.Exceptions; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceInstancesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceInstancesTest.java index 021d6e1a03..fda55548b4 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceInstancesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceInstancesTest.java @@ -53,6 +53,7 @@ import org.cloudfoundry.util.LastOperationUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceKeysTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceKeysTest.java index ae12918d5c..4cb50c91a5 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceKeysTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceKeysTest.java @@ -33,6 +33,7 @@ import org.cloudfoundry.client.v2.services.ServiceResource; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlanVisibilitiesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlanVisibilitiesTest.java index 88a2d31b1c..ced7c49f20 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlanVisibilitiesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlanVisibilitiesTest.java @@ -35,6 +35,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlansTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlansTest.java index 1c60929057..a1f9cfe982 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlansTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicePlansTest.java @@ -42,6 +42,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceUsageEventsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceUsageEventsTest.java index cdfd9f1f4b..2ace6af642 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceUsageEventsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceUsageEventsTest.java @@ -31,6 +31,7 @@ import org.cloudfoundry.client.v2.serviceusageevents.ServiceUsageEventResource; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicesTest.java index 1b0b4b9a8d..b7d6cf8b24 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServicesTest.java @@ -35,6 +35,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java index 94c484f906..1cd31825c2 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java @@ -29,6 +29,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/SpaceQuotaDefinitionsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/SpaceQuotaDefinitionsTest.java index e66fccb24f..0a15d044b8 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/SpaceQuotaDefinitionsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/SpaceQuotaDefinitionsTest.java @@ -37,7 +37,8 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -214,7 +215,7 @@ public void listSpacesFilterByApplicationId() { } //TODO: Await https://github.com/cloudfoundry/cf-java-client/issues/643 - @Ignore("Await https://github.com/cloudfoundry/cf-java-client/issues/643") + @Disabled("Await https://github.com/cloudfoundry/cf-java-client/issues/643") @Test public void listSpacesFilterByDeveloperId() { 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 fe2cb72c40..082576b477 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 @@ -98,7 +98,8 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -1201,7 +1202,7 @@ public void listServicesFilterByLabel() { } //TODO: Await https://github.com/cloudfoundry/cloud_controller_ng/issues/856 for this test to work - @Ignore("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() { Mono diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java index cb86a6274e..d8be42c4a4 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java @@ -28,6 +28,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java index 3561e835c1..b027a4edfd 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java @@ -41,6 +41,7 @@ import org.cloudfoundry.routing.RoutingClient; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/UsersTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/UsersTest.java index 7b97e0b650..75cf7af3d9 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/UsersTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/UsersTest.java @@ -70,6 +70,7 @@ import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/AdminTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/AdminTest.java index 868ec17ca1..0df875f8d5 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/AdminTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/AdminTest.java @@ -22,6 +22,7 @@ import org.cloudfoundry.client.CloudFoundryClient; import org.cloudfoundry.client.v3.admin.ClearBuildpackCacheRequest; import org.cloudfoundry.util.JobUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java index 40d937c0c7..92824c9b69 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java @@ -88,6 +88,7 @@ import org.cloudfoundry.util.DelayUtils; import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/AuditEventsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/AuditEventsTest.java index cb4246afbb..1f12bd1900 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/AuditEventsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/AuditEventsTest.java @@ -30,6 +30,7 @@ import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse; import org.cloudfoundry.client.v3.spaces.SpaceRelationships; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/BuildpacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/BuildpacksTest.java index 40c8628f50..da8a2a4e00 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/BuildpacksTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/BuildpacksTest.java @@ -29,6 +29,7 @@ import org.cloudfoundry.client.v3.buildpacks.UploadBuildpackRequest; import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Flux; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java index b37ab44927..56300d83ca 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java @@ -38,6 +38,7 @@ import org.cloudfoundry.operations.applications.GetApplicationRequest; import org.cloudfoundry.operations.applications.PushApplicationRequest; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Flux; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/DomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/DomainsTest.java index 654e3d1fb0..2f304ec2f6 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/DomainsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/DomainsTest.java @@ -43,6 +43,7 @@ import org.cloudfoundry.client.v3.routes.RouteRelationships; import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java index 5d6970ef09..e4694c39e5 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java @@ -43,6 +43,7 @@ import org.cloudfoundry.client.v3.spaces.AssignSpaceIsolationSegmentResponse; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; 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 f5a2cdc3f3..af3fc86a41 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 @@ -45,6 +45,7 @@ import org.cloudfoundry.client.v3.organizations.UpdateOrganizationRequest; import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; 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 689c1fd841..5bc4da470f 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 @@ -26,7 +26,8 @@ import org.cloudfoundry.client.v3.packages.Package; import org.cloudfoundry.client.v3.packages.PackageType; import org.cloudfoundry.client.v3.packages.UploadPackageRequest; -import org.junit.Ignore; +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; import reactor.core.Exceptions; @@ -40,7 +41,7 @@ import static org.cloudfoundry.client.v3.packages.PackageState.PROCESSING_UPLOAD; import static org.cloudfoundry.client.v3.packages.PackageState.READY; -@Ignore("Until Packages are no longer experimental") +@Disabled("Until Packages are no longer experimental") public final class PackagesTest extends AbstractIntegrationTest { @Autowired diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ProcessesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ProcessesTest.java index b6500c7d4b..94ab5e8751 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ProcessesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ProcessesTest.java @@ -41,6 +41,7 @@ import org.cloudfoundry.operations.applications.GetApplicationRequest; import org.cloudfoundry.operations.applications.PushApplicationRequest; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ResourceMatchTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ResourceMatchTest.java index 6f847e9b22..ff4235dce7 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ResourceMatchTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ResourceMatchTest.java @@ -34,7 +34,8 @@ import org.cloudfoundry.util.DelayTimeoutException; import org.cloudfoundry.util.ExceptionUtils; import org.cloudfoundry.util.ResourceMatchingUtilsV3; -import org.junit.Ignore; +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; import reactor.core.Exceptions; @@ -58,7 +59,7 @@ public class ResourceMatchTest extends AbstractIntegrationTest { @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9) @Test - @Ignore("Cloud Controller is configured not to cache resource smaller than 4k - Find a better way to test this") + @Disabled("Cloud Controller is configured not to cache resource smaller than 4k - Find a better way to test this") public void upload() throws IOException { createAndUploadPackage() .flatMap(this::waitForReady) diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/RolesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/RolesTest.java index a04ae0685e..6281f7e903 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/RolesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/RolesTest.java @@ -31,6 +31,7 @@ import org.cloudfoundry.client.v3.roles.RoleResource; import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/RoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/RoutesTest.java index 5f7545a101..2b36691c6f 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/RoutesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/RoutesTest.java @@ -48,6 +48,7 @@ import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse; import org.cloudfoundry.client.v3.spaces.SpaceRelationships; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBindingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBindingsTest.java index 96ee53685d..423576d34f 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBindingsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBindingsTest.java @@ -41,6 +41,7 @@ import org.cloudfoundry.client.v3.serviceplans.ServicePlan; import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBrokersTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBrokersTest.java index 2dcb88e463..044116656f 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBrokersTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceBrokersTest.java @@ -34,6 +34,7 @@ import org.cloudfoundry.client.v3.spaces.SpaceRelationships; import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.Exceptions; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceInstancesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceInstancesTest.java index 27ad2ffe1b..b899994432 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceInstancesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceInstancesTest.java @@ -44,6 +44,7 @@ import org.cloudfoundry.client.v3.spaces.SpaceRelationships; import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceOfferingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceOfferingsTest.java index 6b6bba6566..77f8c11cb7 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceOfferingsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceOfferingsTest.java @@ -31,6 +31,7 @@ import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse; import org.cloudfoundry.client.v3.spaces.SpaceRelationships; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServicePlansTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServicePlansTest.java index c828215702..7f91527338 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/ServicePlansTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/ServicePlansTest.java @@ -33,6 +33,7 @@ import org.cloudfoundry.client.v3.spaces.CreateSpaceResponse; import org.cloudfoundry.client.v3.spaces.SpaceRelationships; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java index 5693df0825..62c4f7ccb9 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/SpacesTest.java @@ -47,7 +47,8 @@ import org.cloudfoundry.client.v3.spaces.UpdateSpaceRequest; import org.cloudfoundry.util.JobUtils; import org.cloudfoundry.util.PaginationUtils; -import org.junit.Ignore; +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; import org.springframework.util.StreamUtils; @@ -142,7 +143,7 @@ public void delete() { //TODO: Await resolution of https://github.com/cloudfoundry/cloud_controller_ng/issues/1876 @IfCloudFoundryVersion(greaterThan = CloudFoundryVersion.PCF_2_9) - @Ignore("Await https://github.com/cloudfoundry/cf-java-client/issues/1876") + @Disabled("Await https://github.com/cloudfoundry/cf-java-client/issues/1876") @Test public void deleteUnmappedRoutes() { String domainName = this.nameFactory.getDomainName(); diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java index 287ecf0647..9c75190f6b 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java @@ -27,6 +27,7 @@ import org.cloudfoundry.client.v3.stacks.StackResource; import org.cloudfoundry.client.v3.stacks.Stack; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/TasksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/TasksTest.java index db548472d4..65bdafd581 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/TasksTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/TasksTest.java @@ -37,6 +37,7 @@ import org.cloudfoundry.operations.applications.ApplicationHealthCheck; import org.cloudfoundry.operations.applications.PushApplicationRequest; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Flux; diff --git a/integration-test/src/test/java/org/cloudfoundry/logcache/v1/LogCacheTest.java b/integration-test/src/test/java/org/cloudfoundry/logcache/v1/LogCacheTest.java index 2d0cedf36c..d152bf08f0 100644 --- a/integration-test/src/test/java/org/cloudfoundry/logcache/v1/LogCacheTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/logcache/v1/LogCacheTest.java @@ -20,6 +20,7 @@ import org.cloudfoundry.ApplicationUtils; import org.cloudfoundry.CloudFoundryVersion; import org.cloudfoundry.IfCloudFoundryVersion; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/networking/v1/PoliciesTest.java b/integration-test/src/test/java/org/cloudfoundry/networking/v1/PoliciesTest.java index fcefb58ced..0fe93287f4 100644 --- a/integration-test/src/test/java/org/cloudfoundry/networking/v1/PoliciesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/networking/v1/PoliciesTest.java @@ -32,6 +32,7 @@ import org.cloudfoundry.networking.v1.policies.Ports; import org.cloudfoundry.networking.v1.policies.Source; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/networking/v1/TagsTest.java b/integration-test/src/test/java/org/cloudfoundry/networking/v1/TagsTest.java index bfb95cf326..6eb83c89e5 100644 --- a/integration-test/src/test/java/org/cloudfoundry/networking/v1/TagsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/networking/v1/TagsTest.java @@ -31,6 +31,7 @@ import org.cloudfoundry.networking.v1.tags.ListTagsRequest; import org.cloudfoundry.networking.v1.tags.ListTagsResponse; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java index 99d4b842eb..fc65d65cdd 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java @@ -17,6 +17,7 @@ package org.cloudfoundry.operations; import org.cloudfoundry.AbstractIntegrationTest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.test.StepVerifier; 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 62238e0c74..9a853d379f 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java @@ -68,6 +68,7 @@ import org.cloudfoundry.operations.services.GetServiceInstanceRequest; import org.cloudfoundry.operations.services.ServiceInstance; import org.cloudfoundry.util.FluentMap; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Flux; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java index 869f00a924..5818bb3174 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/BuildpacksTest.java @@ -21,6 +21,7 @@ import org.cloudfoundry.operations.buildpacks.CreateBuildpackRequest; import org.cloudfoundry.operations.buildpacks.DeleteBuildpackRequest; import org.cloudfoundry.operations.buildpacks.UpdateBuildpackRequest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java index f42129db40..2e4f8f5222 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java @@ -24,6 +24,7 @@ import org.cloudfoundry.operations.domains.ShareDomainRequest; import org.cloudfoundry.operations.domains.UnshareDomainRequest; import org.cloudfoundry.operations.organizations.CreateOrganizationRequest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java index 1ed827a157..6997cf2c7f 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java @@ -27,6 +27,7 @@ import org.cloudfoundry.operations.networkpolicies.Policy; import org.cloudfoundry.operations.networkpolicies.RemoveNetworkPolicyRequest; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java index ee5623b423..0562c14397 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationAdminTest.java @@ -25,6 +25,7 @@ import org.cloudfoundry.operations.organizationadmin.UpdateQuotaRequest; import org.cloudfoundry.operations.organizations.CreateOrganizationRequest; import org.cloudfoundry.operations.organizations.OrganizationInfoRequest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java index 0ec28ddf50..6cdd60c701 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java @@ -18,6 +18,7 @@ import org.cloudfoundry.AbstractIntegrationTest; import org.cloudfoundry.operations.organizations.CreateOrganizationRequest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java index e5a2c3757c..1220f4e1a1 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java @@ -31,6 +31,7 @@ import org.cloudfoundry.operations.routes.UnmapRouteRequest; import org.cloudfoundry.operations.services.BindRouteServiceInstanceRequest; import org.cloudfoundry.operations.services.CreateUserProvidedServiceInstanceRequest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Flux; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java index 3fb44a0eeb..37a4c632e3 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java @@ -27,6 +27,7 @@ import org.cloudfoundry.operations.serviceadmin.ListServiceAccessSettingsRequest; import org.cloudfoundry.operations.serviceadmin.ServiceAccess; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java index b55a3bd469..83b979a2e6 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/ServicesTest.java @@ -51,6 +51,7 @@ import org.cloudfoundry.operations.services.UpdateServiceInstanceRequest; import org.cloudfoundry.operations.services.UpdateUserProvidedServiceInstanceRequest; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.publisher.Flux; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java index 73418136a8..a34fb62da9 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/SpacesTest.java @@ -20,6 +20,7 @@ import org.cloudfoundry.operations.spaces.CreateSpaceRequest; import org.cloudfoundry.operations.spaces.GetSpaceRequest; import org.cloudfoundry.operations.spaces.SpaceDetail; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java index 402017b47b..4de9521494 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/UserAdminTest.java @@ -38,6 +38,7 @@ import org.cloudfoundry.operations.useradmin.UnsetSpaceRoleRequest; import org.cloudfoundry.util.PaginationUtils; import org.cloudfoundry.util.ResourceUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java b/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java index b46b38612c..ca16ddcf1d 100644 --- a/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java @@ -23,6 +23,7 @@ import org.cloudfoundry.routing.v1.routergroups.RouterGroup; import org.cloudfoundry.routing.v1.routergroups.UpdateRouterGroupRequest; import org.cloudfoundry.routing.v1.routergroups.UpdateRouterGroupResponse; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/routing/v1/TcpRoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/routing/v1/TcpRoutesTest.java index 5438c70535..ff692af483 100644 --- a/integration-test/src/test/java/org/cloudfoundry/routing/v1/TcpRoutesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/routing/v1/TcpRoutesTest.java @@ -31,6 +31,7 @@ import org.cloudfoundry.routing.v1.tcproutes.TcpRoute; import org.cloudfoundry.routing.v1.tcproutes.TcpRouteConfiguration; import org.cloudfoundry.routing.v1.tcproutes.TcpRouteDeletion; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java index 471391d133..733be62386 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/AuthorizationsTest.java @@ -26,6 +26,7 @@ import org.cloudfoundry.uaa.authorizations.AuthorizeByOpenIdWithImplicitGrantRequest; import org.cloudfoundry.uaa.authorizations.GetOpenIdProviderConfigurationRequest; import org.cloudfoundry.uaa.authorizations.GetOpenIdProviderConfigurationResponse; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java index 80e2489115..d70b1a2055 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java @@ -51,6 +51,7 @@ import org.cloudfoundry.uaa.clients.UpdateSecretAction; import org.cloudfoundry.uaa.clients.UpdateSecretClientAction; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java index 6534aa199e..f060ea600c 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java @@ -47,6 +47,7 @@ import org.cloudfoundry.uaa.users.Email; import org.cloudfoundry.uaa.users.Name; import org.cloudfoundry.util.PaginationUtils; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java index 2be3d6cac3..428d48c7d1 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityProvidersTest.java @@ -33,6 +33,7 @@ import org.cloudfoundry.uaa.identityproviders.UpdateIdentityProviderRequest; import org.cloudfoundry.uaa.identityzones.CreateIdentityZoneRequest; import org.cloudfoundry.uaa.identityzones.CreateIdentityZoneResponse; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java index 76a4f9d52f..452bce5f7a 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java @@ -25,6 +25,7 @@ import org.cloudfoundry.uaa.identityzones.ListIdentityZonesRequest; import org.cloudfoundry.uaa.identityzones.ListIdentityZonesResponse; import org.cloudfoundry.uaa.identityzones.UpdateIdentityZoneRequest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java index b0f8b6e61d..bdf102cef0 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/ServerInformationTest.java @@ -21,6 +21,7 @@ import org.cloudfoundry.uaa.serverinformation.GetAutoLoginAuthenticationCodeRequest; import org.cloudfoundry.uaa.serverinformation.GetAutoLoginAuthenticationCodeResponse; import org.cloudfoundry.uaa.serverinformation.GetInfoRequest; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; 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 76fd5e1afd..4744392214 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java @@ -38,7 +38,8 @@ import org.cloudfoundry.uaa.tokens.RefreshTokenResponse; import org.cloudfoundry.uaa.tokens.TokenFormat; import org.cloudfoundry.uaa.tokens.TokenKey; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -118,7 +119,7 @@ public void getTokenByClientCredentials() { } //TODO: Ready to Implement - Await https://github.com/cloudfoundry/cf-java-client/issues/862 to get passcode - @Ignore("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") @Test public void getTokenByOneTimePasscode() { this.uaaClient.tokens() diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java index 1eac301ac8..7ebdc3771b 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/UsersTest.java @@ -43,6 +43,7 @@ import org.cloudfoundry.uaa.users.UserInfoResponse; import org.cloudfoundry.uaa.users.VerifyUserRequest; import org.cloudfoundry.uaa.users.VerifyUserResponse; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono;