Skip to content

Commit 09e7947

Browse files
wind57wind57
committed
more
Signed-off-by: wind57 <[email protected]>
1 parent e912698 commit 09e7947

18 files changed

+473
-484
lines changed

‎spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/SanitizeTests.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.List;
2020
import java.util.Map;
2121

22-
import org.junit.jupiter.api.Assertions;
22+
import org.assertj.core.api.Assertions;
2323
import org.junit.jupiter.api.Test;
2424

2525
import org.springframework.boot.actuate.endpoint.SanitizableData;
@@ -63,7 +63,7 @@ public Object getProperty(String name) {
6363
Sanitizer sanitizer = new Sanitizer(SANITIZING_FUNCTIONS);
6464
SanitizableData sanitizableData = new SanitizableData(bootstrapPropertySource, "secret", "xyz");
6565

66-
Assertions.assertEquals(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED), "xyz");
66+
Assertions.assertThat(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED)).isEqualTo("xyz");
6767
}
6868

6969
@Test
@@ -75,7 +75,7 @@ void bootstrapPropertySourceSecrets() {
7575
Sanitizer sanitizer = new Sanitizer(SANITIZING_FUNCTIONS);
7676
SanitizableData sanitizableData = new SanitizableData(bootstrapPropertySource, "secret", "xyz");
7777

78-
Assertions.assertEquals(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED), SANITIZED_VALUE);
78+
Assertions.assertThat(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED)).isEqualTo(SANITIZED_VALUE);
7979
}
8080

8181
@Test
@@ -87,7 +87,7 @@ void notSecretsPropertySource() {
8787
Sanitizer sanitizer = new Sanitizer(SANITIZING_FUNCTIONS);
8888
SanitizableData sanitizableData = new SanitizableData(bootstrapPropertySource, "secret", "xyz");
8989

90-
Assertions.assertEquals(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED), "xyz");
90+
Assertions.assertThat(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED)).isEqualTo("xyz");
9191
}
9292

9393
@Test
@@ -99,7 +99,7 @@ void secretsPropertySource() {
9999
Sanitizer sanitizer = new Sanitizer(SANITIZING_FUNCTIONS);
100100
SanitizableData sanitizableData = new SanitizableData(bootstrapPropertySource, "secret", "xyz");
101101

102-
Assertions.assertEquals(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED), SANITIZED_VALUE);
102+
Assertions.assertThat(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED)).isEqualTo(SANITIZED_VALUE);
103103
}
104104

105105
@Test
@@ -114,8 +114,8 @@ void compositeOneSecretOneMount() {
114114
SanitizableData sanitizableDataSecret = new SanitizableData(compositePropertySource, "secret", "xyz");
115115
SanitizableData sanitizableDataMount = new SanitizableData(compositePropertySource, "mount", "abc");
116116

117-
Assertions.assertEquals(sanitizer.sanitize(sanitizableDataSecret, SHOW_UNSANITIZED), SANITIZED_VALUE);
118-
Assertions.assertEquals(sanitizer.sanitize(sanitizableDataMount, SHOW_UNSANITIZED), "abc");
117+
Assertions.assertThat(sanitizer.sanitize(sanitizableDataSecret, SHOW_UNSANITIZED)).isEqualTo(SANITIZED_VALUE);
118+
Assertions.assertThat(sanitizer.sanitize(sanitizableDataMount, SHOW_UNSANITIZED)).isEqualTo("abc");
119119
}
120120

121121
}

‎spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigReloadPropertiesTests.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.time.Duration;
2020
import java.util.Set;
2121

22-
import org.junit.jupiter.api.Assertions;
22+
import org.assertj.core.api.Assertions;
2323
import org.junit.jupiter.api.Test;
2424

