more fixes

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

Author: wind57

spring-cloud-kubernetes-client-autoconfig/pom.xml

@@ -65,6 +65,11 @@
 			<artifactId>spring-cloud-kubernetes-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-webtestclient</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java

@@ -22,7 +22,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.health.registry.ReactiveHealthContributorRegistry;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalManagementPort;
+import org.springframework.boot.test.web.server.LocalManagementPort;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
@@ -33,6 +34,7 @@
 		properties = { "management.health.kubernetes.enabled=false", "management.endpoint.health.show-details=always",
 				"management.endpoint.health.show-components=always", "spring.main.cloud-platform=KUBERNETES",
 				"management.endpoints.web.exposure.include=health" })
+@AutoConfigureWebTestClient
 class ActuatorDisabledHealthTest {
 
 	@Autowired

spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java

@@ -22,14 +22,16 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.health.registry.HealthContributorRegistry;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalManagementPort;
+import org.springframework.boot.test.web.server.LocalManagementPort;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class,
 		properties = { "management.health.kubernetes.enabled=true", "management.endpoint.health.show-details=always",
 				"management.endpoint.health.show-components=always", "management.endpoints.web.exposure.include=health",
 				"spring.main.cloud-platform=KUBERNETES" })
+@AutoConfigureWebTestClient
 class ActuatorEnabledHealthTest {
 
 	@Autowired

spring-cloud-kubernetes-client-config/pom.xml

@@ -114,6 +114,11 @@
 			<artifactId>spring-cloud-kubernetes-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-webtestclient</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixTests.java

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
 /**
@@ -31,6 +32,7 @@
  *
  * @author wind57
  */
+@AutoConfigureWebTestClient
 abstract class LabeledConfigMapWithPrefixTests {
 
 	@Autowired

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileTests.java

@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.Blue;
 import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.Green;
 import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.GreenK8s;
@@ -38,6 +39,7 @@
  *
  * @author wind57
  */
+@AutoConfigureWebTestClient
 abstract class LabeledConfigMapWithProfileTests {
 
 	@Autowired

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixTests.java

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.cloud.kubernetes.client.config.bootstrap.stubs.LabeledSecretWithPrefixConfigurationStub;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -33,6 +34,7 @@
  * @author wind57
  */
 @TestPropertySource(properties = "spring.cloud.kubernetes.secrets.enabled=true")
+@AutoConfigureWebTestClient
 abstract class LabeledSecretWithPrefixTests {
 
 	@Autowired

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixTests.java

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
 /**
@@ -31,6 +32,7 @@
  *
  * @author wind57
  */
+@AutoConfigureWebTestClient
 abstract class NamedConfigMapWithPrefixTests {
 
 	@Autowired

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/NamedConfigMapWithProfileTests.java

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
 /**
@@ -31,6 +32,7 @@
  *
  * @author wind57
  */
+@AutoConfigureWebTestClient
 abstract class NamedConfigMapWithProfileTests {
 
 	@Autowired

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixTests.java

@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
@@ -33,6 +34,7 @@
  * @author wind57
  */
 @TestPropertySource(properties = "spring.cloud.kubernetes.secrets.enabled=true")
+@AutoConfigureWebTestClient
 abstract class NamedSecretWithPrefixTests {
 
 	@Autowired