ci: fix missing dependencies in integration tests

Author: Kehrlann

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

@@ -18,19 +18,27 @@
 
 import java.time.Duration;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.ApplicationUtils;
 import org.cloudfoundry.CloudFoundryVersion;
 import org.cloudfoundry.IfCloudFoundryVersion;
 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.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 public final class AdminTest extends AbstractIntegrationTest {
 
     @Autowired private CloudFoundryClient cloudFoundryClient;
 
+    // The buildpacks cache needs to be non-empty for the DELETE call to succeed.
+    // We pull the "testLogCacheApp" bean, which ensures the bean will be initialized,
+    // the app will be pushed, and it will add some data to the cache.
+    @Autowired private Mono<ApplicationUtils.ApplicationMetadata> testLogCacheApp;
+
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
     @Test
     public void clearBuildpackCache() {

integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java

@@ -87,6 +87,7 @@
 import org.cloudfoundry.util.FluentMap;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -106,6 +107,10 @@ public final class ApplicationsTest extends AbstractIntegrationTest {
 
     @Autowired private LogCacheClient logCacheClient;
 
+    // To create a service in #pushBindService, the Service Broker must be installed first.
+    // We ensure it is by loading the serviceBrokerId @Lazy bean.
+    @Qualifier("serviceBrokerId") @Autowired private Mono<String> serviceBrokerId;
+
     @Test
     public void copySource() throws IOException {
         String sourceName = this.nameFactory.getApplicationName();

integration-test/src/test/java/org/cloudfoundry/operations/ServiceAdminTest.java

@@ -33,6 +33,8 @@
 import org.cloudfoundry.util.ResourceUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -53,6 +55,10 @@ public final class ServiceAdminTest extends AbstractIntegrationTest {
 
     @Autowired private String serviceName;
 
+    // To create a service in #pushBindService, the Service Broker must be installed first.
+    // We ensure it is by loading the serviceBrokerId @Lazy bean.
+    @Qualifier("serviceBrokerId") @Autowired private Mono<String> serviceBrokerId;
+
     @Test
     public void disableServiceAccess() {
         String planName = this.nameFactory.getPlanName();