2525
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -38,15 +38,15 @@ class ConfigReloadPropertiesTests {
3838
void testDefaults() {
3939
new ApplicationContextRunner().withUserConfiguration(Config.class).run(context -> {
4040
ConfigReloadProperties properties = context.getBean(ConfigReloadProperties.class);
41-
Assertions.assertNotNull(properties);
42-
Assertions.assertFalse(properties.enabled());
43-
Assertions.assertTrue(properties.monitoringConfigMaps());
44-
Assertions.assertFalse(properties.monitoringSecrets());
45-
Assertions.assertEquals(ConfigReloadProperties.ReloadStrategy.REFRESH, properties.strategy());
46-
Assertions.assertEquals(ConfigReloadProperties.ReloadDetectionMode.EVENT, properties.mode());
47-
Assertions.assertEquals(Duration.ofMillis(15000), properties.period());
48-
Assertions.assertTrue(properties.namespaces().isEmpty());
49-
Assertions.assertEquals(Duration.ofSeconds(2), properties.maxWaitForRestart());
41+
Assertions.assertThat(properties).isNotNull();
42+
Assertions.assertThat(properties.enabled()).isFalse();
43+
Assertions.assertThat(properties.monitoringConfigMaps()).isTrue();
44+
Assertions.assertThat(properties.monitoringSecrets()).isFalse();
45+
Assertions.assertThat(ConfigReloadProperties.ReloadStrategy.REFRESH).isEqualTo(properties.strategy());
46+
Assertions.assertThat(ConfigReloadProperties.ReloadDetectionMode.EVENT).isEqualTo(properties.mode());
47+
Assertions.assertThat(Duration.ofMillis(15000)).isEqualTo(properties.period());
48+
Assertions.assertThat(properties.namespaces().isEmpty()).isTrue();
49+
Assertions.assertThat(Duration.ofSeconds(2)).isEqualTo(properties.maxWaitForRestart());
5050
});
5151
}
5252

@@ -62,15 +62,15 @@ void testNonDefaults() {
6262
"spring.cloud.kubernetes.reload.max-wait-for-restart=5s")
6363
.run(context -> {
6464
ConfigReloadProperties properties = context.getBean(ConfigReloadProperties.class);
65-
Assertions.assertNotNull(properties);
66-
Assertions.assertTrue(properties.enabled());
67-
Assertions.assertFalse(properties.monitoringConfigMaps());
68-
Assertions.assertTrue(properties.monitoringSecrets());
69-
Assertions.assertEquals(ConfigReloadProperties.ReloadStrategy.SHUTDOWN, properties.strategy());
70-
Assertions.assertEquals(ConfigReloadProperties.ReloadDetectionMode.POLLING, properties.mode());
71-
Assertions.assertEquals(Duration.ofMillis(1000), properties.period());
72-
Assertions.assertEquals(Set.of("a", "b"), properties.namespaces());
73-
Assertions.assertEquals(Duration.ofSeconds(5), properties.maxWaitForRestart());
65+
Assertions.assertThat(properties).isNotNull();
66+
Assertions.assertThat(properties.enabled()).isTrue();
67+
Assertions.assertThat(properties.monitoringConfigMaps()).isFalse();
68+
Assertions.assertThat(properties.monitoringSecrets()).isTrue();
69+
Assertions.assertThat(ConfigReloadProperties.ReloadStrategy.SHUTDOWN).isEqualTo(properties.strategy());
70+
Assertions.assertThat(ConfigReloadProperties.ReloadDetectionMode.POLLING).isEqualTo(properties.mode());
71+
Assertions.assertThat(Duration.ofMillis(1000)).isEqualTo(properties.period());
72+
Assertions.assertThat(properties.namespaces()).containsExactlyInAnyOrder("a", "b");
73+
Assertions.assertThat(Duration.ofSeconds(5)).isEqualTo(properties.maxWaitForRestart());
7474
});
7575
}
7676

‎spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsRawDataContainsProfileBasedSourceTests.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.List;
2020
import java.util.Map;
2121

22-
import org.junit.jupiter.api.Assertions;
22+
import org.assertj.core.api.Assertions;
2323
import org.junit.jupiter.api.Test;
2424

