Skip to content

Commit 4296181

Browse files
committed
started
Signed-off-by: wind57 <[email protected]>
1 parent 5d6dc34 commit 4296181

File tree

1 file changed

+13
-6
lines changed
  • spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it

1 file changed

+13
-6
lines changed

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegration.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import org.springframework.cloud.config.environment.Environment;
3535
import org.springframework.cloud.config.environment.PropertySource;
3636

37+
import java.util.Map;
38+
3739
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
3840
import static com.github.tomakehurst.wiremock.client.WireMock.get;
3941
import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
@@ -110,12 +112,7 @@ void enabled() {
110112
assertThat(devprod.getPropertySources().get(0).getSource().get("dummy.property.bool2")).isEqualTo(true);
111113
assertThat(devprod.getPropertySources().get(0).getSource().get("dummy.property.string2")).isEqualTo("prod");
112114

113-
PropertySource testConfigMapDev = devprod.getPropertySources().get(1);
114-
assertThat(testConfigMapDev.getName().equals(TEST_CONFIG_MAP_DEV_NAME)).isTrue();
115-
assertThat(testConfigMapDev.getSource().size()).isEqualTo(3);
116-
assertThat(testConfigMapDev.getSource().get("dummy.property.value")).isEqualTo(1);
117-
assertThat(testConfigMapDev.getSource().get("dummy.property.enabled")).isEqualTo(false);
118-
assertThat(testConfigMapDev.getSource().get("dummy.property.profile")).isEqualTo("dev");
115+
assertTestConfigMapDev(devprod);
119116

120117
assertThat(devprod.getPropertySources().get(2).getName().equals("configmap.test-cm.default.default")).isTrue();
121118
assertThat(devprod.getPropertySources().get(2).getSource().size()).isEqualTo(4);
@@ -129,4 +126,14 @@ void enabled() {
129126
assertThat(devprod.getPropertySources().get(3).getSource().get("username")).isEqualTo("user");
130127
}
131128

129+
private void assertTestConfigMapDev(Environment devAndProd) {
130+
PropertySource testConfigMapDev = devAndProd.getPropertySources().get(1);
131+
assertThat(testConfigMapDev.getName()).isEqualTo(TEST_CONFIG_MAP_DEV_NAME);
132+
133+
@SuppressWarnings("unchecked")
134+
Map<String, String> data = (Map<String, String>) testConfigMapDev.getSource();
135+
assertThat(data).containsExactlyInAnyOrderEntriesOf(
136+
Map.of("dummy.property.value", "1", "dummy.property.enabled", "false", "dummy.property.profile", "dev"));
137+
}
138+
132139
}

0 commit comments

Comments
 (0)