Drop more overlapping tests (3) (#1846)

* easier to read code

Signed-off-by: wind57 <[email protected]>

* drop tests

Signed-off-by: wind57 <[email protected]>

* drop test

Signed-off-by: wind57 <[email protected]>

* drop test

Signed-off-by: wind57 <[email protected]>

* inline a test

Signed-off-by: wind57 <[email protected]>

* rename a test

Signed-off-by: wind57 <[email protected]>

* re-trigger

Signed-off-by: wind57 <[email protected]>

---------

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBlockingIT.java

@@ -20,13 +20,16 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.web.server.LocalManagementPort;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.assertBlockingConfiguration;
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.assertPodMetadata;
 
 /**
  * @author wind57
@@ -39,6 +42,9 @@ class Fabric8DiscoveryBlockingIT extends Fabric8DiscoveryBase {
 	@LocalManagementPort
 	private int port;
 
+	@Autowired
+	private DiscoveryClient discoveryClient;
+
 	@BeforeEach
 	void beforeEach() {
 		Images.loadBusybox(K3S);
@@ -51,8 +57,20 @@ void afterEach() {
 	}
 
 	@Test
-	void test(CapturedOutput output) {
+	void test(CapturedOutput output) throws Exception {
+
+		String[] busyboxPods = K3S.execInContainer("sh", "-c", "kubectl get pods -l app=busybox -o=name --no-headers")
+			.getStdout()
+			.split("\n");
+
+		String podOne = busyboxPods[0].split("/")[1];
+		String podTwo = busyboxPods[1].split("/")[1];
+
+		K3S.execInContainer("sh", "-c", "kubectl label pods " + podOne + " my-label=my-value");
+		K3S.execInContainer("sh", "-c", "kubectl annotate pods " + podTwo + " my-annotation=my-value");
+
 		assertBlockingConfiguration(output, port);
+		assertPodMetadata(discoveryClient);
 	}
 
 }

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDefaultConfigurationIT.java

@@ -35,7 +35,7 @@
 		"spring.cloud.kubernetes.discovery.namespaces[1]=b-uat",
 		"spring.cloud.kubernetes.discovery.filter=#root.metadata.namespace matches '^.*uat$'",
 		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG" })
-class Fabric8DiscoveryFilterMatchTwoNamespacesIT extends Fabric8DiscoveryBase {
+class Fabric8DiscoveryFilterIT extends Fabric8DiscoveryBase {
 
 	private static final String NAMESPACE_A_UAT = "a-uat";
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterIT.java

@@ -279,39 +279,6 @@ static void filterMatchesBothNamespacesViaThePredicate(DiscoveryClient discovery
 
 	}
 
-	/**
-	 * <pre>
-	 *     - service "wiremock" is present in namespace "a-uat"
-	 *     - service "wiremock" is present in namespace "b-uat"
-	 *
-	 *     - we search with a predicate : "#root.metadata.namespace matches 'a-uat$'"
-	 *
-	 *     As such, only service from 'a-uat' namespace matches.
-	 * </pre>
-	 */
-	static void filterMatchesOneNamespaceViaThePredicate(DiscoveryClient discoveryClient) {
-
-		List<String> services = discoveryClient.getServices();
-		assertThat(services.size()).isEqualTo(1);
-		assertThat(services).contains("service-wiremock");
-
-		List<DefaultKubernetesServiceInstance> serviceInstances = discoveryClient.getInstances("service-wiremock")
-			.stream()
-			.map(x -> (DefaultKubernetesServiceInstance) x)
-			.toList();
-
-		assertThat(serviceInstances.size()).isEqualTo(1);
-
-		DefaultKubernetesServiceInstance first = serviceInstances.get(0);
-		assertThat(first.getServiceId()).isEqualTo("service-wiremock");
-		assertThat(first.getInstanceId()).isNotNull();
-		assertThat(first.getPort()).isEqualTo(8080);
-		assertThat(first.getNamespace()).isEqualTo("a-uat");
-		assertThat(first.getMetadata()).isEqualTo(
-				Map.of("app", "service-wiremock", "port.http", "8080", "k8s_namespace", "a-uat", "type", "ClusterIP"));
-
-	}
-
 	private static void waitForLogStatement(CapturedOutput output, String message) {
 		await().pollInterval(Duration.ofSeconds(1))
 			.atMost(Duration.ofSeconds(30))

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java

@@ -11,4 +11,3 @@ spring:
         strategy: refresh
         mode: polling
         period: 5s
-