fix tests

Author: wind57

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

@@ -39,8 +39,8 @@
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
+import org.springframework.cloud.kubernetes.commons.config.Constants;
 import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
-import org.springframework.cloud.kubernetes.commons.config.SourceData;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
@@ -125,7 +125,8 @@ void namedSingleConfigMapFails() {
 			.findAny()
 			.orElseThrow();
 
-		assertThat(mapPropertySource.getName()).isEqualTo(SourceData.EMPTY_SOURCE_NAME_ON_ERROR);
+		assertThat(mapPropertySource.getName()).isEqualTo("configmap..spring-k8s");
+		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
 
 	}
 
@@ -168,7 +169,8 @@ void namedTwoConfigMapsOneFails(CapturedOutput output) {
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
 		// two sources are present, one being empty
-		assertThat(names).containsExactly("configmap.two.default", SourceData.EMPTY_SOURCE_NAME_ON_ERROR);
+		assertThat(names).containsExactly("configmap.two.default", "configmap..default");
+		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
 		assertThat(output.getOut())
 			.doesNotContain("sourceName : two was requested, but not found in namespace : default");
 
@@ -212,7 +214,8 @@ void namedTwoConfigMapsBothFail(CapturedOutput output) {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		assertThat(names).containsExactly(SourceData.EMPTY_SOURCE_NAME_ON_ERROR);
+		assertThat(names).containsExactly("configmap..default");
+		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
 		assertThat(output.getOut())
 			.doesNotContain("sourceName : one was requested, but not found in namespace : default");
 		assertThat(output.getOut())
@@ -255,7 +258,8 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> sourceNames = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		assertThat(sourceNames).containsExactly(SourceData.EMPTY_SOURCE_NAME_ON_ERROR);
+		assertThat(sourceNames).containsExactly("configmap..spring-k8s");
+		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
 		assertThat(output).contains("failure in reading labeled sources");
 		assertThat(output).contains("failure in reading named sources");
 	}
@@ -268,8 +272,6 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
 	 */
 	@Test
 	void labeledTwoConfigMapsOneFails(CapturedOutput output) {
-		String configMapNameOne = "one";
-		String configMapNameTwo = "two";
 
 		Map<String, String> configMapOneLabels = Map.of("one", "1");
 		Map<String, String> configMapTwoLabels = Map.of("two", "2");
@@ -310,7 +312,8 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
 		// two sources are present, one being empty
-		assertThat(names).containsExactly("configmap.two.default", SourceData.EMPTY_SOURCE_NAME_ON_ERROR);
+		assertThat(names).containsExactly("configmap.two.default", "configmap..default");
+		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
 
 		assertThat(output).contains("failure in reading labeled sources");
 		assertThat(output).contains("failure in reading named sources");
@@ -364,7 +367,8 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
 		// all 3 sources ('application' named source, and two labeled sources)
-		assertThat(names).containsExactly(SourceData.EMPTY_SOURCE_NAME_ON_ERROR);
+		assertThat(names).containsExactly("configmap..default");
+		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
 
 		assertThat(output).contains("failure in reading labeled sources");
 		assertThat(output).contains("failure in reading named sources");