dirty

Author: wind57

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ApplicationDiscoveryListener.java

@@ -14,31 +14,25 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.kubernetes.fabric8.client.discovery.it;
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryApp;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.TestPropertySource;
 
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.it.TestAssertions.assertAllServices;
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.assertAllServices;
 
 /**
  * @author wind57

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.kubernetes.fabric8.client.discovery.it;
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
 
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.testcontainers.k3s.K3sContainer;
+
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryApp;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
-import org.testcontainers.k3s.K3sContainer;
 
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Commons;
@@ -43,7 +43,8 @@
 		"spring.cloud.kubernetes.discovery.metadata.add-pod-annotations=true" ,
 		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=debug" })
 @ExtendWith(OutputCaptureExtension.class)
-@SpringBootTest(classes = { Fabric8DiscoveryApp.class, Fabric8DiscoveryAllServicesIT.TestConfig.class })
+@SpringBootTest(classes = { Fabric8DiscoveryApp.class, Fabric8DiscoveryBase.TestConfig.class },
+	webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 abstract class Fabric8DiscoveryBase {
 
 	protected static final String NAMESPACE = "default";

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ReactiveDiscoveryController.java

@@ -14,35 +14,45 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.kubernetes.fabric8.client.discovery.it;
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
 
-import java.io.IOException;
-import java.io.InputStream;
-
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.utils.Serialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryApp;
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.web.server.LocalManagementPort;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.TestPropertySource;
 
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.it.TestAssertions.assertAllServices;
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.assertBlockingConfiguration;
 
 /**
  * @author wind57
  */
-@SpringBootTest(classes = { Fabric8DiscoveryApp.class, Fabric8DiscoveryPodMetadataIT.TestConfig.class })
+@TestPropertySource(properties = { "spring.cloud.discovery.reactive.enabled=false",
+	"logging.level.org.springframework.cloud.client.discovery.health=DEBUG",
+	"logging.level.org.springframework.cloud.kubernetes.commons.discovery=DEBUG" })
 class Fabric8DiscoveryBlockingIT extends Fabric8DiscoveryBase {
+
+	@LocalManagementPort
+	private int port;
+
+	@BeforeEach
+	void beforeEach() {
+		Images.loadBusybox(K3S);
+		util.busybox(NAMESPACE, Phase.CREATE);
+	}
+
+	@AfterEach
+	void afterEach() {
+		util.busybox(NAMESPACE, Phase.DELETE);
+	}
+
+	@Test
+	void test(CapturedOutput output) {
+		assertBlockingConfiguration(output, port);
+	}
+
 }