diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesBindingTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesBindingTests.java index bab1e9d2..e6cb2075 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesBindingTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesBindingTests.java @@ -16,7 +16,7 @@ package org.springframework.cloud.kubernetes.commons.config; -import org.junit.jupiter.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -35,24 +35,24 @@ class ConfigMapConfigPropertiesBindingTests { void testWithDefaults() { new ApplicationContextRunner().withUserConfiguration(Config.class).run(context -> { ConfigMapConfigProperties props = context.getBean(ConfigMapConfigProperties.class); - Assertions.assertNotNull(props); - Assertions.assertTrue(props.enableApi()); - Assertions.assertTrue(props.paths().isEmpty()); - Assertions.assertTrue(props.sources().isEmpty()); - Assertions.assertTrue(props.labels().isEmpty()); - Assertions.assertTrue(props.enabled()); - Assertions.assertNull(props.name()); - Assertions.assertNull(props.namespace()); - Assertions.assertFalse(props.useNameAsPrefix()); - Assertions.assertTrue(props.includeProfileSpecificSources()); - Assertions.assertFalse(props.failFast()); + Assertions.assertThat(props).isNotNull(); + Assertions.assertThat(props.enableApi()).isTrue(); + Assertions.assertThat(props.paths().isEmpty()).isTrue(); + Assertions.assertThat(props.sources().isEmpty()).isTrue(); + Assertions.assertThat(props.labels().isEmpty()).isTrue(); + Assertions.assertThat(props.enabled()).isTrue(); + Assertions.assertThat(props.name()).isNull(); + Assertions.assertThat(props.namespace()).isNull(); + Assertions.assertThat(props.useNameAsPrefix()).isFalse(); + Assertions.assertThat(props.includeProfileSpecificSources()).isTrue(); + Assertions.assertThat(props.failFast()).isFalse(); - Assertions.assertNotNull(props.retry()); - Assertions.assertEquals(props.retry().initialInterval(), 1000L); - Assertions.assertEquals(props.retry().multiplier(), 1.1D); - Assertions.assertEquals(props.retry().maxInterval(), 2000L); - Assertions.assertEquals(props.retry().maxAttempts(), 6); - Assertions.assertTrue(props.retry().enabled()); + Assertions.assertThat(props.retry()).isNotNull(); + Assertions.assertThat(props.retry().initialInterval()).isEqualTo(1000L); + Assertions.assertThat(props.retry().multiplier()).isEqualTo(1.1D); + Assertions.assertThat(props.retry().maxInterval()).isEqualTo(2000L); + Assertions.assertThat(props.retry().maxAttempts()).isEqualTo(6); + Assertions.assertThat(props.retry().enabled()).isTrue(); }); } @@ -80,39 +80,39 @@ class ConfigMapConfigPropertiesBindingTests { "spring.cloud.kubernetes.config.retry.enabled=false") .run(context -> { ConfigMapConfigProperties props = context.getBean(ConfigMapConfigProperties.class); - Assertions.assertNotNull(props); - Assertions.assertFalse(props.enableApi()); + Assertions.assertThat(props).isNotNull(); + Assertions.assertThat(props.enableApi()).isFalse(); - Assertions.assertEquals(props.paths().size(), 2); - Assertions.assertEquals(props.paths().get(0), "a"); - Assertions.assertEquals(props.paths().get(1), "b"); + Assertions.assertThat(props.paths().size()).isEqualTo(2); + Assertions.assertThat(props.paths().get(0)).isEqualTo("a"); + Assertions.assertThat(props.paths().get(1)).isEqualTo("b"); - Assertions.assertEquals(props.sources().size(), 1); + Assertions.assertThat(props.sources().size()).isEqualTo(1); ConfigMapConfigProperties.Source source = props.sources().get(0); - Assertions.assertEquals(source.name(), "source-a"); - Assertions.assertEquals(source.namespace(), "source-namespace-a"); - Assertions.assertEquals(source.labels().size(), 1); - Assertions.assertEquals(source.labels().get("key"), "source-value"); - Assertions.assertEquals(source.explicitPrefix(), "source-prefix"); - Assertions.assertTrue(source.useNameAsPrefix()); - Assertions.assertTrue(source.includeProfileSpecificSources()); + Assertions.assertThat(source.name()).isEqualTo("source-a"); + Assertions.assertThat(source.namespace()).isEqualTo("source-namespace-a"); + Assertions.assertThat(source.labels().size()).isEqualTo(1); + Assertions.assertThat(source.labels().get("key")).isEqualTo("source-value"); + Assertions.assertThat(source.explicitPrefix()).isEqualTo("source-prefix"); + Assertions.assertThat(source.useNameAsPrefix()).isTrue(); + Assertions.assertThat(source.includeProfileSpecificSources()).isTrue(); - Assertions.assertEquals(props.labels().size(), 1); - Assertions.assertEquals(props.labels().get("label-a"), "label-a"); + Assertions.assertThat(props.labels().size()).isEqualTo(1); + Assertions.assertThat(props.labels().get("label-a")).isEqualTo("label-a"); - Assertions.assertFalse(props.enabled()); - Assertions.assertEquals(props.name(), "name"); - Assertions.assertEquals(props.namespace(), "namespace"); - Assertions.assertTrue(props.useNameAsPrefix()); - Assertions.assertTrue(props.includeProfileSpecificSources()); - Assertions.assertTrue(props.failFast()); + Assertions.assertThat(props.enabled()).isFalse(); + Assertions.assertThat(props.name()).isEqualTo("name"); + Assertions.assertThat(props.namespace()).isEqualTo("namespace"); + Assertions.assertThat(props.useNameAsPrefix()).isTrue(); + Assertions.assertThat(props.includeProfileSpecificSources()).isTrue(); + Assertions.assertThat(props.failFast()).isTrue(); RetryProperties retryProperties = props.retry(); - Assertions.assertNotNull(retryProperties); - Assertions.assertEquals(retryProperties.initialInterval(), 1); - Assertions.assertEquals(retryProperties.multiplier(), 1.2); - Assertions.assertEquals(retryProperties.maxInterval(), 3); - Assertions.assertFalse(retryProperties.enabled()); + Assertions.assertThat(retryProperties).isNotNull(); + Assertions.assertThat(retryProperties.initialInterval()).isEqualTo(1); + Assertions.assertThat(retryProperties.multiplier()).isEqualTo(1.2); + Assertions.assertThat(retryProperties.maxInterval()).isEqualTo(3); + Assertions.assertThat(retryProperties.enabled()).isFalse(); }); } diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesTests.java index f4b0a98c..df202c07 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesTests.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.jupiter.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.mock.env.MockEnvironment; @@ -50,10 +50,9 @@ class ConfigMapConfigPropertiesTests { "config-map-a", "spring-k8s", false, false, false, RetryProperties.DEFAULT); List sources = properties.determineSources(new MockEnvironment()); - Assertions.assertEquals(sources.size(), 1, "empty sources must generate a List with a single NormalizedSource"); + Assertions.assertThat(sources.size()).isEqualTo(1); - Assertions.assertSame(((NamedConfigMapNormalizedSource) sources.get(0)).prefix(), ConfigUtils.Prefix.DEFAULT, - "empty sources must generate a List with a single NormalizedSource, where prefix is empty"); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(0)).prefix()).isSameAs(ConfigUtils.Prefix.DEFAULT); } /** @@ -76,11 +75,9 @@ class ConfigMapConfigPropertiesTests { "config-map-a", "spring-k8s", true, false, false, RetryProperties.DEFAULT); List sources = properties.determineSources(new MockEnvironment()); - Assertions.assertEquals(sources.size(), 1, "empty sources must generate a List with a single NormalizedSource"); + Assertions.assertThat(sources.size()).isEqualTo(1); - Assertions.assertSame(((NamedConfigMapNormalizedSource) sources.get(0)).prefix(), ConfigUtils.Prefix.DEFAULT, - "empty sources must generate a List with a single NormalizedSource, where prefix is empty," - + "no matter of 'spring.cloud.kubernetes.config.useNameAsPrefix' value"); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(0)).prefix()).isSameAs(ConfigUtils.Prefix.DEFAULT); } /** @@ -108,10 +105,10 @@ class ConfigMapConfigPropertiesTests { true, "config-map-a", "spring-k8s", true, false, false, RetryProperties.DEFAULT); List sources = properties.determineSources(new MockEnvironment()); - Assertions.assertEquals(sources.size(), 1, "a single NormalizedSource is expected"); + Assertions.assertThat(sources.size()).isEqualTo(1); - Assertions.assertEquals(((NamedConfigMapNormalizedSource) sources.get(0)).prefix().prefixProvider().get(), - "config-map-one"); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(0)).prefix().prefixProvider().get()) + .isEqualTo("config-map-one"); } /** @@ -151,13 +148,13 @@ class ConfigMapConfigPropertiesTests { Map.of(), true, "config-map-a", "spring-k8s", true, false, false, RetryProperties.DEFAULT); List sources = properties.determineSources(new MockEnvironment()); - Assertions.assertEquals(sources.size(), 3, "3 NormalizedSources are expected"); + Assertions.assertThat(sources.size()).isEqualTo(3); - Assertions.assertSame(((NamedConfigMapNormalizedSource) sources.get(0)).prefix(), ConfigUtils.Prefix.DEFAULT); - Assertions.assertEquals(((NamedConfigMapNormalizedSource) sources.get(1)).prefix().prefixProvider().get(), - "config-map-two"); - Assertions.assertEquals(((NamedConfigMapNormalizedSource) sources.get(2)).prefix().prefixProvider().get(), - "config-map-three"); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(0)).prefix()).isSameAs(ConfigUtils.Prefix.DEFAULT); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(1)).prefix().prefixProvider().get()) + .isEqualTo("config-map-two"); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(2)).prefix().prefixProvider().get()) + .isEqualTo("config-map-three"); } /** @@ -201,15 +198,15 @@ class ConfigMapConfigPropertiesTests { RetryProperties.DEFAULT); List sources = properties.determineSources(new MockEnvironment()); - Assertions.assertEquals(sources.size(), 4, "4 NormalizedSources are expected"); + Assertions.assertThat(sources.size()).isEqualTo(4); - Assertions.assertEquals(((NamedConfigMapNormalizedSource) sources.get(0)).prefix().prefixProvider().get(), - "one"); - Assertions.assertEquals(((NamedConfigMapNormalizedSource) sources.get(1)).prefix().prefixProvider().get(), - "two"); - Assertions.assertEquals(((NamedConfigMapNormalizedSource) sources.get(2)).prefix().prefixProvider().get(), - "three"); - Assertions.assertSame(((NamedConfigMapNormalizedSource) sources.get(3)).prefix(), ConfigUtils.Prefix.DEFAULT); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(0)).prefix().prefixProvider().get()) + .isEqualTo("one"); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(1)).prefix().prefixProvider().get()) + .isEqualTo("two"); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(2)).prefix().prefixProvider().get()) + .isEqualTo("three"); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(3)).prefix()).isSameAs(ConfigUtils.Prefix.DEFAULT); } /** @@ -233,9 +230,9 @@ class ConfigMapConfigPropertiesTests { "config-map-a", "spring-k8s", false, true, false, RetryProperties.DEFAULT); List sources = properties.determineSources(new MockEnvironment()); - Assertions.assertEquals(sources.size(), 1, "empty sources must generate a List with a single NormalizedSource"); + Assertions.assertThat(sources.size()).isEqualTo(1); - Assertions.assertTrue(((NamedConfigMapNormalizedSource) sources.get(0)).profileSpecificSources()); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(0)).profileSpecificSources()).isTrue(); } /** @@ -262,9 +259,9 @@ class ConfigMapConfigPropertiesTests { "config-map-a", "spring-k8s", false, false, false, RetryProperties.DEFAULT); List sources = properties.determineSources(new MockEnvironment()); - Assertions.assertEquals(sources.size(), 1, "empty sources must generate a List with a single NormalizedSource"); + Assertions.assertThat(sources.size()).isEqualTo(1); - Assertions.assertFalse(((NamedConfigMapNormalizedSource) sources.get(0)).profileSpecificSources()); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(0)).profileSpecificSources()).isTrue(); } /** @@ -306,11 +303,11 @@ class ConfigMapConfigPropertiesTests { Map.of(), true, "config-map-a", "spring-k8s", false, false, false, RetryProperties.DEFAULT); List sources = properties.determineSources(new MockEnvironment()); - Assertions.assertEquals(sources.size(), 3); + Assertions.assertThat(sources.size()).isEqualTo(3); - Assertions.assertTrue(((NamedConfigMapNormalizedSource) sources.get(0)).profileSpecificSources()); - Assertions.assertFalse(((NamedConfigMapNormalizedSource) sources.get(1)).profileSpecificSources()); - Assertions.assertFalse(((NamedConfigMapNormalizedSource) sources.get(2)).profileSpecificSources()); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(0)).profileSpecificSources()).isTrue(); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(1)).profileSpecificSources()).isFalse(); + Assertions.assertThat(((NamedConfigMapNormalizedSource) sources.get(2)).profileSpecificSources()).isFalse(); } /** @@ -368,26 +365,26 @@ class ConfigMapConfigPropertiesTests { // duplicated. // that's OK, since later in the code we get a LinkedHashSet out of them all, // so they become 5 only. - Assertions.assertEquals(sources.size(), 8, "4 NormalizedSources are expected"); + Assertions.assertThat(sources.size()).isEqualTo(8); LabeledConfigMapNormalizedSource labeled1 = (LabeledConfigMapNormalizedSource) sources.get(1); - Assertions.assertEquals(labeled1.prefix().prefixProvider().get(), "one"); - Assertions.assertFalse(labeled1.profileSpecificSources()); + Assertions.assertThat(labeled1.prefix().prefixProvider().get()).isEqualTo("one"); + Assertions.assertThat(labeled1.profileSpecificSources()).isTrue(); LabeledConfigMapNormalizedSource labeled3 = (LabeledConfigMapNormalizedSource) sources.get(3); - Assertions.assertEquals(labeled3.prefix().prefixProvider().get(), "two"); - Assertions.assertTrue(labeled3.profileSpecificSources()); + Assertions.assertThat(labeled3.prefix().prefixProvider().get()).isEqualTo("two"); + Assertions.assertThat(labeled3.profileSpecificSources()).isTrue(); LabeledConfigMapNormalizedSource labeled5 = (LabeledConfigMapNormalizedSource) sources.get(5); - Assertions.assertEquals(labeled5.prefix().prefixProvider().get(), "three"); - Assertions.assertFalse(labeled5.profileSpecificSources()); + Assertions.assertThat(labeled5.prefix().prefixProvider().get()).isEqualTo("three"); + Assertions.assertThat(labeled5.profileSpecificSources()).isFalse(); LabeledConfigMapNormalizedSource labeled7 = (LabeledConfigMapNormalizedSource) sources.get(7); - Assertions.assertSame(labeled7.prefix(), ConfigUtils.Prefix.DEFAULT); - Assertions.assertFalse(labeled7.profileSpecificSources()); + Assertions.assertThat(labeled7.prefix()).isSameAs(ConfigUtils.Prefix.DEFAULT); + Assertions.assertThat(labeled7.profileSpecificSources()).isFalse(); Set set = new LinkedHashSet<>(sources); - Assertions.assertEquals(5, set.size()); + Assertions.assertThat(set.size()).isEqualTo(5); } } diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SourceDataTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SourceDataTests.java index 0b6cf7fb..4c4e384f 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SourceDataTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SourceDataTests.java @@ -16,7 +16,7 @@ package org.springframework.cloud.kubernetes.commons.config; -import org.junit.jupiter.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -26,7 +26,7 @@ class SourceDataTests { @Test void testEmpty() { - Assertions.assertEquals(SourceData.emptyRecord("name").sourceData().size(), 0); + Assertions.assertThat(SourceData.emptyRecord("name").sourceData()).isEmpty(); } } diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java index eaa87623..0901176e 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java @@ -27,8 +27,8 @@ import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder; import io.kubernetes.client.openapi.models.V1SecretBuilder; import io.kubernetes.client.openapi.models.V1SecretList; import io.kubernetes.client.openapi.models.V1SecretListBuilder; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtilTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtilTests.java index f8d16d96..53b0b995 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtilTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtilTests.java @@ -24,7 +24,7 @@ import io.kubernetes.client.openapi.models.V1ConfigMapBuilder; import io.kubernetes.client.openapi.models.V1ObjectMeta; import io.kubernetes.client.openapi.models.V1Secret; import io.kubernetes.client.openapi.models.V1SecretBuilder; -import org.junit.jupiter.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.springframework.cloud.kubernetes.configuration.watcher.ConfigurationWatcherConfigurationProperties.CONFIG_MAP_LABEL; @@ -37,7 +37,7 @@ class WatcherUtilTests { void isSpringCloudKubernetesConfigFalse() { V1ConfigMap configMap = new V1ConfigMapBuilder().withMetadata(new V1ObjectMeta().labels(Map.of())).build(); boolean present = WatcherUtil.isSpringCloudKubernetes(configMap, CONFIG_MAP_LABEL); - Assertions.assertFalse(present); + Assertions.assertThat(present).isFalse(); } @Test @@ -46,14 +46,14 @@ class WatcherUtilTests { .withMetadata(new V1ObjectMeta().labels(Map.of(CONFIG_MAP_LABEL, "true"))) .build(); boolean present = WatcherUtil.isSpringCloudKubernetes(configMap, CONFIG_MAP_LABEL); - Assertions.assertTrue(present); + Assertions.assertThat(present).isTrue(); } @Test void isSpringCloudKubernetesSecretFalse() { V1Secret secret = new V1SecretBuilder().withMetadata(new V1ObjectMeta().labels(Map.of())).build(); boolean present = WatcherUtil.isSpringCloudKubernetes(secret, SECRET_LABEL); - Assertions.assertFalse(present); + Assertions.assertThat(present).isFalse(); } @Test @@ -61,42 +61,42 @@ class WatcherUtilTests { V1Secret secret = new V1SecretBuilder().withMetadata(new V1ObjectMeta().labels(Map.of(SECRET_LABEL, "true"))) .build(); boolean present = WatcherUtil.isSpringCloudKubernetes(secret, SECRET_LABEL); - Assertions.assertTrue(present); + Assertions.assertThat(present).isTrue(); } @Test void labelsMissing() { V1Secret secret = new V1SecretBuilder().withMetadata(new V1ObjectMeta()).build(); Map res = WatcherUtil.labels(secret); - Assertions.assertEquals(res.size(), 0); + Assertions.assertThat(res).isEmpty(); } @Test void labelsPresent() { V1Secret secret = new V1SecretBuilder().withMetadata(new V1ObjectMeta().labels(Map.of("a", "b"))).build(); Map res = WatcherUtil.labels(secret); - Assertions.assertEquals(res.size(), 1); + Assertions.assertThat(res.size()).isEqualTo(1); } @Test void appsNoMetadata() { V1Secret secret = new V1SecretBuilder().build(); Set apps = WatcherUtil.apps(secret, SECRET_APPS_ANNOTATION); - Assertions.assertEquals(apps.size(), 0); + Assertions.assertThat(apps).isEmpty(); } @Test void appsNoAnnotations() { V1Secret secret = new V1SecretBuilder().withMetadata(new V1ObjectMeta().annotations(Map.of())).build(); Set apps = WatcherUtil.apps(secret, SECRET_APPS_ANNOTATION); - Assertions.assertEquals(apps.size(), 0); + Assertions.assertThat(apps).isEmpty(); } @Test void appsAnnotationNotFound() { V1Secret secret = new V1SecretBuilder().withMetadata(new V1ObjectMeta().annotations(Map.of("a", "b"))).build(); Set apps = WatcherUtil.apps(secret, SECRET_APPS_ANNOTATION); - Assertions.assertEquals(apps.size(), 0); + Assertions.assertThat(apps).isEmpty(); } @Test @@ -105,8 +105,7 @@ class WatcherUtilTests { .withMetadata(new V1ObjectMeta().annotations(Map.of(SECRET_APPS_ANNOTATION, "one-app"))) .build(); Set apps = WatcherUtil.apps(secret, SECRET_APPS_ANNOTATION); - Assertions.assertEquals(apps.size(), 1); - Assertions.assertEquals(apps.iterator().next(), "one-app"); + Assertions.assertThat(apps).containsExactlyInAnyOrder("one-app"); } @Test @@ -115,10 +114,7 @@ class WatcherUtilTests { .withMetadata(new V1ObjectMeta().annotations(Map.of(SECRET_APPS_ANNOTATION, "one, two, three "))) .build(); Set apps = WatcherUtil.apps(secret, SECRET_APPS_ANNOTATION); - Assertions.assertEquals(apps.size(), 3); - Assertions.assertTrue(apps.contains("one")); - Assertions.assertTrue(apps.contains("two")); - Assertions.assertTrue(apps.contains("three")); + Assertions.assertThat(apps).containsExactlyInAnyOrder("one", "two", "three"); } } diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/BlockingDiscoveryHealthPublishedEventTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/BlockingDiscoveryHealthPublishedEventTest.java index 416f480b..5c97c24a 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/BlockingDiscoveryHealthPublishedEventTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/BlockingDiscoveryHealthPublishedEventTest.java @@ -16,8 +16,8 @@ package org.springframework.cloud.kubernetes.discovery; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @@ -41,7 +41,7 @@ class BlockingDiscoveryHealthPublishedEventTest { @Test void test() { - Assertions.assertTrue(HealthEventListenerConfiguration.caught); + Assertions.assertThat(HealthEventListenerConfiguration.caught).isTrue(); } } diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/HealthEventListenerConfiguration.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/HealthEventListenerConfiguration.java index 2a5f2d16..391442e8 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/HealthEventListenerConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/HealthEventListenerConfiguration.java @@ -16,8 +16,7 @@ package org.springframework.cloud.kubernetes.discovery; -import org.junit.jupiter.api.Assertions; - +import org.assertj.core.api.Assertions; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent; import org.springframework.context.ApplicationListener; @@ -43,11 +42,11 @@ class HealthEventListenerConfiguration { @Override public void onApplicationEvent(InstanceRegisteredEvent event) { caught = true; - Assertions.assertInstanceOf(RegisteredEventSource.class, event.getSource()); + Assertions.assertThat(event.getSource()).isInstanceOf(RegisteredEventSource.class); RegisteredEventSource registeredEventSource = (RegisteredEventSource) event.getSource(); - Assertions.assertTrue(registeredEventSource.inside()); - Assertions.assertNull(registeredEventSource.pod()); - Assertions.assertEquals(registeredEventSource.cloudPlatform(), "kubernetes"); + Assertions.assertThat(registeredEventSource.inside()).isTrue(); + Assertions.assertThat(registeredEventSource.pod()).isNull(); + Assertions.assertThat(registeredEventSource.cloudPlatform()).isEqualTo("kubernetes"); } } diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTests.java index 32fc9d28..b205368e 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTests.java @@ -22,8 +22,8 @@ import java.util.Set; import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.client.WireMock; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; @@ -112,12 +112,12 @@ class KubernetesCatalogWatchTests { verify(APPLICATION_EVENT_PUBLISHER).publishEvent(HEARTBEAT_EVENT_ARGUMENT_CAPTOR.capture()); HeartbeatEvent event = HEARTBEAT_EVENT_ARGUMENT_CAPTOR.getValue(); - Assertions.assertEquals(event.getSource().getClass(), KubernetesCatalogWatch.class); + Assertions.assertThat(event.getSource().getClass()).isEqualTo(KubernetesCatalogWatch.class); List state = (List) event.getValue(); - Assertions.assertEquals(state.size(), 1); - Assertions.assertEquals(state.get(0).namespace(), "namespaceA"); + Assertions.assertThat(state.size()).isEqualTo(1); + Assertions.assertThat(state.get(0).namespace()).isEqualTo("namespaceA"); } @@ -161,12 +161,12 @@ class KubernetesCatalogWatchTests { verify(APPLICATION_EVENT_PUBLISHER).publishEvent(HEARTBEAT_EVENT_ARGUMENT_CAPTOR.capture()); HeartbeatEvent eventOne = HEARTBEAT_EVENT_ARGUMENT_CAPTOR.getValue(); - Assertions.assertEquals(eventOne.getSource().getClass(), KubernetesCatalogWatch.class); + Assertions.assertThat(eventOne.getSource().getClass()).isEqualTo(KubernetesCatalogWatch.class); List stateOne = (List) eventOne.getValue(); - Assertions.assertEquals(stateOne.size(), 1); - Assertions.assertEquals(stateOne.get(0).namespace(), "namespaceA"); + Assertions.assertThat(stateOne.size()).isEqualTo(1); + Assertions.assertThat(stateOne.get(0).namespace()).isEqualTo("namespaceA"); // second call stubFor(get("/state") @@ -176,12 +176,12 @@ class KubernetesCatalogWatchTests { verify(APPLICATION_EVENT_PUBLISHER, Mockito.times(2)).publishEvent(HEARTBEAT_EVENT_ARGUMENT_CAPTOR.capture()); HeartbeatEvent eventTwo = HEARTBEAT_EVENT_ARGUMENT_CAPTOR.getValue(); - Assertions.assertEquals(eventTwo.getSource().getClass(), KubernetesCatalogWatch.class); + Assertions.assertThat(eventTwo.getSource().getClass()).isEqualTo(KubernetesCatalogWatch.class); List stateTwo = (List) eventTwo.getValue(); - Assertions.assertEquals(stateTwo.size(), 1); - Assertions.assertEquals(stateTwo.get(0).namespace(), "namespaceB"); + Assertions.assertThat(stateTwo.size()).isEqualTo(1); + Assertions.assertThat(stateTwo.get(0).namespace()).isEqualTo("namespaceB"); } diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ReactiveDiscoveryHealthPublishedEventTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ReactiveDiscoveryHealthPublishedEventTest.java index 72ca89a8..8b9a574c 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ReactiveDiscoveryHealthPublishedEventTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ReactiveDiscoveryHealthPublishedEventTest.java @@ -16,8 +16,8 @@ package org.springframework.cloud.kubernetes.discovery; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.ObjectProvider; @@ -49,8 +49,8 @@ class ReactiveDiscoveryHealthPublishedEventTest { @Test void test() { - Assertions.assertTrue(HealthEventListenerConfiguration.caught); - Assertions.assertNull(discoveryClients.getIfAvailable()); + Assertions.assertThat(HealthEventListenerConfiguration.caught).isTrue(); + Assertions.assertThat(discoveryClients.getIfAvailable()).isNull(); } } diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8PodUtilsTest.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8PodUtilsTest.java index 31404782..0c74f8c6 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8PodUtilsTest.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8PodUtilsTest.java @@ -27,8 +27,8 @@ import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.PodResource; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; @@ -88,7 +88,7 @@ class Fabric8PodUtilsTest { void constructorThrowsIllegalArgumentExceptionWhenKubeClientNull() { // expect an IllegalArgumentException if KubernetesClient argument is // null - Assertions.assertThrows(IllegalArgumentException.class, () -> new Fabric8PodUtils(null)); + Assertions.assertThatThrownBy(() -> new Fabric8PodUtils(null)).isInstanceOf(IllegalArgumentException.class); } @Test @@ -96,8 +96,8 @@ class Fabric8PodUtilsTest { mockHost(null); Fabric8PodUtils util = new Fabric8PodUtils(client); Supplier sup = util.currentPod(); - Assertions.assertNull(sup.get()); - Assertions.assertFalse(util.isInsideKubernetes()); + Assertions.assertThat(sup.get()).isNull(); + Assertions.assertThat(util.isInsideKubernetes()).isFalse(); } @Test @@ -106,8 +106,8 @@ class Fabric8PodUtilsTest { mockHostname(null); Fabric8PodUtils util = new Fabric8PodUtils(client); Supplier sup = util.currentPod(); - Assertions.assertNull(sup.get()); - Assertions.assertFalse(util.isInsideKubernetes()); + Assertions.assertThat(sup.get()).isNull(); + Assertions.assertThat(util.isInsideKubernetes()).isFalse(); } @Test @@ -117,8 +117,8 @@ class Fabric8PodUtilsTest { mockHostname(POD_HOSTNAME); Fabric8PodUtils util = new Fabric8PodUtils(client); Supplier sup = util.currentPod(); - Assertions.assertNull(sup.get()); - Assertions.assertFalse(util.isInsideKubernetes()); + Assertions.assertThat(sup.get()).isNull(); + Assertions.assertThat(util.isInsideKubernetes()).isFalse(); } @Test @@ -129,8 +129,8 @@ class Fabric8PodUtilsTest { mockHostname(POD_HOSTNAME); Fabric8PodUtils util = new Fabric8PodUtils(client); Supplier sup = util.currentPod(); - Assertions.assertNull(sup.get()); - Assertions.assertFalse(util.isInsideKubernetes()); + Assertions.assertThat(sup.get()).isNull(); + Assertions.assertThat(util.isInsideKubernetes()).isFalse(); } @Test @@ -142,8 +142,8 @@ class Fabric8PodUtilsTest { mockPodResult(); Fabric8PodUtils util = new Fabric8PodUtils(client); Supplier sup = util.currentPod(); - Assertions.assertNotNull(sup.get()); - Assertions.assertTrue(util.isInsideKubernetes()); + Assertions.assertThat(sup.get()).isNotNull(); + Assertions.assertThat(util.isInsideKubernetes()).isTrue(); } private void mockHost(String host) { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledSecretContextToSourceDataProviderTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledSecretContextToSourceDataProviderTests.java index 835e831c..037d18fa 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledSecretContextToSourceDataProviderTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledSecretContextToSourceDataProviderTests.java @@ -27,8 +27,8 @@ import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -109,8 +109,8 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals("secret.test-secret.default", sourceData.sourceName()); - Assertions.assertEquals(Map.of("secretName", "secretValue"), sourceData.sourceData()); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.test-secret.default"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("secretName", "secretValue")); } @@ -153,10 +153,10 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "secret.red-secret.red-secret-again.default"); - Assertions.assertEquals(sourceData.sourceData().size(), 2); - Assertions.assertEquals(sourceData.sourceData().get("colorOne"), "really-red"); - Assertions.assertEquals(sourceData.sourceData().get("colorTwo"), "really-red-again"); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.red-secret.red-secret-again.default"); + Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2); + Assertions.assertThat(sourceData.sourceData().get("colorOne")).isEqualTo("really-red"); + Assertions.assertThat(sourceData.sourceData().get("colorTwo")).isEqualTo("really-red-again"); } @@ -182,8 +182,8 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "secret.color.default"); - Assertions.assertEquals(sourceData.sourceData(), Collections.emptyMap()); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color.default"); + Assertions.assertThat(sourceData.sourceData()).isEmpty(); } /** @@ -212,8 +212,8 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals("secret.test-secret.default", sourceData.sourceName()); - Assertions.assertEquals(Map.of("secretName", "secretValue"), sourceData.sourceData()); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.test-secret.default"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("secretName", "secretValue")); } /** @@ -242,8 +242,8 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals("secret.blue-secret.default", sourceData.sourceName()); - Assertions.assertEquals(Map.of("me.what-color", "blue-color"), sourceData.sourceData()); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.blue-secret.default"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("me.what-color", "blue-color")); } /** @@ -282,21 +282,21 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "secret.another-blue-secret.blue-secret.default"); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.another-blue-secret.blue-secret.default"); Map properties = sourceData.sourceData(); - Assertions.assertEquals(2, properties.size()); + Assertions.assertThat(properties.size()).isEqualTo(2); Iterator keys = properties.keySet().iterator(); String firstKey = keys.next(); String secondKey = keys.next(); if (firstKey.contains("first")) { - Assertions.assertEquals(firstKey, "another-blue-secret.blue-secret.first"); + Assertions.assertThat(firstKey).isEqualTo("another-blue-secret.blue-secret.first"); } - Assertions.assertEquals(secondKey, "another-blue-secret.blue-secret.second"); - Assertions.assertEquals(properties.get(firstKey), "blue"); - Assertions.assertEquals(properties.get(secondKey), "blue"); + Assertions.assertThat(secondKey).isEqualTo("another-blue-secret.blue-secret.second"); + Assertions.assertThat(properties.get(firstKey)).isEqualTo("blue"); + Assertions.assertThat(properties.get(secondKey)).isEqualTo("blue"); } /** @@ -332,8 +332,8 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertTrue(sourceData.sourceData().isEmpty()); - Assertions.assertEquals(sourceData.sourceName(), "secret.color.default"); + Assertions.assertThat(sourceData.sourceData()).isEmpty(); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color.default"); } @@ -369,9 +369,9 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceData().size(), 1); - Assertions.assertEquals(sourceData.sourceData().get("one"), "1"); - Assertions.assertEquals(sourceData.sourceName(), "secret.color-secret.default"); + Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1); + Assertions.assertThat(sourceData.sourceData().get("one")).isEqualTo("1"); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color-secret.default"); } @@ -409,10 +409,10 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceData().size(), 2); - Assertions.assertEquals(sourceData.sourceData().get("color-secret.color-secret-k8s.one"), "1"); - Assertions.assertEquals(sourceData.sourceData().get("color-secret.color-secret-k8s.two"), "2"); - Assertions.assertEquals(sourceData.sourceName(), "secret.color-secret.color-secret-k8s.default"); + Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2); + Assertions.assertThat(sourceData.sourceData().get("color-secret.color-secret-k8s.one")).isEqualTo("1"); + Assertions.assertThat(sourceData.sourceData().get("color-secret.color-secret-k8s.two")).isEqualTo("2"); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color-secret.color-secret-k8s.default"); } @@ -478,17 +478,21 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceData().size(), 4); - Assertions.assertEquals( - sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.one"), "1"); - Assertions.assertEquals( - sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.two"), "2"); - Assertions.assertEquals( - sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.four"), "4"); - Assertions.assertEquals( - sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.five"), "5"); + Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(4); + Assertions.assertThat( + sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.one")) + .isEqualTo("1"); + Assertions.assertThat( + sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.two")) + .isEqualTo("2"); + Assertions.assertThat( + sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.four")) + .isEqualTo("4"); + Assertions.assertThat( + sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.five")) + .isEqualTo("5"); - Assertions.assertEquals(sourceData.sourceName(), + Assertions.assertThat(sourceData.sourceName()).isEqualTo( "secret.color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.default"); } @@ -515,9 +519,9 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceData().size(), 1); - Assertions.assertEquals(sourceData.sourceData().get("color"), "blue"); - Assertions.assertEquals(sourceData.sourceName(), "secret.color-secret.default"); + Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1); + Assertions.assertThat(sourceData.sourceData().get("color")).isEqualTo("blue"); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color-secret.default"); } /** @@ -556,9 +560,9 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData redData = new LabeledSecretContextToSourceDataProvider().get(); SourceData redSourceData = redData.apply(redContext); - Assertions.assertEquals(redSourceData.sourceData().size(), 1); - Assertions.assertEquals(redSourceData.sourceData().get("red.one"), "1"); - Assertions.assertTrue(output.getAll().contains("Loaded all secrets in namespace '" + NAMESPACE + "'")); + Assertions.assertThat(redSourceData.sourceData().size()).isEqualTo(1); + Assertions.assertThat(redSourceData.sourceData().get("red.one")).isEqualTo("1"); + Assertions.assertThat(output.getAll()).contains("Loaded all secrets in namespace '" + NAMESPACE + "'"); NormalizedSource greenNormalizedSource = new LabeledSecretNormalizedSource(NAMESPACE, Collections.singletonMap("color", "green"), true, ConfigUtils.Prefix.DELAYED, true); @@ -567,16 +571,16 @@ class LabeledSecretContextToSourceDataProviderTests { Fabric8ContextToSourceData greenData = new LabeledSecretContextToSourceDataProvider().get(); SourceData greenSourceData = greenData.apply(greenContext); - Assertions.assertEquals(greenSourceData.sourceData().size(), 1); - Assertions.assertEquals(greenSourceData.sourceData().get("green.two"), "2"); + Assertions.assertThat(greenSourceData.sourceData().size()).isEqualTo(1); + Assertions.assertThat(greenSourceData.sourceData().get("green.two")).isEqualTo("2"); // meaning there is a single entry with such a log statement String[] out = output.getAll().split("Loaded all secrets in namespace"); - Assertions.assertEquals(out.length, 2); + Assertions.assertThat(out.length).isEqualTo(2); // meaning that the second read was done from the cache out = output.getAll().split("Loaded \\(from cache\\) all secrets in namespace"); - Assertions.assertEquals(out.length, 2); + Assertions.assertThat(out.length).isEqualTo(2); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/NamedConfigMapContextToSourceDataProviderTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/NamedConfigMapContextToSourceDataProviderTests.java index 79f2f134..ab32b5d4 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/NamedConfigMapContextToSourceDataProviderTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/NamedConfigMapContextToSourceDataProviderTests.java @@ -24,8 +24,8 @@ 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.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -98,8 +98,8 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.blue.default"); - Assertions.assertEquals(sourceData.sourceData(), Collections.emptyMap()); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.blue.default"); + Assertions.assertThat(sourceData.sourceData()).isEmpty(); } @@ -127,8 +127,8 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.red.default"); - Assertions.assertEquals(sourceData.sourceData(), COLOR_REALLY_RED); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.red.default"); + Assertions.assertThat(sourceData.sourceData()).isEqualTo(COLOR_REALLY_RED); } @@ -168,10 +168,10 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.red.red-with-profile.default.with-profile"); - Assertions.assertEquals(sourceData.sourceData().size(), 2); - Assertions.assertEquals(sourceData.sourceData().get("color"), "really-red"); - Assertions.assertEquals(sourceData.sourceData().get("taste"), "mango"); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.red.red-with-profile.default.with-profile"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf( + Map.of("color", "really-red", "taste", "mango") + ); } @@ -213,11 +213,10 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.red.red-with-profile.default"); - Assertions.assertEquals(sourceData.sourceData().size(), 2); - Assertions.assertEquals(sourceData.sourceData().get("some.color"), "really-red"); - Assertions.assertEquals(sourceData.sourceData().get("some.taste"), "mango"); - + Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.red.red-with-profile.default"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf( + Map.of("some.color", "really-red", "some.taste", "mango") + ); } /** @@ -264,11 +263,10 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.red.red-with-shape.red-with-taste.default"); - Assertions.assertEquals(sourceData.sourceData().size(), 3); - Assertions.assertEquals(sourceData.sourceData().get("some.color"), "really-red"); - Assertions.assertEquals(sourceData.sourceData().get("some.taste"), "mango"); - Assertions.assertEquals(sourceData.sourceData().get("some.shape"), "round"); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.red.red-with-shape.red-with-taste.default"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf( + Map.of("some.color", "really-red", "some.taste", "mango", "some.shape", "round") + ); } @@ -295,8 +293,8 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.application.default"); - Assertions.assertEquals(sourceData.sourceData(), Collections.singletonMap("color", "red")); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.application.default"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("color", "red")); } /** @@ -325,8 +323,8 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.red.default"); - Assertions.assertEquals(sourceData.sourceData(), Collections.singletonMap("color", "really-red")); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.red.default"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("color", "really-red")); } /** @@ -351,8 +349,8 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.red.default"); - Assertions.assertEquals(sourceData.sourceData(), Collections.singletonMap("key", "value")); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.red.default"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("key", "value")); } /** @@ -381,8 +379,8 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.one.default"); - Assertions.assertEquals(sourceData.sourceData(), Collections.singletonMap("key", "value")); + Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.one.default"); + Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("key", "value")); } /** @@ -417,10 +415,10 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData redData = new NamedConfigMapContextToSourceDataProvider().get(); SourceData redSourceData = redData.apply(redContext); - Assertions.assertEquals(redSourceData.sourceName(), "configmap.red.default"); - Assertions.assertEquals(redSourceData.sourceData().size(), 1); - Assertions.assertEquals(redSourceData.sourceData().get("some.color"), "really-red"); - Assertions.assertTrue(output.getAll().contains("Loaded all config maps in namespace '" + NAMESPACE + "'")); + Assertions.assertThat(redSourceData.sourceName()).isEqualTo("configmap.red.default"); + Assertions.assertThat(redSourceData.sourceData().size()).isEqualTo(1); + Assertions.assertThat(redSourceData.sourceData().get("some.color")).isEqualTo("really-red"); + Assertions.assertThat(output.getAll()).contains("Loaded all config maps in namespace '" + NAMESPACE + "'"); NormalizedSource greenNormalizedSource = new NamedConfigMapNormalizedSource("green", NAMESPACE, true, PREFIX, false); @@ -428,17 +426,17 @@ class NamedConfigMapContextToSourceDataProviderTests { Fabric8ContextToSourceData greenData = new NamedConfigMapContextToSourceDataProvider().get(); SourceData greenSourceData = greenData.apply(greenContext); - Assertions.assertEquals(greenSourceData.sourceName(), "configmap.green.default"); - Assertions.assertEquals(greenSourceData.sourceData().size(), 1); - Assertions.assertEquals(greenSourceData.sourceData().get("some.taste"), "mango"); + Assertions.assertThat(greenSourceData.sourceName()).isEqualTo("configmap.green.default"); + Assertions.assertThat(greenSourceData.sourceData().size()).isEqualTo(1); + Assertions.assertThat(greenSourceData.sourceData().get("some.taste")).isEqualTo("mango"); // meaning there is a single entry with such a log statement String[] out = output.getAll().split("Loaded all config maps in namespace"); - Assertions.assertEquals(out.length, 2); + Assertions.assertThat(out.length).isEqualTo(2); // meaning that the second read was done from the cache out = output.getAll().split("Loaded \\(from cache\\) all config maps in namespace"); - Assertions.assertEquals(out.length, 2); + Assertions.assertThat(out.length).isEqualTo(2); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigRetryEnabled.java index bb6f5d4b..0648e030 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigRetryEnabled.java @@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.ConfigMapListBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; -import org.junit.jupiter.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @@ -92,14 +92,16 @@ abstract class ConfigRetryEnabled { .build()) .once(); - PropertySource propertySource = Assertions.assertDoesNotThrow(() -> psl.locate(new MockEnvironment())); + + PropertySource[] propertySource = new PropertySource[1]; + Assertions.assertThatCode(() -> propertySource[0] = psl.locate(new MockEnvironment())).doesNotThrowAnyException(); // verify locate is called only once verify(verifiablePsl, times(1)).locate(any()); // validate the contents of the property source - assertThat(propertySource.getProperty("some.prop")).isEqualTo("theValue"); - assertThat(propertySource.getProperty("some.number")).isEqualTo("0"); + assertThat(propertySource[0].getProperty("some.prop")).isEqualTo("theValue"); + assertThat(propertySource[0].getProperty("some.number")).isEqualTo("0"); } @Test @@ -122,14 +124,15 @@ abstract class ConfigRetryEnabled { .build()) .once(); - PropertySource propertySource = Assertions.assertDoesNotThrow(() -> psl.locate(new MockEnvironment())); + PropertySource[] propertySource = new PropertySource[1]; + Assertions.assertThatCode(() -> propertySource[0] = psl.locate(new MockEnvironment())).doesNotThrowAnyException(); // verify retried 4 times verify(verifiablePsl, times(4)).locate(any()); // validate the contents of the property source - assertThat(propertySource.getProperty("some.prop")).isEqualTo("theValue"); - assertThat(propertySource.getProperty("some.number")).isEqualTo("0"); + assertThat(propertySource[0].getProperty("some.prop")).isEqualTo("theValue"); + assertThat(propertySource[0].getProperty("some.number")).isEqualTo("0"); } @Test diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapperTests.java b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapperTests.java index 8bc93941..3ec0e571 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapperTests.java +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapperTests.java @@ -26,7 +26,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServiceBuilder; import io.fabric8.kubernetes.api.model.ServicePort; import io.fabric8.kubernetes.api.model.ServicePortBuilder; -import org.junit.jupiter.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -46,9 +46,9 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance instance = new Fabric8ServiceInstanceMapper(properties, KubernetesDiscoveryProperties.DEFAULT) .map(service); - Assertions.assertNotNull(instance); - Assertions.assertEquals("test", instance.getServiceId()); - Assertions.assertEquals("abc", instance.getInstanceId()); + Assertions.assertThat(instance).isNotNull(); + Assertions.assertThat(instance.getServiceId()).isEqualTo("test"); + Assertions.assertThat(instance.getInstanceId()).isEqualTo("abc"); } @Test @@ -62,10 +62,10 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance instance = new Fabric8ServiceInstanceMapper(properties, KubernetesDiscoveryProperties.DEFAULT) .map(service); - Assertions.assertNotNull(instance); - Assertions.assertEquals("test", instance.getServiceId()); - Assertions.assertEquals("abc", instance.getInstanceId()); - Assertions.assertEquals(9000, instance.getPort()); + Assertions.assertThat(instance).isNotNull(); + Assertions.assertThat(instance.getServiceId()).isEqualTo("test"); + Assertions.assertThat(instance.getInstanceId()).isEqualTo("abc"); + Assertions.assertThat(instance.getPort()).isEqualTo(9000); } @Test @@ -79,10 +79,10 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance instance = new Fabric8ServiceInstanceMapper(properties, discoveryProperties) .map(service); - Assertions.assertNotNull(instance); - Assertions.assertEquals("test", instance.getServiceId()); - Assertions.assertEquals("abc", instance.getInstanceId()); - Assertions.assertTrue(instance.isSecure()); + Assertions.assertThat(instance).isNotNull(); + Assertions.assertThat(instance.getServiceId()).isEqualTo("test"); + Assertions.assertThat(instance.getInstanceId()).isEqualTo("abc"); + Assertions.assertThat(instance.isSecure()).isTrue(); } @Test @@ -96,10 +96,10 @@ class Fabric8ServiceInstanceMapperTests { Service service = buildService("test", "test-namespace", "abc", ports, null, null); KubernetesServiceInstance instance = new Fabric8ServiceInstanceMapper(properties, discoveryProperties) .map(service); - Assertions.assertNotNull(instance); - Assertions.assertEquals("test", instance.getServiceId()); - Assertions.assertEquals("abc", instance.getInstanceId()); - Assertions.assertTrue(instance.isSecure()); + Assertions.assertThat(instance).isNotNull(); + Assertions.assertThat(instance.getServiceId()).isEqualTo("test"); + Assertions.assertThat(instance.getInstanceId()).isEqualTo("abc"); + Assertions.assertThat(instance.isSecure()).isTrue(); } @Test @@ -110,11 +110,11 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance instance = new Fabric8ServiceInstanceMapper(properties, KubernetesDiscoveryProperties.DEFAULT) .map(service); - Assertions.assertNotNull(instance); - Assertions.assertEquals("test", instance.getServiceId()); - Assertions.assertEquals("abc", instance.getInstanceId()); - Assertions.assertTrue(instance.isSecure()); - Assertions.assertEquals(4, instance.getMetadata().keySet().size()); + Assertions.assertThat(instance).isNotNull(); + Assertions.assertThat(instance.getServiceId()).isEqualTo("test"); + Assertions.assertThat(instance.getInstanceId()).isEqualTo("abc"); + Assertions.assertThat(instance.isSecure()).isTrue(); + Assertions.assertThat(instance.getMetadata().keySet().size()).isEqualTo(4); } @Test @@ -134,11 +134,11 @@ class Fabric8ServiceInstanceMapperTests { Service service = buildService("test", "test-namespace", "abc", ports, labels, annotations); Map result = new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties) .serviceMetadata(service); - Assertions.assertEquals(result.size(), 4); - Assertions.assertEquals(result.get("k8s_namespace"), "test-namespace"); - Assertions.assertEquals(result.get("type"), "ClusterIP"); - Assertions.assertEquals(result.get("one"), "1"); - Assertions.assertEquals(result.get("two"), "2"); + Assertions.assertThat(result.size()).isEqualTo(4); + Assertions.assertThat(result.get("k8s_namespace")).isEqualTo("test-namespace"); + Assertions.assertThat(result.get("type")).isEqualTo("ClusterIP"); + Assertions.assertThat(result.get("one")).isEqualTo("1"); + Assertions.assertThat(result.get("two")).isEqualTo("2"); } /** @@ -158,9 +158,9 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance result = new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties) .map(service); - Assertions.assertNull(result); - Assertions.assertTrue(output.getOut() - .contains("service : test does not have any ServicePort(s), will not consider it for load balancing")); + Assertions.assertThat(result).isNull(); + Assertions.assertThat(output.getOut()) + .contains("service : test does not have any ServicePort(s), will not consider it for load balancing"); } @@ -183,10 +183,10 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance result = new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties) .map(service); - Assertions.assertNotNull(result); - Assertions.assertTrue(output.getOut() + Assertions.assertThat(result).isNotNull(); + Assertions.assertThat(output.getOut()) .contains( - "single ServicePort found, will use it as-is (without checking 'spring.cloud.kubernetes.loadbalancer.portName')")); + "single ServicePort found, will use it as-is (without checking 'spring.cloud.kubernetes.loadbalancer.portName')"); } @@ -212,10 +212,10 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance result = new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties) .map(service); - Assertions.assertNotNull(result); - Assertions.assertTrue(output.getOut() + Assertions.assertThat(result).isNotNull(); + Assertions.assertThat(output.getOut()) .contains( - "single ServicePort found, will use it as-is (without checking 'spring.cloud.kubernetes.loadbalancer.portName')")); + "single ServicePort found, will use it as-is (without checking 'spring.cloud.kubernetes.loadbalancer.portName')"); } @@ -239,9 +239,9 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance result = new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties) .map(service); - Assertions.assertNotNull(result); - Assertions.assertTrue(output.getOut().contains("'spring.cloud.kubernetes.loadbalancer.portName' is not set")); - Assertions.assertTrue(output.getOut().contains("Will return 'first' port found, which is non-deterministic")); + Assertions.assertThat(result).isNotNull(); + Assertions.assertThat(output.getOut()).contains("'spring.cloud.kubernetes.loadbalancer.portName' is not set"); + Assertions.assertThat(output.getOut()).contains("Will return 'first' port found, which is non-deterministic"); } @@ -264,8 +264,8 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance result = new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties) .map(service); - Assertions.assertNotNull(result); - Assertions.assertTrue(output.getOut().contains("found port name that matches : one")); + Assertions.assertThat(result).isNotNull(); + Assertions.assertThat(output.getOut()).contains("found port name that matches : one"); } @@ -289,10 +289,10 @@ class Fabric8ServiceInstanceMapperTests { KubernetesServiceInstance result = new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties) .map(service); - Assertions.assertNotNull(result); - Assertions.assertTrue(output.getOut().contains("Did not find a port name that is equal to the value three")); - Assertions.assertTrue(output.getOut().contains("Will return 'first' port found, which is non-deterministic")); - Assertions.assertTrue(result.getPort() == 8081 || result.getPort() == 8080); + Assertions.assertThat(result).isNotNull(); + Assertions.assertThat(output.getOut()).contains("Did not find a port name that is equal to the value three"); + Assertions.assertThat(output.getOut()).contains("Will return 'first' port found, which is non-deterministic"); + Assertions.assertThat(result.getPort()).isIn(8081, 8080); } private Service buildService(String name, String namespace, String uid, int port, String portName, diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceListSupplierTests.java b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceListSupplierTests.java index 5e12209d..f752ec80 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceListSupplierTests.java +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceListSupplierTests.java @@ -28,7 +28,7 @@ import io.fabric8.kubernetes.client.dsl.AnyNamespaceOperation; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.ServiceResource; -import org.junit.jupiter.api.Assertions; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -78,7 +78,7 @@ class Fabric8ServiceListSupplierTests { KubernetesServicesListSupplier supplier = new Fabric8ServicesListSupplier(environment, client, mapper, KubernetesDiscoveryProperties.DEFAULT); List instances = supplier.get().blockFirst(); - Assertions.assertEquals(1, instances.size()); + Assertions.assertThat(instances.size()).isEqualTo(1); } @Test @@ -97,7 +97,7 @@ class Fabric8ServiceListSupplierTests { KubernetesServicesListSupplier supplier = new Fabric8ServicesListSupplier(environment, client, mapper, discoveryProperties); List instances = supplier.get().blockFirst(); - Assertions.assertEquals(1, instances.size()); + Assertions.assertThat(instances.size()).isEqualTo(1); } private Service buildService(String name, int port) { diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplierMockClientTests.java b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplierMockClientTests.java index c4d22780..220d6e95 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplierMockClientTests.java +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplierMockClientTests.java @@ -28,8 +28,8 @@ import io.fabric8.kubernetes.api.model.ServiceSpecBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -87,23 +87,23 @@ class Fabric8ServicesListSupplierMockClientTests { new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties), discoveryProperties); List> serviceInstances = supplier.get().collectList().block(); - Assertions.assertEquals(serviceInstances.size(), 1); + Assertions.assertThat(serviceInstances.size()).isEqualTo(1); List serviceInstancesSorted = serviceInstances.get(0) .stream() .sorted(Comparator.comparing(ServiceInstance::getServiceId)) .toList(); - Assertions.assertEquals(serviceInstancesSorted.size(), 2); + Assertions.assertThat(serviceInstancesSorted.size()).isEqualTo(2); - Assertions.assertEquals(serviceInstancesSorted.get(0).getServiceId(), "service-a"); - Assertions.assertEquals(serviceInstancesSorted.get(0).getHost(), "service-a.a.svc.cluster.local"); - Assertions.assertEquals(serviceInstancesSorted.get(0).getPort(), 8887); + Assertions.assertThat(serviceInstancesSorted.get(0).getServiceId()).isEqualTo("service-a"); + Assertions.assertThat(serviceInstancesSorted.get(0).getHost()).isEqualTo("service-a.a.svc.cluster.local"); + Assertions.assertThat(serviceInstancesSorted.get(0).getPort()).isEqualTo(8887); - Assertions.assertEquals(serviceInstancesSorted.get(1).getServiceId(), "service-a"); - Assertions.assertEquals(serviceInstancesSorted.get(1).getHost(), "service-a.c.svc.cluster.local"); - Assertions.assertEquals(serviceInstancesSorted.get(1).getPort(), 8889); + Assertions.assertThat(serviceInstancesSorted.get(1).getServiceId()).isEqualTo("service-a"); + Assertions.assertThat(serviceInstancesSorted.get(1).getHost()).isEqualTo("service-a.c.svc.cluster.local"); + Assertions.assertThat(serviceInstancesSorted.get(1).getPort()).isEqualTo(8889); - Assertions.assertTrue(output.getOut().contains("discovering services in all namespaces")); + Assertions.assertThat(output.getOut()).contains("discovering services in all namespaces"); } @Test @@ -127,19 +127,19 @@ class Fabric8ServicesListSupplierMockClientTests { new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties), discoveryProperties); List> serviceInstances = supplier.get().collectList().block(); - Assertions.assertEquals(serviceInstances.size(), 1); + Assertions.assertThat(serviceInstances.size()).isEqualTo(1); List inner = serviceInstances.get(0); List serviceInstancesSorted = serviceInstances.get(0) .stream() .sorted(Comparator.comparing(ServiceInstance::getServiceId)) .toList(); - Assertions.assertEquals(serviceInstancesSorted.size(), 1); - Assertions.assertEquals(inner.get(0).getServiceId(), "service-c"); - Assertions.assertEquals(inner.get(0).getHost(), "service-c.c.svc.cluster.local"); - Assertions.assertEquals(inner.get(0).getPort(), 8889); + Assertions.assertThat(serviceInstancesSorted.size()).isEqualTo(1); + Assertions.assertThat(inner.get(0).getServiceId()).isEqualTo("service-c"); + Assertions.assertThat(inner.get(0).getHost()).isEqualTo("service-c.c.svc.cluster.local"); + Assertions.assertThat(inner.get(0).getPort()).isEqualTo(8889); - Assertions.assertTrue(output.getOut().contains("discovering services in namespace : c")); + Assertions.assertThat(output.getOut()).contains("discovering services in namespace : c"); } @Test @@ -162,22 +162,22 @@ class Fabric8ServicesListSupplierMockClientTests { new Fabric8ServiceInstanceMapper(loadBalancerProperties, discoveryProperties), discoveryProperties); List> serviceInstances = supplier.get().collectList().block(); - Assertions.assertEquals(serviceInstances.size(), 1); + Assertions.assertThat(serviceInstances.size()).isEqualTo(1); List serviceInstancesSorted = serviceInstances.get(0) .stream() .sorted(Comparator.comparing(ServiceInstance::getPort)) .toList(); - Assertions.assertEquals(serviceInstancesSorted.size(), 2); - Assertions.assertEquals(serviceInstancesSorted.get(0).getServiceId(), "my-service"); - Assertions.assertEquals(serviceInstancesSorted.get(0).getHost(), "my-service.a.svc.cluster.local"); - Assertions.assertEquals(serviceInstancesSorted.get(0).getPort(), 8887); + Assertions.assertThat(serviceInstancesSorted.size()).isEqualTo(2); + Assertions.assertThat(serviceInstancesSorted.get(0).getServiceId()).isEqualTo("my-service"); + Assertions.assertThat(serviceInstancesSorted.get(0).getHost()).isEqualTo("my-service.a.svc.cluster.local"); + Assertions.assertThat(serviceInstancesSorted.get(0).getPort()).isEqualTo(8887); - Assertions.assertEquals(serviceInstancesSorted.get(1).getServiceId(), "my-service"); - Assertions.assertEquals(serviceInstancesSorted.get(1).getHost(), "my-service.b.svc.cluster.local"); - Assertions.assertEquals(serviceInstancesSorted.get(1).getPort(), 8888); + Assertions.assertThat(serviceInstancesSorted.get(1).getServiceId()).isEqualTo("my-service"); + Assertions.assertThat(serviceInstancesSorted.get(1).getHost()).isEqualTo("my-service.b.svc.cluster.local"); + Assertions.assertThat(serviceInstancesSorted.get(1).getPort()).isEqualTo(8888); - Assertions.assertTrue(output.getOut().contains("discovering services in selective namespaces : [a, b]")); + Assertions.assertThat(output.getOut()).contains("discovering services in selective namespaces : [a, b]"); } private void createService(String namespace, String name, int port) { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusKafkaIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusKafkaIT.java index 7361bf5a..d5d4e539 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusKafkaIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusKafkaIT.java @@ -24,8 +24,8 @@ import io.kubernetes.client.openapi.models.V1ConfigMapBuilder; import io.kubernetes.client.openapi.models.V1Deployment; import io.kubernetes.client.openapi.models.V1Ingress; import io.kubernetes.client.openapi.models.V1Service; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -165,7 +165,7 @@ class ConfigurationWatcherBusKafkaIT { return value[0]; }); - Assertions.assertTrue(value[0]); + Assertions.assertThat(value[0]).isTrue(); util.deleteAndWait(NAMESPACE, configMap, null); } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusAmqpIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusAmqpIT.java index 2d9a764f..6989037f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusAmqpIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusAmqpIT.java @@ -24,8 +24,8 @@ import io.kubernetes.client.openapi.models.V1Ingress; import io.kubernetes.client.openapi.models.V1Secret; import io.kubernetes.client.openapi.models.V1SecretBuilder; import io.kubernetes.client.openapi.models.V1Service; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -115,7 +115,7 @@ class ConfigurationWatcherBusAmqpIT { return value[0]; }); - Assertions.assertTrue(value[0]); + Assertions.assertThat(value[0]).isTrue(); util.deleteAndWait(NAMESPACE, null, secret); }