Skip to content

Commit 099e27b

Browse files
wind57wind57
committed
fix
Signed-off-by: wind57 <[email protected]>
1 parent 7845498 commit 099e27b

13 files changed

+486
-755
lines changed

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

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.cloud.kubernetes.client.config;
1818

19-
import java.util.Collections;
2019
import java.util.Iterator;
2120
import java.util.LinkedHashMap;
2221
import java.util.Map;
@@ -33,9 +32,9 @@
3332
import io.kubernetes.client.openapi.models.V1ConfigMapListBuilder;
3433
import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
3534
import io.kubernetes.client.util.ClientBuilder;
35+
import org.assertj.core.api.Assertions;
3636
import org.junit.jupiter.api.AfterAll;
3737
import org.junit.jupiter.api.AfterEach;
38-
import org.junit.jupiter.api.Assertions;
3938
import org.junit.jupiter.api.BeforeAll;
4039
import org.junit.jupiter.api.Test;
4140
import org.junit.jupiter.api.extension.ExtendWith;
@@ -126,8 +125,8 @@ void singleConfigMapMatchAgainstLabels() {
126125
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
127126
SourceData sourceData = data.apply(context);
128127

129-
Assertions.assertEquals("configmap.test-configmap.default", sourceData.sourceName());
130-
Assertions.assertEquals(Map.of("name", "value"), sourceData.sourceData());
128+
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.test-configmap.default");
129+
Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("name", "value"));
131130

132131
}
133132

@@ -176,10 +175,10 @@ void twoConfigMapsMatchAgainstLabels() {
176175
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
177176
SourceData sourceData = data.apply(context);
178177

179-
Assertions.assertEquals(sourceData.sourceName(), "configmap.red-configmap.red-configmap-again.default");
180-
Assertions.assertEquals(sourceData.sourceData().size(), 2);
181-
Assertions.assertEquals(sourceData.sourceData().get("colorOne"), "really-red");
182-
Assertions.assertEquals(sourceData.sourceData().get("colorTwo"), "really-red-again");
178+
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.red-configmap.red-configmap-again.default");
179+
Assertions.assertThat(sourceData.sourceData()).hasSize(2);
180+
Assertions.assertThat(sourceData.sourceData().get("colorOne")).isEqualTo("really-red");
181+
Assertions.assertThat(sourceData.sourceData().get("colorTwo")).isEqualTo("really-red-again");
183182

184183
}
185184

@@ -212,8 +211,8 @@ void configMapNoMatch() {
212211
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
213212
SourceData sourceData = data.apply(context);
214213

215-
Assertions.assertEquals(sourceData.sourceName(), "configmap.color.default");
216-
Assertions.assertEquals(sourceData.sourceData(), Collections.emptyMap());
214+
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.color.default");
215+
Assertions.assertThat(sourceData.sourceData()).isEmpty();
217216

218217
}
219218

@@ -246,8 +245,8 @@ void namespaceMatch() {
246245
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
247246
SourceData sourceData = data.apply(context);
248247

249-
Assertions.assertEquals("configmap.test-configmap.default", sourceData.sourceName());
250-
Assertions.assertEquals(Map.of("name", "value"), sourceData.sourceData());
248+
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.test-configmap.default");
249+
Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("name", "value"));
251250
}
252251