2525
/**
@@ -35,7 +35,7 @@ void nullSourceRawData() {
3535
Map<String, String> rawData = null;
3636

3737
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
38-
Assertions.assertFalse(result);
38+
Assertions.assertThat(result).isFalse();
3939
}
4040

4141
@Test
@@ -44,7 +44,7 @@ void sourceRawDataPresentEmptyActiveProfiles() {
4444
Map<String, String> rawData = Map.of("account-k8s.yaml", "value");
4545

4646
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
47-
Assertions.assertFalse(result);
47+
Assertions.assertThat(result).isFalse();
4848
}
4949

5050
@Test
@@ -53,7 +53,7 @@ void plainValuesOnly() {
5353
Map<String, String> rawData = Map.of("account", "value");
5454

5555
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
56-
Assertions.assertFalse(result);
56+
Assertions.assertThat(result).isFalse();
5757
}
5858

5959
@Test
@@ -62,7 +62,7 @@ void noMatchInActiveProfiles() {
6262
Map<String, String> rawData = Map.of("account-dev.yml", "value");
6363

6464
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
65-
Assertions.assertFalse(result);
65+
Assertions.assertThat(result).isFalse();
6666
}
6767

6868
@Test
@@ -71,7 +71,7 @@ void matchInActiveProfilesWithYml() {
7171
Map<String, String> rawData = Map.of("account-dev.yml", "value");
7272

7373
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
74-
Assertions.assertTrue(result);
74+
Assertions.assertThat(result).isTrue();
7575
}
7676

7777
@Test
@@ -80,7 +80,7 @@ void matchInActiveProfilesWithYaml() {
8080
Map<String, String> rawData = Map.of("account-dev.yaml", "value");
8181

8282
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
83-
Assertions.assertTrue(result);
83+
Assertions.assertThat(result).isTrue();
8484
}
8585

8686
@Test
@@ -89,7 +89,7 @@ void matchInActiveProfilesWithProperties() {
8989
Map<String, String> rawData = Map.of("account-dev.properties", "value");
9090

9191
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
92-
Assertions.assertTrue(result);
92+
Assertions.assertThat(result).isTrue();
9393
}
9494

9595
}

‎spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsTests.java‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.stream.Collectors;
2424
import java.util.stream.Stream;
2525

26-
import org.junit.jupiter.api.Assertions;
26+
import org.assertj.core.api.Assertions;
2727
import org.junit.jupiter.api.Test;
2828

2929
import org.springframework.mock.env.MockEnvironment;
@@ -36,54 +36,54 @@ class ConfigUtilsTests {
3636
@Test
3737
void testExplicitPrefixSet() {
3838
ConfigUtils.Prefix result = ConfigUtils.findPrefix("explicitPrefix", null, false, "irrelevant");
39-
Assertions.assertSame(result, ConfigUtils.Prefix.KNOWN);
40-
Assertions.assertEquals(result.prefixProvider().get(), "explicitPrefix");
39+
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.KNOWN);
40+
Assertions.assertThat(result.prefixProvider().get()).isEqualTo("explicitPrefix");
4141
}
4242

4343
@Test
4444
void testUseNameAsPrefixTrue() {
4545
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", Boolean.TRUE, false, "name-to-use");
46-
Assertions.assertSame(result, ConfigUtils.Prefix.KNOWN);
47-
Assertions.assertEquals(result.prefixProvider().get(), "name-to-use");
46+
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.KNOWN);
47+
Assertions.assertThat(result.prefixProvider().get()).isEqualTo("name-to-use");
4848
}
4949

5050
@Test
5151
void testUseNameAsPrefixFalse() {
5252
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", Boolean.FALSE, false, "name-not-to-use");
53-
Assertions.assertSame(result, ConfigUtils.Prefix.DEFAULT);
53+
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.DEFAULT);
5454
}
5555

5656
@Test
5757
void testDefaultUseNameAsPrefixTrue() {
5858
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", null, true, "name-to-use");
59-
Assertions.assertSame(result, ConfigUtils.Prefix.KNOWN);
60-
Assertions.assertEquals(result.prefixProvider().get(), "name-to-use");
59+
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.KNOWN);
60+
Assertions.assertThat(result.prefixProvider().get()).isEqualTo("name-to-use");
6161
}
6262

6363
@Test
6464
void testNoMatch() {
6565
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", null, false, "name-not-to-use");
66-
Assertions.assertSame(result, ConfigUtils.Prefix.DEFAULT);
66+
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.DEFAULT);
6767
}
6868

6969
@Test
7070
void testUnsetEmpty() {
7171
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", null, false, "name-not-to-use");
72-
Assertions.assertSame(result, ConfigUtils.Prefix.DEFAULT);
72+
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.DEFAULT);
7373

74-
String expected = Assertions.assertDoesNotThrow(() -> result.prefixProvider().get());
75-
Assertions.assertEquals("", expected);
74+
String[] expected = new String[1];
75+
Assertions.assertThatCode(() -> expected[0] = result.prefixProvider().get()).doesNotThrowAnyException();
76+
Assertions.assertThat(expected[0]).isEmpty();
7677
}
7778

7879
@Test
7980
void testDelayed() {
8081
ConfigUtils.Prefix result = ConfigUtils.findPrefix(null, true, false, null);
81-
Assertions.assertSame(result, ConfigUtils.Prefix.DELAYED);
82+
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.DELAYED);
8283

83-
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class,
84-
() -> result.prefixProvider().get());
84+
Assertions.assertThatThrownBy(() -> result.prefixProvider().get()).isInstanceOf(IllegalArgumentException.class)
85+
.hasMessage("prefix is delayed, needs to be taken elsewhere");
8586

86-
Assertions.assertEquals("prefix is delayed, needs to be taken elsewhere", ex.getMessage());
8787
}
8888

8989
/**
@@ -99,7 +99,7 @@ void testDelayed() {
9999
*/
100100
@Test
101101
void testUseIncludeProfileSpecificSourcesOnlyDefaultSet() {
102-
Assertions.assertTrue(ConfigUtils.includeProfileSpecificSources(true, null));
102+
Assertions.assertThat(ConfigUtils.includeProfileSpecificSources(true, null)).isTrue();
103103
}
104104

105105
/**
@@ -115,7 +115,7 @@ void testUseIncludeProfileSpecificSourcesOnlyDefaultSet() {
115115
*/
116116
@Test
117117
void testUseIncludeProfileSpecificSourcesOnlyDefaultNotSet() {
118-
Assertions.assertFalse(ConfigUtils.includeProfileSpecificSources(false, null));
118+
Assertions.assertThat(ConfigUtils.includeProfileSpecificSources(false, null)).isFalse();
119119
}
120120

