Skip to content

Commit 21d2c61

Browse files
wind57wind57
committed
more
Signed-off-by: wind57 <[email protected]>
1 parent 65540a2 commit 21d2c61

File tree

2 files changed

+67
-68
lines changed

2 files changed

+67
-68
lines changed

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

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import io.fabric8.kubernetes.client.Config;
2222
import io.fabric8.kubernetes.client.KubernetesClient;
23-
import org.junit.jupiter.api.Assertions;
23+
import org.assertj.core.api.Assertions;
2424
import org.junit.jupiter.api.Test;
2525
import org.mockito.Mockito;
2626

@@ -73,15 +73,15 @@ void testBothMissing() {
7373
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
7474
RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles);
7575

76-
Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class));
77-
Assertions.assertTrue(context.isRegistered(Config.class));
78-
Assertions.assertTrue(context.isRegistered(KubernetesClient.class));
76+
Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue();
77+
Assertions.assertThat(context.isRegistered(Config.class)).isTrue();
78+
Assertions.assertThat(context.isRegistered(KubernetesClient.class)).isTrue();
7979

80-
Assertions.assertFalse(context.isRegistered(ConfigMapConfigProperties.class));
81-
Assertions.assertFalse(context.isRegistered(SecretsConfigProperties.class));
80+
Assertions.assertThat(context.isRegistered(ConfigMapConfigProperties.class)).isFalse();
81+
Assertions.assertThat(context.isRegistered(SecretsConfigProperties.class)).isFalse();
8282

83-
Assertions.assertFalse(context.isRegistered(ConfigMapPropertySourceLocator.class));
84-
Assertions.assertFalse(context.isRegistered(SecretsPropertySourceLocator.class));
83+
Assertions.assertThat(context.isRegistered(ConfigMapPropertySourceLocator.class)).isFalse();
84+
Assertions.assertThat(context.isRegistered(SecretsPropertySourceLocator.class)).isFalse();
8585
}
8686

