From 21d2c61a83789b0db513636cc67ffe7118cbb0c8 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sat, 29 Mar 2025 23:55:46 +0200 Subject: [PATCH] more Signed-off-by: wind57 --- ...abric8ConfigDataLocationResolverTests.java | 71 +++++++++---------- .../ConfigReloadAutoConfigurationTest.java | 64 ++++++++--------- 2 files changed, 67 insertions(+), 68 deletions(-) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigDataLocationResolverTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigDataLocationResolverTests.java index 03289fad..3960119f 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigDataLocationResolverTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigDataLocationResolverTests.java @@ -20,7 +20,7 @@ import java.util.function.Supplier; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; -import org.junit.jupiter.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -73,15 +73,15 @@ class Fabric8ConfigDataLocationResolverTests { ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc"); RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles); - Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class)); - Assertions.assertTrue(context.isRegistered(Config.class)); - Assertions.assertTrue(context.isRegistered(KubernetesClient.class)); + Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue(); + Assertions.assertThat(context.isRegistered(Config.class)).isTrue(); + Assertions.assertThat(context.isRegistered(KubernetesClient.class)).isTrue(); - Assertions.assertFalse(context.isRegistered(ConfigMapConfigProperties.class)); - Assertions.assertFalse(context.isRegistered(SecretsConfigProperties.class)); + Assertions.assertThat(context.isRegistered(ConfigMapConfigProperties.class)).isFalse(); + Assertions.assertThat(context.isRegistered(SecretsConfigProperties.class)).isFalse(); - Assertions.assertFalse(context.isRegistered(ConfigMapPropertySourceLocator.class)); - Assertions.assertFalse(context.isRegistered(SecretsPropertySourceLocator.class)); + Assertions.assertThat(context.isRegistered(ConfigMapPropertySourceLocator.class)).isFalse(); + Assertions.assertThat(context.isRegistered(SecretsPropertySourceLocator.class)).isFalse(); } /* @@ -109,22 +109,22 @@ class Fabric8ConfigDataLocationResolverTests { ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc"); RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles); - Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class)); - Assertions.assertTrue(context.isRegistered(Config.class)); - Assertions.assertTrue(context.isRegistered(KubernetesClient.class)); + Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue(); + Assertions.assertThat(context.isRegistered(Config.class)).isTrue(); + Assertions.assertThat(context.isRegistered(KubernetesClient.class)).isTrue(); - Assertions.assertTrue(context.isRegistered(ConfigMapConfigProperties.class)); - Assertions.assertTrue(context.isRegistered(SecretsConfigProperties.class)); + Assertions.assertThat(context.isRegistered(ConfigMapConfigProperties.class)).isTrue(); + Assertions.assertThat(context.isRegistered(SecretsConfigProperties.class)).isTrue(); - Assertions.assertTrue(context.isRegistered(ConfigMapPropertySourceLocator.class)); - Assertions.assertTrue(context.isRegistered(SecretsPropertySourceLocator.class)); + Assertions.assertThat(context.isRegistered(ConfigMapPropertySourceLocator.class)).isTrue(); + Assertions.assertThat(context.isRegistered(SecretsPropertySourceLocator.class)).isTrue(); ConfigMapPropertySourceLocator configMapPropertySourceLocator = context .get(ConfigMapPropertySourceLocator.class); - Assertions.assertSame(Fabric8ConfigMapPropertySourceLocator.class, configMapPropertySourceLocator.getClass()); + Assertions.assertThat(configMapPropertySourceLocator.getClass()).isSameAs(Fabric8ConfigMapPropertySourceLocator.class); SecretsPropertySourceLocator secretsPropertySourceLocator = context.get(SecretsPropertySourceLocator.class); - Assertions.assertSame(Fabric8SecretsPropertySourceLocator.class, secretsPropertySourceLocator.getClass()); + Assertions.assertThat(secretsPropertySourceLocator.getClass()).isSameAs(Fabric8SecretsPropertySourceLocator.class); } @@ -154,19 +154,19 @@ class Fabric8ConfigDataLocationResolverTests { ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc"); RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles); - Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class)); - Assertions.assertTrue(context.isRegistered(Config.class)); - Assertions.assertTrue(context.isRegistered(KubernetesClient.class)); + Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue(); + Assertions.assertThat(context.isRegistered(Config.class)).isTrue(); + Assertions.assertThat(context.isRegistered(KubernetesClient.class)).isTrue(); - Assertions.assertTrue(context.isRegistered(ConfigMapConfigProperties.class)); - Assertions.assertTrue(context.isRegistered(SecretsConfigProperties.class)); + Assertions.assertThat(context.isRegistered(ConfigMapConfigProperties.class)).isTrue(); + Assertions.assertThat(context.isRegistered(SecretsConfigProperties.class)).isTrue(); ConfigMapPropertySourceLocator configMapPropertySourceLocator = context .get(ConfigMapPropertySourceLocator.class); - Assertions.assertSame(Fabric8ConfigMapPropertySourceLocator.class, configMapPropertySourceLocator.getClass()); + Assertions.assertThat(configMapPropertySourceLocator.getClass()).isEqualTo(Fabric8ConfigMapPropertySourceLocator.class); SecretsPropertySourceLocator secretsPropertySourceLocator = context.get(SecretsPropertySourceLocator.class); - Assertions.assertSame(Fabric8SecretsPropertySourceLocator.class, secretsPropertySourceLocator.getClass()); + Assertions.assertThat(secretsPropertySourceLocator.getClass()).isEqualTo(Fabric8SecretsPropertySourceLocator.class); } /* @@ -198,25 +198,24 @@ class Fabric8ConfigDataLocationResolverTests { ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc"); RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles); - Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class)); - Assertions.assertTrue(context.isRegistered(Config.class)); - Assertions.assertTrue(context.isRegistered(KubernetesClient.class)); + Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue(); + Assertions.assertThat(context.isRegistered(Config.class)).isTrue(); + Assertions.assertThat(context.isRegistered(KubernetesClient.class)).isTrue(); - Assertions.assertTrue(context.isRegistered(ConfigMapConfigProperties.class)); - Assertions.assertTrue(context.isRegistered(SecretsConfigProperties.class)); + Assertions.assertThat(context.isRegistered(ConfigMapConfigProperties.class)).isTrue(); + Assertions.assertThat(context.isRegistered(SecretsConfigProperties.class)).isTrue(); - Assertions.assertTrue(context.isRegistered(ConfigMapPropertySourceLocator.class)); - Assertions.assertTrue(context.isRegistered(SecretsPropertySourceLocator.class)); + Assertions.assertThat(context.isRegistered(ConfigMapPropertySourceLocator.class)).isTrue(); + Assertions.assertThat(context.isRegistered(SecretsPropertySourceLocator.class)).isTrue(); ConfigMapPropertySourceLocator configMapPropertySourceLocator = context .get(ConfigMapPropertySourceLocator.class); - Assertions.assertSame(ConfigDataRetryableConfigMapPropertySourceLocator.class, - configMapPropertySourceLocator.getClass()); + Assertions.assertThat(configMapPropertySourceLocator.getClass()) + .isEqualTo(ConfigDataRetryableConfigMapPropertySourceLocator.class); SecretsPropertySourceLocator secretsPropertySourceLocator = context.get(SecretsPropertySourceLocator.class); - Assertions.assertSame(ConfigDataRetryableSecretsPropertySourceLocator.class, - secretsPropertySourceLocator.getClass()); - + Assertions.assertThat(secretsPropertySourceLocator.getClass()) + .isEqualTo(ConfigDataRetryableSecretsPropertySourceLocator.class); } } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java index b936510e..d7c485b1 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java @@ -26,7 +26,7 @@ import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; -import org.junit.jupiter.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -129,12 +129,12 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 1); - Assertions.assertTrue(map.values() + Assertions.assertThat(map.size()).isEqualTo(1); + Assertions.assertThat(map.values() .iterator() .next() - .getClass() - .isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class)); + .getClass()) + .isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class); } /** @@ -153,12 +153,12 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 1); - Assertions.assertTrue(map.values() + Assertions.assertThat(map.size()).isEqualTo(1); + Assertions.assertThat(map.values() .iterator() .next() - .getClass() - .isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class)); + .getClass()) + .isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class); } /** @@ -178,7 +178,7 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=false"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 0); + Assertions.assertThat(map).isEmpty(); } /** @@ -198,7 +198,7 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=false"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 0); + Assertions.assertThat(map).isEmpty(); } /** @@ -217,9 +217,9 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 1); - Assertions.assertTrue( - map.values().iterator().next().getClass().isAssignableFrom(PollingConfigMapChangeDetector.class)); + Assertions.assertThat(map.size()).isEqualTo(1); + Assertions.assertThat( + map.values().iterator().next().getClass()).isAssignableFrom(PollingConfigMapChangeDetector.class); } /** @@ -241,12 +241,12 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.monitoring-configMaps=false", "spring.cloud.kubernetes.reload.mode=event"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 1); - Assertions.assertTrue(map.values() + Assertions.assertThat(map.size()).isEqualTo(1); + Assertions.assertThat(map.values() .iterator() .next() - .getClass() - .isAssignableFrom(Fabric8EventBasedSecretsChangeDetector.class)); + .getClass()) + .isAssignableFrom(Fabric8EventBasedSecretsChangeDetector.class); } /** @@ -268,9 +268,9 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.monitoring-configMaps=false", "spring.cloud.kubernetes.reload.mode=polling"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 1); + Assertions.assertThat(map.size()).isEqualTo(1); Assertions - .assertTrue(map.values().iterator().next().getClass().isAssignableFrom(PollingSecretsChangeDetector.class)); + .assertThat(map.values().iterator().next().getClass()).isAssignableFrom(PollingSecretsChangeDetector.class); } /** @@ -292,13 +292,13 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.monitoring-configMaps=true", "spring.cloud.kubernetes.reload.mode=event"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 2); + Assertions.assertThat(map.size()).isEqualTo(2); List result = map.values() .stream() .sorted(Comparator.comparing(x -> x.getClass().getName())) .toList(); - Assertions.assertEquals(result.get(0).getClass(), Fabric8EventBasedConfigMapChangeDetector.class); - Assertions.assertEquals(result.get(1).getClass(), Fabric8EventBasedSecretsChangeDetector.class); + Assertions.assertThat(result.get(0).getClass()).isEqualTo(Fabric8EventBasedConfigMapChangeDetector.class); + Assertions.assertThat(result.get(1).getClass()).isEqualTo(Fabric8EventBasedSecretsChangeDetector.class); } /** @@ -320,13 +320,13 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.monitoring-configMaps=true", "spring.cloud.kubernetes.reload.mode=polling"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 2); + Assertions.assertThat(map.size()).isEqualTo(2); List result = map.values() .stream() .sorted(Comparator.comparing(x -> x.getClass().getName())) .toList(); - Assertions.assertEquals(result.get(0).getClass(), PollingConfigMapChangeDetector.class); - Assertions.assertEquals(result.get(1).getClass(), PollingSecretsChangeDetector.class); + Assertions.assertThat(result.get(0).getClass()).isEqualTo(PollingConfigMapChangeDetector.class); + Assertions.assertThat(result.get(1).getClass()).isEqualTo(PollingSecretsChangeDetector.class); } /** @@ -348,7 +348,7 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.monitoring-configMaps=false", "spring.cloud.kubernetes.reload.monitoring-secrets=false"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 0); + Assertions.assertThat(map).isEmpty(); } /** @@ -370,7 +370,7 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.monitoring-configMaps=false", "spring.cloud.kubernetes.reload.monitoring-secrets=false"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 0); + Assertions.assertThat(map).isEmpty(); } /** @@ -392,12 +392,12 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.monitoring-configMaps=true", "spring.cloud.kubernetes.reload.monitoring-secrets=false"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 1); + Assertions.assertThat(map.size()).isEqualTo(1); List result = map.values() .stream() .sorted(Comparator.comparing(x -> x.getClass().getName())) .toList(); - Assertions.assertEquals(result.get(0).getClass(), Fabric8EventBasedConfigMapChangeDetector.class); + Assertions.assertThat(result.get(0).getClass()).isEqualTo(Fabric8EventBasedConfigMapChangeDetector.class); } /** @@ -419,12 +419,12 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase { "spring.cloud.kubernetes.reload.monitoring-configMaps=true", "spring.cloud.kubernetes.reload.monitoring-secrets=false"); Map map = getContext().getBeansOfType(ConfigurationChangeDetector.class); - Assertions.assertEquals(map.size(), 1); + Assertions.assertThat(map.size()).isEqualTo(1); List result = map.values() .stream() .sorted(Comparator.comparing(x -> x.getClass().getName())) .toList(); - Assertions.assertEquals(result.get(0).getClass(), PollingConfigMapChangeDetector.class); + Assertions.assertThat(result.get(0).getClass()).isEqualTo(PollingConfigMapChangeDetector.class); } @Test