121121
/**
@@ -134,7 +134,7 @@ void testUseIncludeProfileSpecificSourcesOnlyDefaultNotSet() {
134134
*/
135135
@Test
136136
void testUseIncludeProfileSpecificSourcesSourcesOverridesDefault() {
137-
Assertions.assertFalse(ConfigUtils.includeProfileSpecificSources(true, false));
137+
Assertions.assertThat(ConfigUtils.includeProfileSpecificSources(true, false)).isFalse();
138138
}
139139

140140
@Test
@@ -144,10 +144,10 @@ void testWithPrefix() {
144144

145145
SourceData result = ConfigUtils.withPrefix("configmap", context);
146146

147-
Assertions.assertEquals(result.sourceName(), "configmap.name1.name2.namespace");
147+
Assertions.assertThat(result.sourceName()).isEqualTo("configmap.name1.name2.namespace");
148148

149-
Assertions.assertEquals(result.sourceData().get("prefix.a"), "b");
150-
Assertions.assertEquals(result.sourceData().get("prefix.c"), "d");
149+
Assertions.assertThat(result.sourceData().get("prefix.a")).isEqualTo("b");
150+
Assertions.assertThat(result.sourceData().get("prefix.c")).isEqualTo("d");
151151
}
152152

153153
/*
@@ -159,10 +159,10 @@ void testWithPrefixSortedName() {
159159
Set.of("namec", "namea", "nameb"));
160160

161161
SourceData result = ConfigUtils.withPrefix("configmap", context);
162-
Assertions.assertEquals(result.sourceName(), "configmap.namea.nameb.namec.namespace");
162+
Assertions.assertThat(result.sourceName()).isEqualTo("configmap.namea.nameb.namec.namespace");
163163

164-
Assertions.assertEquals(result.sourceData().get("prefix.a"), "b");
165-
Assertions.assertEquals(result.sourceData().get("prefix.c"), "d");
164+
Assertions.assertThat(result.sourceData().get("prefix.a")).isEqualTo("b");
165+
Assertions.assertThat(result.sourceData().get("prefix.c")).isEqualTo("d");
166166
}
167167

168168
/**
@@ -190,36 +190,36 @@ void testMerge() {
190190
MultipleSourcesContainer result = ConfigUtils.processNamedData(List.of(configMapOne, configMapOneK8s),
191191
new MockEnvironment(), sourceNames, "default", false);
192192

193-
Assertions.assertEquals(result.data().size(), 3);
194-
Assertions.assertEquals(result.data().get("propA"), "AA");
195-
Assertions.assertEquals(result.data().get("propB"), "B");
196-
Assertions.assertEquals(result.data().get("propC"), "C");
193+
Assertions.assertThat(result.data().size()).isEqualTo(3);
194+
Assertions.assertThat(result.data().get("propA")).isEqualTo("AA");
195+
Assertions.assertThat(result.data().get("propB")).isEqualTo("B");
196+
Assertions.assertThat(result.data().get("propC")).isEqualTo("C");
197197
}
198198

199199
@Test
200200
void testKeysWithPrefixNullMap() {
201201
Map<String, String> result = ConfigUtils.keysWithPrefix(null, "");
202-
Assertions.assertTrue(result.isEmpty());
202+
Assertions.assertThat(result.isEmpty()).isTrue();
203203
}
204204

205205
@Test
206206
void testKeysWithPrefixEmptyMap() {
207207
Map<String, String> result = ConfigUtils.keysWithPrefix(Map.of(), "");
208-
Assertions.assertTrue(result.isEmpty());
208+
Assertions.assertThat(result.isEmpty()).isTrue();
209209
}
210210

211211
@Test
212212
void testKeysWithPrefixEmptyPrefix() {
213213
Map<String, String> result = ConfigUtils.keysWithPrefix(Map.of("a", "b"), "");
214-
Assertions.assertFalse(result.isEmpty());
215-
Assertions.assertEquals(Map.of("a", "b"), result);
214+
Assertions.assertThat(result.isEmpty()).isFalse();
215+
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("a", "b"));
216216
}
217217

218218
@Test
219219
void testKeysWithPrefixNonEmptyPrefix() {
220220
Map<String, String> result = ConfigUtils.keysWithPrefix(Map.of("a", "b", "c", "d"), "prefix-");
221-
Assertions.assertFalse(result.isEmpty());
222-
Assertions.assertEquals(Map.of("prefix-a", "b", "prefix-c", "d"), result);
221+
Assertions.assertThat(result.isEmpty()).isFalse();
222+
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("prefix-a", "b", "prefix-c", "d"));
223223
}
224224

225225
}

0 commit comments

Comments
 (0)