8787
/*
@@ -109,22 +109,22 @@ void testBothPresent() {
109109
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
110110
RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles);
111111

112-
Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class));
113-
Assertions.assertTrue(context.isRegistered(Config.class));
114-
Assertions.assertTrue(context.isRegistered(KubernetesClient.class));
112+
Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue();
113+
Assertions.assertThat(context.isRegistered(Config.class)).isTrue();
114+
Assertions.assertThat(context.isRegistered(KubernetesClient.class)).isTrue();
115115

116-
Assertions.assertTrue(context.isRegistered(ConfigMapConfigProperties.class));
117-
Assertions.assertTrue(context.isRegistered(SecretsConfigProperties.class));
116+
Assertions.assertThat(context.isRegistered(ConfigMapConfigProperties.class)).isTrue();
117+
Assertions.assertThat(context.isRegistered(SecretsConfigProperties.class)).isTrue();
118118

119-
Assertions.assertTrue(context.isRegistered(ConfigMapPropertySourceLocator.class));
120-
Assertions.assertTrue(context.isRegistered(SecretsPropertySourceLocator.class));
119+
Assertions.assertThat(context.isRegistered(ConfigMapPropertySourceLocator.class)).isTrue();
120+
Assertions.assertThat(context.isRegistered(SecretsPropertySourceLocator.class)).isTrue();
121121

122122
ConfigMapPropertySourceLocator configMapPropertySourceLocator = context
123123
.get(ConfigMapPropertySourceLocator.class);
124-
Assertions.assertSame(Fabric8ConfigMapPropertySourceLocator.class, configMapPropertySourceLocator.getClass());
124+
Assertions.assertThat(configMapPropertySourceLocator.getClass()).isSameAs(Fabric8ConfigMapPropertySourceLocator.class);
125125

126126
SecretsPropertySourceLocator secretsPropertySourceLocator = context.get(SecretsPropertySourceLocator.class);
127-
Assertions.assertSame(Fabric8SecretsPropertySourceLocator.class, secretsPropertySourceLocator.getClass());
127+
Assertions.assertThat(secretsPropertySourceLocator.getClass()).isSameAs(Fabric8SecretsPropertySourceLocator.class);
128128

129129
}
130130

@@ -154,19 +154,19 @@ void testBothPresentExplicitly() {
154154
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
155155
RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles);
156156

157-
Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class));
158-
Assertions.assertTrue(context.isRegistered(Config.class));
159-
Assertions.assertTrue(context.isRegistered(KubernetesClient.class));
157+
Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue();
158+
Assertions.assertThat(context.isRegistered(Config.class)).isTrue();
159+
Assertions.assertThat(context.isRegistered(KubernetesClient.class)).isTrue();
160160

161-
Assertions.assertTrue(context.isRegistered(ConfigMapConfigProperties.class));
162-
Assertions.assertTrue(context.isRegistered(SecretsConfigProperties.class));
161+
Assertions.assertThat(context.isRegistered(ConfigMapConfigProperties.class)).isTrue();
162+
Assertions.assertThat(context.isRegistered(SecretsConfigProperties.class)).isTrue();
163163

164164
ConfigMapPropertySourceLocator configMapPropertySourceLocator = context
165165
.get(ConfigMapPropertySourceLocator.class);
166-
Assertions.assertSame(Fabric8ConfigMapPropertySourceLocator.class, configMapPropertySourceLocator.getClass());
166+
Assertions.assertThat(configMapPropertySourceLocator.getClass()).isEqualTo(Fabric8ConfigMapPropertySourceLocator.class);
167167

168168
SecretsPropertySourceLocator secretsPropertySourceLocator = context.get(SecretsPropertySourceLocator.class);
169-
Assertions.assertSame(Fabric8SecretsPropertySourceLocator.class, secretsPropertySourceLocator.getClass());
169+
Assertions.assertThat(secretsPropertySourceLocator.getClass()).isEqualTo(Fabric8SecretsPropertySourceLocator.class);
170170
}
171171

172172
/*
@@ -198,25 +198,24 @@ void testBothPresentAndRetryEnabled() {
198198
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
199199
RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles);
200200

201-
Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class));
202-
Assertions.assertTrue(context.isRegistered(Config.class));
203-
Assertions.assertTrue(context.isRegistered(KubernetesClient.class));
201+
Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue();
202+
Assertions.assertThat(context.isRegistered(Config.class)).isTrue();
203+
Assertions.assertThat(context.isRegistered(KubernetesClient.class)).isTrue();
204204

205-
Assertions.assertTrue(context.isRegistered(ConfigMapConfigProperties.class));
206-
Assertions.assertTrue(context.isRegistered(SecretsConfigProperties.class));
205+
Assertions.assertThat(context.isRegistered(ConfigMapConfigProperties.class)).isTrue();
206+
Assertions.assertThat(context.isRegistered(SecretsConfigProperties.class)).isTrue();
207207

208-
Assertions.assertTrue(context.isRegistered(ConfigMapPropertySourceLocator.class));
209-
Assertions.assertTrue(context.isRegistered(SecretsPropertySourceLocator.class));
208+
Assertions.assertThat(context.isRegistered(ConfigMapPropertySourceLocator.class)).isTrue();
209+
Assertions.assertThat(context.isRegistered(SecretsPropertySourceLocator.class)).isTrue();
210210

211211
ConfigMapPropertySourceLocator configMapPropertySourceLocator = context
212212
.get(ConfigMapPropertySourceLocator.class);
213-
Assertions.assertSame(ConfigDataRetryableConfigMapPropertySourceLocator.class,
214-
configMapPropertySourceLocator.getClass());
213+
Assertions.assertThat(configMapPropertySourceLocator.getClass())
214+
.isEqualTo(ConfigDataRetryableConfigMapPropertySourceLocator.class);
215215

216216
SecretsPropertySourceLocator secretsPropertySourceLocator = context.get(SecretsPropertySourceLocator.class);
217-
Assertions.assertSame(ConfigDataRetryableSecretsPropertySourceLocator.class,
218-
secretsPropertySourceLocator.getClass());
219-
217+
Assertions.assertThat(secretsPropertySourceLocator.getClass())
218+
.isEqualTo(ConfigDataRetryableSecretsPropertySourceLocator.class);
220219
}
221220

222221
}

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import io.fabric8.kubernetes.client.Config;
2727
import io.fabric8.kubernetes.client.KubernetesClient;
2828
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
29-
import org.junit.jupiter.api.Assertions;
29+
import org.assertj.core.api.Assertions;
3030
import org.junit.jupiter.api.BeforeAll;
3131
import org.junit.jupiter.api.BeforeEach;
3232
import org.junit.jupiter.api.Test;
@@ -129,12 +129,12 @@ void reloadEventEnabledMonitoringConfigMapsEnabledByDefault() {
129129
setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.reload.enabled=true",
130130
"spring.main.cloud-platform=KUBERNETES");
131131
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
132-
Assertions.assertEquals(map.size(), 1);
133-
Assertions.assertTrue(map.values()
132+
Assertions.assertThat(map.size()).isEqualTo(1);
133+
Assertions.assertThat(map.values()
134134
.iterator()
135135
.next()
136-
.getClass()
137-
.isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class));
136+
.getClass())
137+
.isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class);
138138
}
139139

140140
/**
@@ -153,12 +153,12 @@ void reloadEventEnabledMonitoringConfigMapsEnabled() {
153153
setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.reload.enabled=true",
154154
"spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES");
155155
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
156-
Assertions.assertEquals(map.size(), 1);
157-
Assertions.assertTrue(map.values()
156+
Assertions.assertThat(map.size()).isEqualTo(1);
157+
Assertions.assertThat(map.values()
158158
.iterator()
159159
.next()
160-
.getClass()
161-
.isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class));
160+
.getClass())
161+
.isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class);
162162
}
163163

164164
/**
@@ -178,7 +178,7 @@ void reloadEventEnabledMonitoringConfigMapsDisabled() {
178178
"spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES",
179179
"spring.cloud.kubernetes.reload.monitoring-configMaps=false");
180180
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
181-
Assertions.assertEquals(map.size(), 0);
181+
Assertions.assertThat(map).isEmpty();
182182
}
183183

184184
/**
@@ -198,7 +198,7 @@ void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsDisabled()
198198
"spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES",
199199
"spring.cloud.kubernetes.reload.monitoring-configMaps=false");
200200
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
201-
Assertions.assertEquals(map.size(), 0);
201+
Assertions.assertThat(map).isEmpty();
202202
}
203203

204204
/**
@@ -217,9 +217,9 @@ void reloadPollingEnabledMonitoringConfigMapsEnabled() {
217217
setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.reload.enabled=true",
218218
"spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES");
219219
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
220-
Assertions.assertEquals(map.size(), 1);
221-
Assertions.assertTrue(
222-
map.values().iterator().next().getClass().isAssignableFrom(PollingConfigMapChangeDetector.class));
220+
Assertions.assertThat(map.size()).isEqualTo(1);
221+
Assertions.assertThat(
222+
map.values().iterator().next().getClass()).isAssignableFrom(PollingConfigMapChangeDetector.class);
223223
}
224224

225225
/**
@@ -241,12 +241,12 @@ void reloadEventEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
241241
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
242242
"spring.cloud.kubernetes.reload.mode=event");
243243
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
244-
Assertions.assertEquals(map.size(), 1);
245-
Assertions.assertTrue(map.values()
244+
Assertions.assertThat(map.size()).isEqualTo(1);
245+
Assertions.assertThat(map.values()
246246
.iterator()
247247
.next()
248-
.getClass()
249-
.isAssignableFrom(Fabric8EventBasedSecretsChangeDetector.class));
248+
.getClass())
249+
.isAssignableFrom(Fabric8EventBasedSecretsChangeDetector.class);
250250
}
251251

252252
/**
@@ -268,9 +268,9 @@ void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled()
268268
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
269269
"spring.cloud.kubernetes.reload.mode=polling");
270270
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
271-
Assertions.assertEquals(map.size(), 1);
271+
Assertions.assertThat(map.size()).isEqualTo(1);
272272
Assertions
273-
.assertTrue(map.values().iterator().next().getClass().isAssignableFrom(PollingSecretsChangeDetector.class));
273+
.assertThat(map.values().iterator().next().getClass()).isAssignableFrom(PollingSecretsChangeDetector.class);
274274
}
275275

276276
/**
@@ -292,13 +292,13 @@ void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
292292
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
293293
"spring.cloud.kubernetes.reload.mode=event");
294294
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
295-
Assertions.assertEquals(map.size(), 2);
295+
Assertions.assertThat(map.size()).isEqualTo(2);
296296
List<ConfigurationChangeDetector> result = map.values()
297297
.stream()
298298
.sorted(Comparator.comparing(x -> x.getClass().getName()))
299299
.toList();
300-
Assertions.assertEquals(result.get(0).getClass(), Fabric8EventBasedConfigMapChangeDetector.class);
301-
Assertions.assertEquals(result.get(1).getClass(), Fabric8EventBasedSecretsChangeDetector.class);
300+
Assertions.assertThat(result.get(0).getClass()).isEqualTo(Fabric8EventBasedConfigMapChangeDetector.class);
301+
Assertions.assertThat(result.get(1).getClass()).isEqualTo(Fabric8EventBasedSecretsChangeDetector.class);
302302
}
303303

304304
/**
@@ -320,13 +320,13 @@ void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
320320
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
321321
"spring.cloud.kubernetes.reload.mode=polling");
322322
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
323-
Assertions.assertEquals(map.size(), 2);
323+
Assertions.assertThat(map.size()).isEqualTo(2);
324324
List<ConfigurationChangeDetector> result = map.values()
325325
.stream()
326326
.sorted(Comparator.comparing(x -> x.getClass().getName()))
327327
.toList();
328-
Assertions.assertEquals(result.get(0).getClass(), PollingConfigMapChangeDetector.class);
329-
Assertions.assertEquals(result.get(1).getClass(), PollingSecretsChangeDetector.class);
328+
Assertions.assertThat(result.get(0).getClass()).isEqualTo(PollingConfigMapChangeDetector.class);
329+
Assertions.assertThat(result.get(1).getClass()).isEqualTo(PollingSecretsChangeDetector.class);
330330
}
331331

332332
/**
@@ -348,7 +348,7 @@ void reloadEventEnabledMonitoringConfigMapsDisabledMonitoringSecretsDisabled() {
348348
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
349349
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
350350
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
351-
Assertions.assertEquals(map.size(), 0);
351+
Assertions.assertThat(map).isEmpty();
352352
}
353353

354354
/**
@@ -370,7 +370,7 @@ void reloadPollingEnabledMonitorConfigMapsDisabledMonitoringSecretsDisabled() {
370370
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
371371
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
372372
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
373-
Assertions.assertEquals(map.size(), 0);
373+
Assertions.assertThat(map).isEmpty();
374374
}
375375

376376
/**
@@ -392,12 +392,12 @@ void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
392392
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
393393
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
394394
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
395-
Assertions.assertEquals(map.size(), 1);
395+
Assertions.assertThat(map.size()).isEqualTo(1);
396396
List<ConfigurationChangeDetector> result = map.values()
397397
.stream()
398398
.sorted(Comparator.comparing(x -> x.getClass().getName()))
399399
.toList();
400-
Assertions.assertEquals(result.get(0).getClass(), Fabric8EventBasedConfigMapChangeDetector.class);
400+
Assertions.assertThat(result.get(0).getClass()).isEqualTo(Fabric8EventBasedConfigMapChangeDetector.class);
401401
}
402402

403403
/**
@@ -419,12 +419,12 @@ void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled()
419419
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
420420
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
421421
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
422-
Assertions.assertEquals(map.size(), 1);
422+
Assertions.assertThat(map.size()).isEqualTo(1);
423423
List<ConfigurationChangeDetector> result = map.values()
424424
.stream()
425425
.sorted(Comparator.comparing(x -> x.getClass().getName()))
426426
.toList();
427-
Assertions.assertEquals(result.get(0).getClass(), PollingConfigMapChangeDetector.class);
427+
Assertions.assertThat(result.get(0).getClass()).isEqualTo(PollingConfigMapChangeDetector.class);
428428
}
429429

430430
@Test

0 commit comments

Comments
 (0)