fix tests

Author: wind57

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java

@@ -174,7 +174,8 @@ void kubernetesReloadEnabledButSecretAndConfigDisabled() {
 	 */
 	@Test
 	void reloadEventEnabledMonitoringConfigMapsEnabledByDefault() {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES");
+		setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
+			"spring.main.cloud-platform=KUBERNETES");
 		Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
 		Assertions.assertEquals(map.size(), 1);
 		Assertions.assertTrue(map.values()
@@ -197,7 +198,8 @@ void reloadEventEnabledMonitoringConfigMapsEnabledByDefault() {
 	 */
 	@Test
 	void reloadEventEnabledMonitoringConfigMapsEnabled() {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event",
+		setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
+				"spring.cloud.kubernetes.reload.mode=event",
 				"spring.main.cloud-platform=KUBERNETES");
 		Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
 		Assertions.assertEquals(map.size(), 1);
@@ -259,7 +261,8 @@ void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsDisabled()
 	 */
 	@Test
 	void reloadPollingEnabledMonitoringConfigMapsEnabled() {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling",
+		setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
+				"spring.cloud.kubernetes.reload.mode=polling",
 				"spring.main.cloud-platform=KUBERNETES");
 		Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
 		Assertions.assertEquals(map.size(), 1);
@@ -281,7 +284,8 @@ void reloadPollingEnabledMonitoringConfigMapsEnabled() {
 	 */
 	@Test
 	void reloadEventEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES",
+		setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
+				"spring.main.cloud-platform=KUBERNETES",
 				"spring.cloud.kubernetes.reload.monitoring-secrets=true",
 				"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
 				"spring.cloud.kubernetes.reload.mode=event");
@@ -308,7 +312,8 @@ void reloadEventEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
 	 */
 	@Test
 	void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES",
+		setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
+				"spring.main.cloud-platform=KUBERNETES",
 				"spring.cloud.kubernetes.reload.monitoring-secrets=true",
 				"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
 				"spring.cloud.kubernetes.reload.mode=polling");
@@ -332,7 +337,8 @@ void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled()
 	 */
 	@Test
 	void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES",
+		setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
+				"spring.main.cloud-platform=KUBERNETES",
 				"spring.cloud.kubernetes.reload.monitoring-secrets=true",
 				"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
 				"spring.cloud.kubernetes.reload.mode=event");
@@ -360,7 +366,8 @@ void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
 	 */
 	@Test
 	void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES",
+		setup("spring.cloud.bootstrap.enabled=true","spring.cloud.kubernetes.reload.enabled=true",
+				"spring.main.cloud-platform=KUBERNETES",
 				"spring.cloud.kubernetes.reload.monitoring-secrets=true",
 				"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
 				"spring.cloud.kubernetes.reload.mode=polling");
@@ -430,7 +437,8 @@ void reloadPollingEnabledMonitorConfigMapsDisabledMonitoringSecretsDisabled() {
 	 */
 	@Test
 	void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event",
+		setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
+				"spring.cloud.kubernetes.reload.mode=event",
 				"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=true",
 				"spring.cloud.kubernetes.reload.monitoring-secrets=false");
 		Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -456,7 +464,8 @@ void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
 	 */
 	@Test
 	void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling",
+		setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
+				"spring.cloud.kubernetes.reload.mode=polling",
 				"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=true",
 				"spring.cloud.kubernetes.reload.monitoring-secrets=false");
 		Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -472,21 +481,23 @@ void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled()
 
 	@Test
 	void kubernetesConfigAndSecretEnabledByDefault() {
-		setup("spring.main.cloud-platform=KUBERNETES");
+		setup("spring.cloud.bootstrap.enabled=true", "spring.main.cloud-platform=KUBERNETES");
 		assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue();
 		assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue();
 	}
 
 	@Test
 	void kubernetesConfigEnabledButSecretDisabled() {
-		setup("spring.cloud.kubernetes.secrets.enabled=false", "spring.main.cloud-platform=KUBERNETES");
+		setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.secrets.enabled=false",
+			"spring.main.cloud-platform=KUBERNETES");
 		assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue();
 		assertThat(context.containsBean("secretsPropertySourceLocator")).isFalse();
 	}
 
 	@Test
 	void kubernetesSecretsEnabledButConfigDisabled() {
-		setup("spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES");
+		setup("spring.cloud.bootstrap.enabled=true",
+			"spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES");
 		assertThat(context.containsBean("configMapPropertySourceLocator")).isFalse();
 		assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue();
 	}