Integration fixes

.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

integration-test/pom.xml

@@ -76,6 +76,18 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+  <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-junit</artifactId>
+            <version>2.0.0.0</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>
@@ -91,11 +103,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

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<Method> 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<byte[]> 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<byte[]> getBytes(String path) {
     }
 
     protected static <T> Consumer<Tuple2<T, T>> 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);
+     }
 
-}
+}

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) {

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;

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;
 

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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() {