253252
/**
@@ -278,8 +277,9 @@ void testWithPrefix() {
278277
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
279278
SourceData sourceData = data.apply(context);
280279

281-
Assertions.assertEquals("configmap.blue-configmap.default", sourceData.sourceName());
282-
Assertions.assertEquals(Map.of("me.what-color", "blue-color"), sourceData.sourceData());
280+
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.blue-configmap.default");
281+
Assertions.assertThat(sourceData.sourceData())
282+
.containsExactlyInAnyOrderEntriesOf(Map.of("me.what-color", "blue-color"));
283283
}
284284

285285
/**
@@ -324,21 +324,22 @@ void testTwoConfigmapsWithPrefix() {
324324
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
325325
SourceData sourceData = data.apply(context);
326326

327-
Assertions.assertEquals(sourceData.sourceName(), "configmap.another-blue-configmap.blue-configmap.default");
327+
Assertions.assertThat(sourceData.sourceName())
328+
.isEqualTo("configmap.another-blue-configmap.blue-configmap.default");
328329

329330
Map<String, Object> properties = sourceData.sourceData();
330-
Assertions.assertEquals(2, properties.size());
331+
Assertions.assertThat(properties).hasSize(2);
331332
Iterator<String> keys = properties.keySet().iterator();
332333
String firstKey = keys.next();
333334
String secondKey = keys.next();
334335

335336
if (firstKey.contains("first")) {
336-
Assertions.assertEquals(firstKey, "another-blue-configmap.blue-configmap.first");
337+
Assertions.assertThat("blue-configmap.first").isEqualTo(firstKey);
337338
}
338339

339-
Assertions.assertEquals(secondKey, "another-blue-configmap.blue-configmap.second");
340-
Assertions.assertEquals(properties.get(firstKey), "blue");
341-
Assertions.assertEquals(properties.get(secondKey), "blue");
340+
Assertions.assertThat(secondKey).isEqualTo("another-blue-configmap.second");
341+
Assertions.assertThat(properties.get(firstKey)).isEqualTo("blue");
342+
Assertions.assertThat(properties.get(secondKey)).isEqualTo("blue");
342343
}
343344

344345
/**
@@ -376,8 +377,8 @@ void searchWithLabelsNoConfigmapsFound() {
376377
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
377378
SourceData sourceData = data.apply(context);
378379

379-
Assertions.assertTrue(sourceData.sourceData().isEmpty());
380-
Assertions.assertEquals(sourceData.sourceName(), "configmap.color.default");
380+
Assertions.assertThat(sourceData.sourceData()).isEmpty();
381+
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.color.default");
381382

382383
}
383384

@@ -418,9 +419,9 @@ void searchWithLabelsOneConfigMapFound() {
418419
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
419420
SourceData sourceData = data.apply(context);
420421

421-
Assertions.assertEquals(sourceData.sourceData().size(), 1);
422-
Assertions.assertEquals(sourceData.sourceData().get("one"), "1");
423-
Assertions.assertEquals(sourceData.sourceName(), "configmap.color-configmap.default");
422+
Assertions.assertThat(sourceData.sourceData()).hasSize(1);
423+
Assertions.assertThat(sourceData.sourceData().get("one")).isEqualTo("1");
424+
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.color-configmap.default");
424425

425426
}
426427

@@ -462,10 +463,11 @@ void searchWithLabelsOneConfigMapFoundAndOneFromProfileFound() {
462463
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
463464
SourceData sourceData = data.apply(context);
464465

465-
Assertions.assertEquals(sourceData.sourceData().size(), 2);
466-
Assertions.assertEquals(sourceData.sourceData().get("color-configmap.color-configmap-k8s.one"), "1");
467-
Assertions.assertEquals(sourceData.sourceData().get("color-configmap.color-configmap-k8s.two"), "2");
468-
Assertions.assertEquals(sourceData.sourceName(), "configmap.color-configmap.color-configmap-k8s.default");
466+
Assertions.assertThat(sourceData.sourceData()).hasSize(2);
467+
Assertions.assertThat(sourceData.sourceData().get("color-configmap.one")).isEqualTo("1");
468+
Assertions.assertThat(sourceData.sourceData().get("color-configmap-k8s.two")).isEqualTo("2");
469+
Assertions.assertThat(sourceData.sourceName())
470+
.isEqualTo("configmap.color-configmap.color-configmap-k8s.default");
469471

470472
}
471473

@@ -539,18 +541,14 @@ void searchWithLabelsTwoConfigMapsFoundAndOneFromProfileFound() {
539541
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
540542
SourceData sourceData = data.apply(context);
541543

542-
Assertions.assertEquals(sourceData.sourceData().size(), 4);
543-
Assertions.assertEquals(sourceData.sourceData()
544-
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.one"), "1");
545-
Assertions.assertEquals(sourceData.sourceData()
546-
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.two"), "2");
547-
Assertions.assertEquals(sourceData.sourceData()
548-
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.four"), "4");
549-
Assertions.assertEquals(sourceData.sourceData()
550-
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.five"), "5");
544+
Assertions.assertThat(sourceData.sourceData()).hasSize(4);
545+
Assertions.assertThat(sourceData.sourceData().get("color-configmap.one")).isEqualTo("1");
546+
Assertions.assertThat(sourceData.sourceData().get("shape-configmap.two")).isEqualTo("2");
547+
Assertions.assertThat(sourceData.sourceData().get("color-configmap-k8s.four")).isEqualTo("4");
548+
Assertions.assertThat(sourceData.sourceData().get("shape-configmap-k8s.five")).isEqualTo("5");
551549

552-
Assertions.assertEquals(sourceData.sourceName(),
553-
"configmap.color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.default");
550+
Assertions.assertThat(sourceData.sourceName())
551+
.isEqualTo("configmap.color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.default");
554552

555553
}
556554

@@ -596,12 +594,13 @@ void nonCache(CapturedOutput output) {
596594
KubernetesClientContextToSourceData redData = new LabeledConfigMapContextToSourceDataProvider().get();
597595
SourceData redSourceData = redData.apply(redContext);
598596

599-
Assertions.assertEquals(redSourceData.sourceData().size(), 1);
600-
Assertions.assertEquals(redSourceData.sourceData().get("color"), "red");
601-
Assertions.assertEquals(redSourceData.sourceName(), "configmap.red-configmap.default");
597+
Assertions.assertThat(redSourceData.sourceData()).hasSize(1);
598+
Assertions.assertThat(redSourceData.sourceData().get("color")).isEqualTo("red");
599+
Assertions.assertThat(redSourceData.sourceName()).isEqualTo("configmap.red-configmap.default");
602600

603-
Assertions.assertFalse(output.getAll().contains("Loaded all config maps in namespace '" + NAMESPACE + "'"));
604-
Assertions.assertTrue(output.getAll().contains("Will read individual configmaps in namespace"));
601+
Assertions.assertThat(output.getAll())
602+
.doesNotContain("Loaded all config maps in namespace '" + NAMESPACE + "'");
603+
Assertions.assertThat(output.getAll()).contains("Will read individual configmaps in namespace");
605604

606605
NormalizedSource greenSource = new LabeledConfigMapNormalizedSource(NAMESPACE, Map.of("color", "green"), false,
607606
ConfigUtils.Prefix.DEFAULT, false);
@@ -610,17 +609,17 @@ void nonCache(CapturedOutput output) {
610609
KubernetesClientContextToSourceData greenData = new LabeledConfigMapContextToSourceDataProvider().get();
611610
SourceData greenSourceData = greenData.apply(greenContext);
612611

613-
Assertions.assertEquals(greenSourceData.sourceData().size(), 1);
614-
Assertions.assertEquals(greenSourceData.sourceData().get("color"), "green");
615-
Assertions.assertEquals(greenSourceData.sourceName(), "configmap.green-configmap.default");
612+
Assertions.assertThat(greenSourceData.sourceData()).hasSize(1);
613+
Assertions.assertThat(greenSourceData.sourceData().get("color")).isEqualTo("green");
614+
Assertions.assertThat(greenSourceData.sourceName()).isEqualTo("configmap.green-configmap.default");
616615

617616
// meaning there is a single entry with such a log statement
618617
String[] out = output.getAll().split("Loaded all config maps in namespace");
619-
Assertions.assertEquals(out.length, 1);
618+
Assertions.assertThat(out.length).isEqualTo(1);
620619

621620
// meaning that the second read was done from the cache
622621
out = output.getAll().split("Will read individual configmaps in namespace");
623-
Assertions.assertEquals(out.length, 3);
622+
Assertions.assertThat(out.length).isEqualTo(3);
624623
}
625624

626625
private void stubCall(V1ConfigMapList configMapList, String path) {

0 commit comments

Comments
 (0)