Skip to content

Commit 5cd5fdc

Browse files
committed
fix tests
Signed-off-by: wind57 <[email protected]>
1 parent 80bfc23 commit 5cd5fdc

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigUtilsTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,19 +198,15 @@ void testSecretDataByLabelsThreeSecretsFound() {
198198
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
199199
Map.of("tag", "fit", "color", "blue"), new MockEnvironment());
200200

201-
Assertions.assertThat(result.data().keySet()).contains("blue-circle-secret");
202-
Assertions.assertThat(result.data().keySet()).contains("blue-square-secret");
203-
Assertions.assertThat(result.data().keySet()).contains("blue-square-secret-k8s");
201+
Assertions.assertThat(result.data().keySet())
202+
.containsExactlyInAnyOrder("blue-circle-secret", "blue-square-secret");
204203

205204
Map<String, Object> dataBlueSecret = result.data().get("blue-circle-secret");
206205
Assertions.assertThat(dataBlueSecret).containsExactlyInAnyOrderEntriesOf(Map.of("one", "1"));
207206

208207
Map<String, Object> dataSquareSecret = result.data().get("blue-square-secret");
209208
Assertions.assertThat(dataSquareSecret).containsExactlyInAnyOrderEntriesOf(Map.of("two", "2"));
210209

211-
Map<String, Object> dataSquareSecretK8s = result.data().get("blue-square-secret-k8s");
212-
Assertions.assertThat(dataSquareSecretK8s).containsExactlyInAnyOrderEntriesOf(Map.of("four", "4"));
213-
214210
}
215211

216212
// secret "my-secret" is deployed; we search for it by name and do not find it.

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledSecretContextToSourceDataProviderTests.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,9 @@ void searchWithLabelsOneSecretFoundAndOneFromProfileFound() {
421421
Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
422422
SourceData sourceData = data.apply(context);
423423

424-
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
424+
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1);
425425
Assertions.assertThat(sourceData.sourceData().get("color-secret.one")).isEqualTo("1");
426-
Assertions.assertThat(sourceData.sourceData().get("color-secret-k8s.two")).isEqualTo("2");
427-
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color-secret.color-secret-k8s.default");
426+
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color-secret.default");
428427

429428
}
430429

@@ -490,14 +489,11 @@ void searchWithLabelsTwoSecretsFoundAndOneFromProfileFound() {
490489
Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
491490
SourceData sourceData = data.apply(context);
492491

493-
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(4);
492+
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
494493
assertThat(sourceData.sourceData().get("color-secret.one")).isEqualTo("1");
495494
assertThat(sourceData.sourceData().get("shape-secret.two")).isEqualTo("2");
496-
assertThat(sourceData.sourceData().get("color-secret-k8s.four")).isEqualTo("4");
497-
assertThat(sourceData.sourceData().get("shape-secret-k8s.five")).isEqualTo("5");
498495

499-
assertThat(sourceData.sourceName())
500-
.isEqualTo("secret.color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.default");
496+
assertThat(sourceData.sourceName()).isEqualTo("secret.color-secret.shape-secret.default");
501497

502498
}
503499

0 commit comments

Comments
 (0)