SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into fix-1757

Browse Source
This commit is contained in:
wind57
2025-04-08 11:06:07 +03:00
parent c697df4264 9da15127b2
commit c2647ca6dc
118 changed files with 1909 additions and 2092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -70,7 +70,7 @@
<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
<!-- Dependency Versions -->
<spring-cloud-commons.version>4.1.6-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-config.version>4.1.6-SNAPSHOT</spring-cloud-config.version>
<spring-cloud-config.version>4.1.7-SNAPSHOT</spring-cloud-config.version>
<spring-cloud-bus.version>4.1.4-SNAPSHOT</spring-cloud-bus.version>
<spring-cloud-contract.version>4.1.6-SNAPSHOT</spring-cloud-contract.version>

5
spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.client;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,8 +57,7 @@ class ActuatorDisabledHealthTest {
.jsonPath("components.kubernetes")
.doesNotExist();
Assertions.assertNull(registry.getContributor("kubernetes"),
"reactive kubernetes contributor must NOT be present when 'management.health.kubernetes.enabled=false'");
Assertions.assertThat(registry.getContributor("kubernetes")).isNull();
}
}

4
spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java
View File

@@ -23,8 +23,8 @@ import java.nio.file.Paths;
import io.kubernetes.client.openapi.ApiException;
import io.kubernetes.client.openapi.apis.CoreV1Api;
import io.kubernetes.client.util.Config;
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.MockedStatic;
import org.mockito.Mockito;
@@ -68,7 +68,7 @@ class ActuatorEnabledFailFastExceptionTest {
@Test
void test() throws ApiException {
Health health = healthIndicator.getHealth(true);
Assertions.assertEquals(health.getStatus(), Status.DOWN);
Assertions.assertThat(Status.DOWN).isSameAs(health.getStatus());
Mockito.verify(coreV1Api).readNamespacedPod("host", "my-namespace", null);
}

6
spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.client;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,8 +54,8 @@ class ActuatorEnabledHealthTest {
.jsonPath("components.kubernetes")
.exists();
Assertions.assertNotNull(registry.getContributor("kubernetes"),
"reactive kubernetes contributor must be present when 'management.health.kubernetes.enabled=true'");
Assertions.assertThat(registry.getContributor("kubernetes")).isNotNull();
}
}

4
spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java
View File

@@ -23,8 +23,8 @@ import java.nio.file.Paths;
import io.kubernetes.client.openapi.ApiException;
import io.kubernetes.client.openapi.apis.CoreV1Api;
import io.kubernetes.client.util.Config;
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.MockedStatic;
import org.mockito.Mockito;
@@ -71,7 +71,7 @@ class ActuatorEnabledNoFailFastExceptionTest {
@Test
void test() throws ApiException {
Health health = healthIndicator.getHealth(true);
Assertions.assertEquals(health.getStatus(), Status.UP);
Assertions.assertThat(Status.UP).isSameAs(health.getStatus());
Mockito.verify(coreV1Api).readNamespacedPod("host", "my-namespace", null);
}

82
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigDataLocationResolverTests.java
View File

@@ -20,7 +20,7 @@ import java.util.function.Supplier;
import io.kubernetes.client.openapi.ApiClient;
import io.kubernetes.client.openapi.apis.CoreV1Api;
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;
import org.mockito.Mockito;
@@ -78,15 +78,15 @@ class KubernetesClientConfigDataLocationResolverTests {
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles);
Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class));
Assertions.assertTrue(context.isRegistered(CoreV1Api.class));
Assertions.assertTrue(context.isRegistered(ApiClient.class));
Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue();
Assertions.assertThat(context.isRegistered(CoreV1Api.class)).isTrue();
Assertions.assertThat(context.isRegistered(ApiClient.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();
}
/*
@@ -114,24 +114,24 @@ class KubernetesClientConfigDataLocationResolverTests {
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles);
Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class));
Assertions.assertTrue(context.isRegistered(CoreV1Api.class));
Assertions.assertTrue(context.isRegistered(ApiClient.class));
Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue();
Assertions.assertThat(context.isRegistered(CoreV1Api.class)).isTrue();
Assertions.assertThat(context.isRegistered(ApiClient.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(KubernetesClientConfigMapPropertySourceLocator.class,
configMapPropertySourceLocator.getClass());
Assertions.assertThat(configMapPropertySourceLocator.getClass())
.isEqualTo(KubernetesClientConfigMapPropertySourceLocator.class);
SecretsPropertySourceLocator secretsPropertySourceLocator = context.get(SecretsPropertySourceLocator.class);
Assertions.assertSame(KubernetesClientSecretsPropertySourceLocator.class,
secretsPropertySourceLocator.getClass());
Assertions.assertThat(secretsPropertySourceLocator.getClass())
.isEqualTo(KubernetesClientSecretsPropertySourceLocator.class);
}
@@ -161,25 +161,25 @@ class KubernetesClientConfigDataLocationResolverTests {
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles);
Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class));
Assertions.assertTrue(context.isRegistered(CoreV1Api.class));
Assertions.assertTrue(context.isRegistered(ApiClient.class));
Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue();
Assertions.assertThat(context.isRegistered(CoreV1Api.class)).isTrue();
Assertions.assertThat(context.isRegistered(ApiClient.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(KubernetesClientConfigMapPropertySourceLocator.class,
configMapPropertySourceLocator.getClass());
Assertions.assertThat(configMapPropertySourceLocator.getClass())
.isEqualTo(KubernetesClientConfigMapPropertySourceLocator.class);
SecretsPropertySourceLocator secretsPropertySourceLocator = context.get(SecretsPropertySourceLocator.class);
Assertions.assertSame(KubernetesClientSecretsPropertySourceLocator.class,
secretsPropertySourceLocator.getClass());
Assertions.assertThat(secretsPropertySourceLocator.getClass())
.isEqualTo(KubernetesClientSecretsPropertySourceLocator.class);
Assertions.assertTrue(capturedOutput.getOut()
Assertions.assertThat(capturedOutput.getOut())
.contains("Could not create the Kubernetes ApiClient in a cluster environment, because connection port "
+ "was not provided."));
+ "was not provided.");
}
/*
@@ -211,24 +211,24 @@ class KubernetesClientConfigDataLocationResolverTests {
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT, configDataLocation, profiles);
Assertions.assertTrue(context.isRegistered(KubernetesClientProperties.class));
Assertions.assertTrue(context.isRegistered(CoreV1Api.class));
Assertions.assertTrue(context.isRegistered(ApiClient.class));
Assertions.assertThat(context.isRegistered(KubernetesClientProperties.class)).isTrue();
Assertions.assertThat(context.isRegistered(CoreV1Api.class)).isTrue();
Assertions.assertThat(context.isRegistered(ApiClient.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);
}

73
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java
View File

@@ -31,8 +31,8 @@ import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;
import io.kubernetes.client.openapi.models.V1ConfigMapList;
import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
import io.kubernetes.client.util.ClientBuilder;
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;
@@ -177,12 +177,9 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
"spring.main.cloud-platform=KUBERNETES");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertTrue(map.values()
.iterator()
.next()
.getClass()
.isAssignableFrom(KubernetesClientEventBasedConfigMapChangeDetector.class));
Assertions.assertThat(1).isEqualTo(map.size());
Assertions.assertThat(map.values().iterator().next().getClass())
.isAssignableFrom(KubernetesClientEventBasedConfigMapChangeDetector.class);
}
/**
@@ -201,12 +198,9 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
"spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertTrue(map.values()
.iterator()
.next()
.getClass()
.isAssignableFrom(KubernetesClientEventBasedConfigMapChangeDetector.class));
Assertions.assertThat(1).isEqualTo(map.size());
Assertions.assertThat(map.values().iterator().next().getClass())
.isAssignableFrom(KubernetesClientEventBasedConfigMapChangeDetector.class);
}
/**
@@ -225,7 +219,7 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event",
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=false");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 0);
Assertions.assertThat(map).isEmpty();
}
/**
@@ -244,7 +238,7 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling",
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=false");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 0);
Assertions.assertThat(map).isEmpty();
}
/**
@@ -263,9 +257,9 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
"spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertTrue(
map.values().iterator().next().getClass().isAssignableFrom(PollingConfigMapChangeDetector.class));
Assertions.assertThat(1).isEqualTo(map.size());
Assertions.assertThat(map.values().iterator().next().getClass())
.isAssignableFrom(PollingConfigMapChangeDetector.class);
}
/**
@@ -287,12 +281,10 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
"spring.cloud.kubernetes.reload.mode=event");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertTrue(map.values()
.iterator()
.next()
.getClass()
.isAssignableFrom(KubernetesClientEventBasedSecretsChangeDetector.class));
Assertions.assertThat(1).isEqualTo(map.size());
Assertions.assertThat(map.values().iterator().next().getClass())
.isAssignableFrom(KubernetesClientEventBasedSecretsChangeDetector.class);
}
/**
@@ -314,9 +306,9 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
"spring.cloud.kubernetes.reload.mode=polling");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions
.assertTrue(map.values().iterator().next().getClass().isAssignableFrom(PollingSecretsChangeDetector.class));
Assertions.assertThat(1).isEqualTo(map.size());
Assertions.assertThat(map.values().iterator().next().getClass())
.isAssignableFrom(PollingSecretsChangeDetector.class);
}
/**
@@ -338,13 +330,15 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
"spring.cloud.kubernetes.reload.mode=event");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 2);
Assertions.assertThat(map.size()).isEqualTo(2);
List<ConfigurationChangeDetector> result = map.values()
.stream()
.sorted(Comparator.comparing(x -> x.getClass().getName()))
.toList();
Assertions.assertEquals(result.get(0).getClass(), KubernetesClientEventBasedConfigMapChangeDetector.class);
Assertions.assertEquals(result.get(1).getClass(), KubernetesClientEventBasedSecretsChangeDetector.class);
Assertions.assertThat(result.get(0).getClass())
.isEqualTo(KubernetesClientEventBasedConfigMapChangeDetector.class);
Assertions.assertThat(result.get(1).getClass())
.isEqualTo(KubernetesClientEventBasedSecretsChangeDetector.class);
}
/**
@@ -366,13 +360,13 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
"spring.cloud.kubernetes.reload.mode=polling");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 2);
Assertions.assertThat(map.size()).isEqualTo(2);
List<ConfigurationChangeDetector> 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);
}
/**
@@ -393,7 +387,7 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=false",
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 0);
Assertions.assertThat(map).isEmpty();
}
/**
@@ -414,7 +408,7 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=false",
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 0);
Assertions.assertThat(map).isEmpty();
}
/**
@@ -436,12 +430,13 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertThat(map.size()).isEqualTo(1);
List<ConfigurationChangeDetector> result = map.values()
.stream()
.sorted(Comparator.comparing(x -> x.getClass().getName()))
.toList();
Assertions.assertEquals(result.get(0).getClass(), KubernetesClientEventBasedConfigMapChangeDetector.class);
Assertions.assertThat(result.get(0).getClass())
.isEqualTo(KubernetesClientEventBasedConfigMapChangeDetector.class);
}
/**
@@ -463,12 +458,12 @@ public class KubernetesClientConfigReloadAutoConfigurationTest {
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertThat(map.size()).isEqualTo(1);
List<ConfigurationChangeDetector> 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);
}
// 2. config and secrets property source locators

10
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigUtilsTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.client.config;
import java.time.Duration;
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.cloud.kubernetes.commons.KubernetesNamespaceProvider;
@@ -38,8 +38,8 @@ class KubernetesClientConfigUtilsTests {
Duration.ofMillis(15000), Set.of("non-default"), false, Duration.ofSeconds(2));
Set<String> namespaces = KubernetesClientConfigUtils
.namespaces(new KubernetesNamespaceProvider(new MockEnvironment()), properties, "configmap");
Assertions.assertEquals(1, namespaces.size());
Assertions.assertEquals(namespaces.iterator().next(), "non-default");
Assertions.assertThat(1).isEqualTo(namespaces.size());
Assertions.assertThat("non-default").isEqualTo(namespaces.iterator().next());
}
@Test
@@ -49,8 +49,8 @@ class KubernetesClientConfigUtilsTests {
environment.setProperty("spring.cloud.kubernetes.client.namespace", "some");
KubernetesNamespaceProvider provider = new KubernetesNamespaceProvider(environment);
Set<String> namespaces = KubernetesClientConfigUtils.namespaces(provider, properties, "configmap");
Assertions.assertEquals(1, namespaces.size());
Assertions.assertEquals(namespaces.iterator().next(), "some");
Assertions.assertThat(1).isEqualTo(namespaces.size());
Assertions.assertThat("some").isEqualTo(namespaces.iterator().next());
}
}

107
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/LabeledConfigMapContextToSourceDataProviderTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.cloud.kubernetes.client.config;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -32,8 +31,8 @@ import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;
import io.kubernetes.client.openapi.models.V1ConfigMapList;
import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
import io.kubernetes.client.util.ClientBuilder;
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;
@@ -116,8 +115,8 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals("configmap.test-configmap.default", sourceData.sourceName());
Assertions.assertEquals(Map.of("name", "value"), sourceData.sourceData());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.test-configmap.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("name", "value"));
}
@@ -166,10 +165,10 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.red-configmap.red-configmap-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("configmap.red-configmap.red-configmap-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");
}
@@ -198,8 +197,8 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.color.default");
Assertions.assertEquals(sourceData.sourceData(), Collections.emptyMap());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.color.default");
Assertions.assertThat(sourceData.sourceData()).isEmpty();
}
@@ -231,8 +230,8 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals("configmap.test-configmap.default", sourceData.sourceName());
Assertions.assertEquals(Map.of("name", "value"), sourceData.sourceData());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.test-configmap.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("name", "value"));
}
/**
@@ -263,8 +262,8 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals("configmap.blue-configmap.default", sourceData.sourceName());
Assertions.assertEquals(Map.of("me.what-color", "blue-color"), sourceData.sourceData());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.blue-configmap.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("me.what-color", "blue-color"));
}
/**
@@ -309,21 +308,22 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.another-blue-configmap.blue-configmap.default");
Assertions.assertThat(sourceData.sourceName())
.isEqualTo("configmap.another-blue-configmap.blue-configmap.default");
Map<String, Object> properties = sourceData.sourceData();
Assertions.assertEquals(2, properties.size());
Assertions.assertThat(properties.size()).isEqualTo(2);
Iterator<String> keys = properties.keySet().iterator();
String firstKey = keys.next();
String secondKey = keys.next();
if (firstKey.contains("first")) {
Assertions.assertEquals(firstKey, "another-blue-configmap.blue-configmap.first");
Assertions.assertThat(firstKey).isEqualTo("another-blue-configmap.blue-configmap.first");
}
Assertions.assertEquals(secondKey, "another-blue-configmap.blue-configmap.second");
Assertions.assertEquals(properties.get(firstKey), "blue");
Assertions.assertEquals(properties.get(secondKey), "blue");
Assertions.assertThat(secondKey).isEqualTo("another-blue-configmap.blue-configmap.second");
Assertions.assertThat(properties.get(firstKey)).isEqualTo("blue");
Assertions.assertThat(properties.get(secondKey)).isEqualTo("blue");
}
/**
@@ -361,8 +361,8 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertTrue(sourceData.sourceData().isEmpty());
Assertions.assertEquals(sourceData.sourceName(), "configmap.color.default");
Assertions.assertThat(sourceData.sourceData()).isEmpty();
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.color.default");
}
@@ -400,9 +400,9 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceData().size(), 1);
Assertions.assertEquals(sourceData.sourceData().get("one"), "1");
Assertions.assertEquals(sourceData.sourceName(), "configmap.color-configmap.default");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(sourceData.sourceData().get("one")).isEqualTo("1");
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.color-configmap.default");
}
@@ -445,10 +445,11 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceData().size(), 2);
Assertions.assertEquals(sourceData.sourceData().get("color-configmap.color-configmap-k8s.one"), "1");
Assertions.assertEquals(sourceData.sourceData().get("color-configmap.color-configmap-k8s.two"), "2");
Assertions.assertEquals(sourceData.sourceName(), "configmap.color-configmap.color-configmap-k8s.default");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
Assertions.assertThat(sourceData.sourceData().get("color-configmap.color-configmap-k8s.one")).isEqualTo("1");
Assertions.assertThat(sourceData.sourceData().get("color-configmap.color-configmap-k8s.two")).isEqualTo("2");
Assertions.assertThat(sourceData.sourceName())
.isEqualTo("configmap.color-configmap.color-configmap-k8s.default");
}
@@ -522,18 +523,26 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceData().size(), 4);
Assertions.assertEquals(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.one"), "1");
Assertions.assertEquals(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.two"), "2");
Assertions.assertEquals(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.four"), "4");
Assertions.assertEquals(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.five"), "5");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(4);
Assertions
.assertThat(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.one"))
.isEqualTo("1");
Assertions
.assertThat(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.two"))
.isEqualTo("2");
Assertions
.assertThat(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.four"))
.isEqualTo("4");
Assertions
.assertThat(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.five"))
.isEqualTo("5");
Assertions.assertEquals(sourceData.sourceName(),
"configmap.color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.default");
Assertions.assertThat(sourceData.sourceName())
.isEqualTo("configmap.color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.default");
}
@@ -576,10 +585,10 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData redData = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData redSourceData = redData.apply(redContext);
Assertions.assertEquals(redSourceData.sourceData().size(), 1);
Assertions.assertEquals(redSourceData.sourceData().get("color"), "red");
Assertions.assertEquals(redSourceData.sourceName(), "configmap.red-configmap.default");
Assertions.assertTrue(output.getAll().contains("Loaded all config maps in namespace '" + NAMESPACE + "'"));
Assertions.assertThat(redSourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(redSourceData.sourceData().get("color")).isEqualTo("red");
Assertions.assertThat(redSourceData.sourceName()).isEqualTo("configmap.red-configmap.default");
Assertions.assertThat(output.getAll()).contains("Loaded all config maps in namespace '" + NAMESPACE + "'");
NormalizedSource greenSource = new LabeledConfigMapNormalizedSource(NAMESPACE, Map.of("color", "green"), false,
ConfigUtils.Prefix.DEFAULT, false);
@@ -588,17 +597,17 @@ class LabeledConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData greenData = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData greenSourceData = greenData.apply(greenContext);
Assertions.assertEquals(greenSourceData.sourceData().size(), 1);
Assertions.assertEquals(greenSourceData.sourceData().get("color"), "green");
Assertions.assertEquals(greenSourceData.sourceName(), "configmap.green-configmap.default");
Assertions.assertThat(greenSourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(greenSourceData.sourceData().get("color")).isEqualTo("green");
Assertions.assertThat(greenSourceData.sourceName()).isEqualTo("configmap.green-configmap.default");
// 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);
}
private void stubCall(V1ConfigMapList list) {

110
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/LabeledSecretContextToSourceDataProviderTests.java
View File

@@ -33,8 +33,8 @@ import io.kubernetes.client.openapi.models.V1Secret;
import io.kubernetes.client.openapi.models.V1SecretBuilder;
import io.kubernetes.client.openapi.models.V1SecretList;
import io.kubernetes.client.util.ClientBuilder;
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;
@@ -114,8 +114,8 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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();
}
@@ -142,8 +142,8 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.test-secret.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("color", "really-red"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.test-secret.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("color", "really-red"));
}
@@ -174,10 +174,10 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.color-one.color-two.default");
Assertions.assertEquals(sourceData.sourceData().size(), 2);
Assertions.assertEquals(sourceData.sourceData().get("colorOne"), "really-red-one");
Assertions.assertEquals(sourceData.sourceData().get("colorTwo"), "really-red-two");
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color-one.color-two.default");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
Assertions.assertThat(sourceData.sourceData().get("colorOne")).isEqualTo("really-red-one");
Assertions.assertThat(sourceData.sourceData().get("colorTwo")).isEqualTo("really-red-two");
}
@@ -199,8 +199,8 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.test-secret.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("color", "really-red"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.test-secret.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("color", "really-red"));
}
/**
@@ -233,8 +233,8 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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()).isEqualTo(Map.of("me.what-color", "blue-color"));
}
/**
@@ -279,25 +279,25 @@ class LabeledSecretContextToSourceDataProviderTests {
SourceData sourceData = data.apply(context);
// maps don't have a defined order, so assert components separately
Assertions.assertEquals(46, sourceData.sourceName().length());
Assertions.assertTrue(sourceData.sourceName().contains("secret"));
Assertions.assertTrue(sourceData.sourceName().contains("blue-secret"));
Assertions.assertTrue(sourceData.sourceName().contains("another-blue-secret"));
Assertions.assertTrue(sourceData.sourceName().contains("default"));
Assertions.assertThat(sourceData.sourceName().length()).isEqualTo(46);
Assertions.assertThat(sourceData.sourceName()).contains("secret");
Assertions.assertThat(sourceData.sourceName()).contains("blue-secret");
Assertions.assertThat(sourceData.sourceName()).contains("another-blue-secret");
Assertions.assertThat(sourceData.sourceName()).contains("default");
Map<String, Object> properties = sourceData.sourceData();
Assertions.assertEquals(2, properties.size());
Assertions.assertThat(properties.size()).isEqualTo(2);
Iterator<String> 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");
}
/**
@@ -337,9 +337,9 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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");
}
@@ -382,10 +382,10 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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");
}
@@ -459,18 +459,22 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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(),
"secret.color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.default");
Assertions.assertThat(sourceData.sourceName())
.isEqualTo("secret.color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.default");
}
@@ -500,9 +504,9 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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");
}
/**
@@ -544,10 +548,10 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData redData = new LabeledSecretContextToSourceDataProvider().get();
SourceData redSourceData = redData.apply(redContext);
Assertions.assertEquals(redSourceData.sourceData().size(), 1);
Assertions.assertEquals(redSourceData.sourceData().get("color"), "red");
Assertions.assertEquals(redSourceData.sourceName(), "secret.red.default");
Assertions.assertTrue(output.getAll().contains("Loaded all secrets in namespace '" + NAMESPACE + "'"));
Assertions.assertThat(redSourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(redSourceData.sourceData().get("color")).isEqualTo("red");
Assertions.assertThat(redSourceData.sourceName()).isEqualTo("secret.red.default");
Assertions.assertThat(output.getOut()).contains("Loaded all secrets in namespace '" + NAMESPACE + "'");
NormalizedSource greenSource = new LabeledSecretNormalizedSource(NAMESPACE, Map.of("color", "green"), false,
ConfigUtils.Prefix.DEFAULT, false);
@@ -556,17 +560,17 @@ class LabeledSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData greenData = new LabeledSecretContextToSourceDataProvider().get();
SourceData greenSourceData = greenData.apply(greenContext);
Assertions.assertEquals(greenSourceData.sourceData().size(), 1);
Assertions.assertEquals(greenSourceData.sourceData().get("color"), "green");
Assertions.assertEquals(greenSourceData.sourceName(), "secret.green.default");
Assertions.assertThat(greenSourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(greenSourceData.sourceData().get("color")).isEqualTo("green");
Assertions.assertThat(greenSourceData.sourceName()).isEqualTo("secret.green.default");
// 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);
}
private void stubCall(V1SecretList list) {

64
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedConfigMapContextToSourceDataProviderTests.java
View File

@@ -30,8 +30,8 @@ import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;
import io.kubernetes.client.openapi.models.V1ConfigMapList;
import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
import io.kubernetes.client.util.ClientBuilder;
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 NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.blue.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.blue.default");
Assertions.assertThat(sourceData.sourceData()).isEmpty();
}
@@ -139,8 +139,8 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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);
}
@@ -178,9 +178,9 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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(), 1);
Assertions.assertEquals(sourceData.sourceData().get("taste"), "mango");
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.red.red-with-profile.default.with-profile");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(sourceData.sourceData().get("taste")).isEqualTo("mango");
}
@@ -220,10 +220,10 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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().size()).isEqualTo(2);
Assertions.assertThat(sourceData.sourceData().get("some.color")).isEqualTo("really-red");
Assertions.assertThat(sourceData.sourceData().get("some.taste")).isEqualTo("mango");
}
@@ -275,11 +275,11 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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().size()).isEqualTo(3);
Assertions.assertThat(sourceData.sourceData().get("some.color")).isEqualTo("really-red");
Assertions.assertThat(sourceData.sourceData().get("some.taste")).isEqualTo("mango");
Assertions.assertThat(sourceData.sourceData().get("some.shape")).isEqualTo("round");
}
@@ -309,8 +309,8 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.application.default");
Assertions.assertEquals(sourceData.sourceData(), Collections.singletonMap("some.color", "red"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.application.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Collections.singletonMap("some.color", "red"));
}
/**
@@ -340,8 +340,8 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData 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);
}
/**
@@ -367,8 +367,8 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.red.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("key", "value"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.red.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("key", "value"));
}
/**
@@ -399,8 +399,8 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.one.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("key", "value"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.one.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("key", "value"));
}
/**
@@ -437,9 +437,9 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData redData = new NamedConfigMapContextToSourceDataProvider().get();
SourceData redSourceData = redData.apply(redContext);
Assertions.assertEquals(redSourceData.sourceName(), "configmap.red.default");
Assertions.assertEquals(redSourceData.sourceData(), Map.of("color", "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()).isEqualTo(Map.of("color", "red"));
Assertions.assertThat(output.getOut()).contains("Loaded all config maps in namespace '" + NAMESPACE + "'");
NormalizedSource greenSource = new NamedConfigMapNormalizedSource("green", NAMESPACE, true, true);
KubernetesClientConfigContext greenContext = new KubernetesClientConfigContext(api, greenSource, NAMESPACE,
@@ -447,16 +447,16 @@ class NamedConfigMapContextToSourceDataProviderTests {
KubernetesClientContextToSourceData greenData = new NamedConfigMapContextToSourceDataProvider().get();
SourceData greenSourceData = greenData.apply(greenContext);
Assertions.assertEquals(greenSourceData.sourceName(), "configmap.green.default");
Assertions.assertEquals(greenSourceData.sourceData(), Map.of("color", "green"));
Assertions.assertThat(greenSourceData.sourceName()).isEqualTo("configmap.green.default");
Assertions.assertThat(greenSourceData.sourceData()).isEqualTo(Map.of("color", "green"));
// 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);
}

63
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedSecretContextToSourceDataProviderTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.cloud.kubernetes.client.config;
import java.util.Collections;
import java.util.Map;
import com.github.tomakehurst.wiremock.WireMockServer;
@@ -31,8 +30,8 @@ import io.kubernetes.client.openapi.models.V1SecretBuilder;
import io.kubernetes.client.openapi.models.V1SecretList;
import io.kubernetes.client.openapi.models.V1SecretListBuilder;
import io.kubernetes.client.util.ClientBuilder;
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;
@@ -99,8 +98,8 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("color", "really-red"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.red.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("color", "really-red"));
}
@@ -139,9 +138,9 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.default");
Assertions.assertEquals(sourceData.sourceData().size(), 1);
Assertions.assertEquals(sourceData.sourceData().get("color"), "really-red");
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.red.default");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(sourceData.sourceData().get("color")).isEqualTo("really-red");
}
@@ -168,8 +167,8 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.blue.default");
Assertions.assertEquals(sourceData.sourceData(), Collections.emptyMap());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.blue.default");
Assertions.assertThat(sourceData.sourceData()).isEmpty();
}
/**
@@ -199,8 +198,8 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("color", "really-red"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.red.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("color", "really-red"));
}
/**
@@ -235,9 +234,9 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.red-with-profile.default.with-profile");
Assertions.assertEquals(sourceData.sourceData().size(), 1);
Assertions.assertEquals(sourceData.sourceData().get("taste"), "mango");
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.red.red-with-profile.default.with-profile");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(sourceData.sourceData().get("taste")).isEqualTo("mango");
}
@@ -273,10 +272,10 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.red-with-taste.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("secret.red.red-with-taste.default");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
Assertions.assertThat(sourceData.sourceData().get("some.color")).isEqualTo("really-red");
Assertions.assertThat(sourceData.sourceData().get("some.taste")).isEqualTo("mango");
}
@@ -317,12 +316,12 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.red-with-shape.red-with-taste.default");
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.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.sourceData().size()).isEqualTo(3);
Assertions.assertThat(sourceData.sourceData().get("some.color")).isEqualTo("really-red");
Assertions.assertThat(sourceData.sourceData().get("some.taste")).isEqualTo("mango");
Assertions.assertThat(sourceData.sourceData().get("some.shape")).isEqualTo("round");
}
@@ -349,8 +348,8 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.single-yaml.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("key", "value"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.single-yaml.default");
Assertions.assertThat(sourceData.sourceData()).isEqualTo(Map.of("key", "value"));
}
/**
@@ -387,9 +386,9 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData redData = new NamedSecretContextToSourceDataProvider().get();
SourceData redSourceData = redData.apply(redContext);
Assertions.assertEquals(redSourceData.sourceName(), "secret.red.default");
Assertions.assertEquals(redSourceData.sourceData(), Map.of("color", "red"));
Assertions.assertTrue(output.getAll().contains("Loaded all secrets in namespace '" + NAMESPACE + "'"));
Assertions.assertThat(redSourceData.sourceName()).isEqualTo("secret.red.default");
Assertions.assertThat(redSourceData.sourceData()).isEqualTo(Map.of("color", "red"));
Assertions.assertThat(output.getAll()).contains("Loaded all secrets in namespace '" + NAMESPACE + "'");
NormalizedSource greenSource = new NamedSecretNormalizedSource("green", NAMESPACE, true, true);
KubernetesClientConfigContext greenContext = new KubernetesClientConfigContext(api, greenSource, NAMESPACE,
@@ -397,16 +396,16 @@ class NamedSecretContextToSourceDataProviderTests {
KubernetesClientContextToSourceData greenData = new NamedSecretContextToSourceDataProvider().get();
SourceData greenSourceData = greenData.apply(greenContext);
Assertions.assertEquals(greenSourceData.sourceName(), "secret.green.default");
Assertions.assertEquals(greenSourceData.sourceData(), Map.of("color", "green"));
Assertions.assertThat(greenSourceData.sourceName()).isEqualTo("secret.green.default");
Assertions.assertThat(greenSourceData.sourceData()).isEqualTo(Map.of("color", "green"));
// 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);
}

4
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigFailFastDisabled.java
View File

@@ -21,9 +21,9 @@ import com.github.tomakehurst.wiremock.client.WireMock;
import io.kubernetes.client.openapi.JSON;
import io.kubernetes.client.openapi.models.V1ConfigMapList;
import io.kubernetes.client.util.ClientBuilder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterAll;
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.mockito.MockedStatic;
@@ -91,7 +91,7 @@ abstract class ConfigFailFastDisabled {
propertySourceLocator = spy(propertySourceLocator);
stubFor(get(API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
Assertions.assertDoesNotThrow(() -> propertySourceLocator.locate(new MockEnvironment()));
Assertions.assertThatCode(() -> propertySourceLocator.locate(new MockEnvironment())).doesNotThrowAnyException();
// verify locate is called only once
verify(propertySourceLocator, times(1)).locate(any());

20
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigRetryEnabled.java
View File

@@ -26,9 +26,9 @@ import io.kubernetes.client.openapi.models.V1ConfigMap;
import io.kubernetes.client.openapi.models.V1ConfigMapList;
import io.kubernetes.client.openapi.models.V1ObjectMeta;
import io.kubernetes.client.util.ClientBuilder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterAll;
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.mockito.MockedStatic;
@@ -110,15 +110,16 @@ abstract class ConfigRetryEnabled {
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList))));
PropertySource<?> propertySource = Assertions
.assertDoesNotThrow(() -> propertySourceLocator.locate(new MockEnvironment()));
PropertySource<?>[] propertySource = new PropertySource<?>[1];
Assertions.assertThatCode(() -> propertySource[0] = propertySourceLocator.locate(new MockEnvironment()))
.doesNotThrowAnyException();
// verify locate is called only once
WireMock.verify(1, getRequestedFor(urlEqualTo(API)));
// 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
@@ -152,15 +153,16 @@ abstract class ConfigRetryEnabled {
.whenScenarioStateIs("Failed thrice")
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList))));
PropertySource<?> propertySource = Assertions
.assertDoesNotThrow(() -> propertySourceLocator.locate(new MockEnvironment()));
PropertySource<?>[] propertySource = new PropertySource<?>[1];
Assertions.assertThatCode(() -> propertySource[0] = propertySourceLocator.locate(new MockEnvironment()))
.doesNotThrowAnyException();
// verify the request was retried 4 times, 5 total request
WireMock.verify(5, getRequestedFor(urlEqualTo(API)));
// 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

18
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetectorTests.java
View File

@@ -37,9 +37,9 @@ import io.kubernetes.client.openapi.models.V1SecretList;
import io.kubernetes.client.util.ClientBuilder;
import io.kubernetes.client.util.Watch;
import okhttp3.OkHttpClient;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -186,7 +186,7 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests {
Map<String, byte[]> right = null;
boolean result = KubernetesClientEventBasedSecretsChangeDetector.equals(left, right);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -200,7 +200,7 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests {
Map<String, byte[]> right = null;
boolean result = KubernetesClientEventBasedSecretsChangeDetector.equals(left, right);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -214,7 +214,7 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests {
Map<String, byte[]> right = null;
boolean result = KubernetesClientEventBasedSecretsChangeDetector.equals(left, right);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -228,7 +228,7 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests {
Map<String, byte[]> right = Map.of();
boolean result = KubernetesClientEventBasedSecretsChangeDetector.equals(left, right);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -242,7 +242,7 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests {
Map<String, byte[]> right = Map.of();
boolean result = KubernetesClientEventBasedSecretsChangeDetector.equals(left, right);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -256,7 +256,7 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests {
Map<String, byte[]> right = Map.of("1", "b".getBytes());
boolean result = KubernetesClientEventBasedSecretsChangeDetector.equals(left, right);
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
/**
@@ -270,7 +270,7 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests {
Map<String, byte[]> right = Map.of("1", "b".getBytes());
boolean result = KubernetesClientEventBasedSecretsChangeDetector.equals(left, right);
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
/**
@@ -284,7 +284,7 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests {
Map<String, byte[]> right = Map.of("1", "b".getBytes(), "2", "aa".getBytes());
boolean result = KubernetesClientEventBasedSecretsChangeDetector.equals(left, right);
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
}

6
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastDisabled.java → spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastDisabledTests.java
View File

@@ -21,9 +21,9 @@ import com.github.tomakehurst.wiremock.client.WireMock;
import io.kubernetes.client.openapi.JSON;
import io.kubernetes.client.openapi.models.V1SecretList;
import io.kubernetes.client.util.ClientBuilder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterAll;
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.mockito.MockedStatic;
@@ -52,7 +52,7 @@ import static org.mockito.Mockito.verify;
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true",
"spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" },
classes = SecretsRetryApplication.class)
class SecretsFailFastDisabled {
class SecretsFailFastDisabledTests {
private static final String API = "/api/v1/namespaces/default/secrets";
@@ -97,7 +97,7 @@ class SecretsFailFastDisabled {
KubernetesClientSecretsPropertySourceLocator propertySourceLocator = spy(psl);
stubFor(get(API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
Assertions.assertDoesNotThrow(() -> propertySourceLocator.locate(new MockEnvironment()));
Assertions.assertThatCode(() -> propertySourceLocator.locate(new MockEnvironment())).doesNotThrowAnyException();
// verify locate is called only once
verify(propertySourceLocator, times(1)).locate(any());

22
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryEnabled.java → spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryEnabledTests.java
View File

@@ -26,8 +26,8 @@ import io.kubernetes.client.openapi.models.V1ObjectMeta;
import io.kubernetes.client.openapi.models.V1Secret;
import io.kubernetes.client.openapi.models.V1SecretList;
import io.kubernetes.client.util.ClientBuilder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -62,7 +62,7 @@ import static org.mockito.Mockito.spy;
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true",
"spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" },
classes = SecretsRetryApplication.class)
class SecretsRetryEnabled {
class SecretsRetryEnabledTests {
private static final String API = "/api/v1/namespaces/default/secrets";
@@ -117,15 +117,16 @@ class SecretsRetryEnabled {
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList))));
PropertySource<?> propertySource = Assertions
.assertDoesNotThrow(() -> propertySourceLocator.locate(new MockEnvironment()));
final PropertySource<?>[] propertySource = new PropertySource<?>[1];
Assertions.assertThatCode(() -> propertySource[0] = propertySourceLocator.locate(new MockEnvironment()))
.doesNotThrowAnyException();
// verify locate is called only once
WireMock.verify(1, getRequestedFor(urlEqualTo(API)));
// validate the contents of the property source
assertThat(propertySource.getProperty("some.sensitive.prop")).isEqualTo("theSensitiveValue");
assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1");
assertThat(propertySource[0].getProperty("some.sensitive.prop")).isEqualTo("theSensitiveValue");
assertThat(propertySource[0].getProperty("some.sensitive.number")).isEqualTo("1");
}
@Test
@@ -159,15 +160,16 @@ class SecretsRetryEnabled {
.whenScenarioStateIs("Failed thrice")
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList))));
PropertySource<?> propertySource = Assertions
.assertDoesNotThrow(() -> propertySourceLocator.locate(new MockEnvironment()));
final PropertySource<?>[] propertySource = new PropertySource<?>[1];
Assertions.assertThatNoException()
.isThrownBy(() -> propertySource[0] = propertySourceLocator.locate(new MockEnvironment()));
// verify retried 4 times
WireMock.verify(4, getRequestedFor(urlEqualTo(API)));
// validate the contents of the property source
assertThat(propertySource.getProperty("some.sensitive.prop")).isEqualTo("theSensitiveValue");
assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1");
assertThat(propertySource[0].getProperty("some.sensitive.prop")).isEqualTo("theSensitiveValue");
assertThat(propertySource[0].getProperty("some.sensitive.number")).isEqualTo("1");
}
@Test

8
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/ConditionalOnSelectiveNamespacesDisabledTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.client.discovery;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -38,7 +38,7 @@ public class ConditionalOnSelectiveNamespacesDisabledTests {
MockEnvironment environment = new MockEnvironment();
Mockito.when(CONDITION_CONTEXT.getEnvironment()).thenReturn(environment);
boolean result = TO_TEST.matches(CONDITION_CONTEXT, null);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
@Test
@@ -47,7 +47,7 @@ public class ConditionalOnSelectiveNamespacesDisabledTests {
environment.setProperty("spring.cloud.kubernetes.discovery.namespaces", "");
Mockito.when(CONDITION_CONTEXT.getEnvironment()).thenReturn(environment);
boolean result = TO_TEST.matches(CONDITION_CONTEXT, null);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
@Test
@@ -56,7 +56,7 @@ public class ConditionalOnSelectiveNamespacesDisabledTests {
environment.setProperty("spring.cloud.kubernetes.discovery.namespaces", "default");
Mockito.when(CONDITION_CONTEXT.getEnvironment()).thenReturn(environment);
boolean result = TO_TEST.matches(CONDITION_CONTEXT, null);
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
}

8
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/ConditionalOnSelectiveNamespacesEnabledTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.client.discovery;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ class ConditionalOnSelectiveNamespacesEnabledTests {
MockEnvironment environment = new MockEnvironment();
Mockito.when(CONDITION_CONTEXT.getEnvironment()).thenReturn(environment);
boolean result = TO_TEST.matches(CONDITION_CONTEXT, null);
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
@Test
@@ -46,7 +46,7 @@ class ConditionalOnSelectiveNamespacesEnabledTests {
environment.setProperty("spring.cloud.kubernetes.discovery.namespaces", "");
Mockito.when(CONDITION_CONTEXT.getEnvironment()).thenReturn(environment);
boolean result = TO_TEST.matches(CONDITION_CONTEXT, null);
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
@Test
@@ -55,7 +55,7 @@ class ConditionalOnSelectiveNamespacesEnabledTests {
environment.setProperty("spring.cloud.kubernetes.discovery.namespaces", "default");
Mockito.when(CONDITION_CONTEXT.getEnvironment()).thenReturn(environment);
boolean result = TO_TEST.matches(CONDITION_CONTEXT, null);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
}

30
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/K8sInstanceIdHostPodNameSupplierTests.java
View File

@@ -24,7 +24,7 @@ import io.kubernetes.client.openapi.models.V1ObjectReferenceBuilder;
import io.kubernetes.client.openapi.models.V1Service;
import io.kubernetes.client.openapi.models.V1ServiceBuilder;
import io.kubernetes.client.openapi.models.V1ServiceSpecBuilder;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.kubernetes.commons.discovery.InstanceIdHostPodName;
@@ -43,8 +43,8 @@ class K8sInstanceIdHostPodNameSupplierTests {
K8sInstanceIdHostPodNameSupplier supplier = K8sInstanceIdHostPodNameSupplier.externalName(service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.instanceId(), "123");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.instanceId()).isEqualTo("123");
}
@Test
@@ -60,8 +60,8 @@ class K8sInstanceIdHostPodNameSupplierTests {
service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.instanceId(), "456");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.instanceId()).isEqualTo("456");
}
@Test
@@ -74,8 +74,8 @@ class K8sInstanceIdHostPodNameSupplierTests {
K8sInstanceIdHostPodNameSupplier supplier = K8sInstanceIdHostPodNameSupplier.externalName(service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.host(), "external-name");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.host()).isEqualTo("external-name");
}
@Test
@@ -90,8 +90,8 @@ class K8sInstanceIdHostPodNameSupplierTests {
service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.host(), "127.0.0.1");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.host()).isEqualTo("127.0.0.1");
}
@Test
@@ -102,8 +102,8 @@ class K8sInstanceIdHostPodNameSupplierTests {
K8sInstanceIdHostPodNameSupplier supplier = K8sInstanceIdHostPodNameSupplier.externalName(service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertNull(result.podName());
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.podName()).isNull();
}
@Test
@@ -120,8 +120,8 @@ class K8sInstanceIdHostPodNameSupplierTests {
service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertNull(result.podName());
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.podName()).isNull();
}
@Test
@@ -138,8 +138,8 @@ class K8sInstanceIdHostPodNameSupplierTests {
service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.podName(), "my-pod");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.podName()).isEqualTo("my-pod");
}
}

14
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/K8sPodLabelsAndAnnotationsSupplierTests.java
View File

@@ -21,8 +21,8 @@ import java.util.Map;
import io.kubernetes.client.openapi.apis.CoreV1Api;
import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
import io.kubernetes.client.openapi.models.V1PodBuilder;
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.Mockito;
@@ -52,9 +52,9 @@ class K8sPodLabelsAndAnnotationsSupplierTests {
PodLabelsAndAnnotations result = K8sPodLabelsAndAnnotationsSupplier.nonExternalName(coreV1Api, NAMESPACE)
.apply(POD_NAME);
Assertions.assertNotNull(result);
Assertions.assertTrue(result.labels().isEmpty());
Assertions.assertTrue(result.annotations().isEmpty());
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.labels()).isEmpty();
Assertions.assertThat(result.annotations()).isEmpty();
}
@Test
@@ -70,9 +70,9 @@ class K8sPodLabelsAndAnnotationsSupplierTests {
PodLabelsAndAnnotations result = K8sPodLabelsAndAnnotationsSupplier.nonExternalName(coreV1Api, NAMESPACE)
.apply(POD_NAME);
Assertions.assertNotNull(result);
Assertions.assertEquals(result.labels(), Map.of("a", "b"));
Assertions.assertEquals(result.annotations(), Map.of("c", "d"));
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.labels()).isEqualTo(Map.of("a", "b"));
Assertions.assertThat(result.annotations()).isEqualTo(Map.of("c", "d"));
}
}

6
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerSelectiveNamespacesAutoConfigurationTests.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Set;
import io.kubernetes.client.openapi.ApiClient;
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;
import org.mockito.Mockito;
@@ -66,11 +66,11 @@ class KubernetesClientInformerSelectiveNamespacesAutoConfigurationTests {
@SuppressWarnings("unchecked")
Set<String> selectiveNamespaces = context.getBean("selectiveNamespaces", Set.class);
Assertions.assertEquals(selectiveNamespaces, Set.of("a", "b"));
Assertions.assertThat(selectiveNamespaces).isEqualTo(Set.of("a", "b"));
@SuppressWarnings("unchecked")
Set<String> namespaces = context.getBean("namespaces", Set.class);
Assertions.assertEquals(namespaces, Set.of("c", "d"));
Assertions.assertThat(namespaces).isEqualTo(Set.of("c", "d"));
});
assertThat(output.getOut().contains("registering lister (for services) in namespace : " + NAMESPACE_A))

6
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java
View File

@@ -22,8 +22,8 @@ import io.kubernetes.client.openapi.ApiClient;
import io.kubernetes.client.openapi.JSON;
import io.kubernetes.client.openapi.apis.CoreV1Api;
import okhttp3.OkHttpClient;
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.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
@@ -66,12 +66,12 @@ public class KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests {
setup("server.port=7000", "spring.cloud.config.discovery.enabled=true",
"spring.cloud.kubernetes.discovery.enabled:true", "spring.application.name:test",
"spring.cloud.config.discovery.service-id:configserver");
Assertions.assertEquals(1, this.context.getParent().getBeanNamesForType(DiscoveryClient.class).length);
Assertions.assertThat(this.context.getParent().getBeanNamesForType(DiscoveryClient.class).length).isEqualTo(1);
DiscoveryClient client = this.context.getParent().getBean(DiscoveryClient.class);
verify(client, atLeast(2)).getInstances("configserver");
ConfigClientProperties locator = this.context.getBean(ConfigClientProperties.class);
Assertions.assertEquals("http://fake:8888/", locator.getUri()[0]);
Assertions.assertThat(locator.getUri()[0]).isEqualTo("http://fake:8888/");
}
private void setup(String... env) {

18
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterTests.java
View File

@@ -24,7 +24,7 @@ import java.util.function.Predicate;
import io.kubernetes.client.openapi.models.V1Service;
import io.kubernetes.client.openapi.models.V1ServiceBuilder;
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,8 +46,8 @@ class KubernetesDiscoveryClientFilterTests {
false, spelFilter, Set.of(), Map.of(), null, null, 0, false);
Predicate<V1Service> predicate = KubernetesDiscoveryClientUtils.filter(properties);
Assertions.assertNotNull(predicate);
Assertions.assertTrue(output.getOut().contains("filter not defined, returning always true predicate"));
Assertions.assertThat(predicate).isNotNull();
Assertions.assertThat(output.getOut()).contains("filter not defined, returning always true predicate");
}
@Test
@@ -58,8 +58,8 @@ class KubernetesDiscoveryClientFilterTests {
false, spelFilter, Set.of(), Map.of(), null, null, 0, false);
Predicate<V1Service> predicate = KubernetesDiscoveryClientUtils.filter(properties);
Assertions.assertNotNull(predicate);
Assertions.assertTrue(output.getOut().contains("returning predicate based on filter expression: some"));
Assertions.assertThat(predicate).isNotNull();
Assertions.assertThat(output.getOut()).contains("returning predicate based on filter expression: some");
}
@Test
@@ -80,8 +80,8 @@ class KubernetesDiscoveryClientFilterTests {
.filter(predicate)
.sorted(Comparator.comparing(service -> service.getMetadata().getName()))
.toList();
Assertions.assertEquals(filtered.get(0).getMetadata().getName(), "a");
Assertions.assertEquals(filtered.get(1).getMetadata().getName(), "a");
Assertions.assertThat(filtered.get(0).getMetadata().getName()).isEqualTo("a");
Assertions.assertThat(filtered.get(1).getMetadata().getName()).isEqualTo("a");
}
@Test
@@ -102,7 +102,7 @@ class KubernetesDiscoveryClientFilterTests {
.filter(predicate)
.sorted(Comparator.comparing(service -> service.getMetadata().getName()))
.toList();
Assertions.assertEquals(filtered.size(), 0);
Assertions.assertThat(filtered).isEmpty();
}
@Test
@@ -123,7 +123,7 @@ class KubernetesDiscoveryClientFilterTests {
.filter(predicate)
.sorted(Comparator.comparing(service -> service.getMetadata().getName()))
.toList();
Assertions.assertEquals(filtered.size(), 0);
Assertions.assertThat(filtered).isEmpty();
}
}

8
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientServiceWithoutPortNameTests.java
View File

@@ -32,7 +32,7 @@ import io.kubernetes.client.openapi.models.V1Service;
import io.kubernetes.client.openapi.models.V1ServiceBuilder;
import io.kubernetes.client.openapi.models.V1ServicePortBuilder;
import io.kubernetes.client.openapi.models.V1ServiceSpecBuilder;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -94,9 +94,9 @@ class KubernetesDiscoveryClientServiceWithoutPortNameTests {
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
List<ServiceInstance> serviceInstances = discoveryClient.getInstances("no-port-name-service");
Assertions.assertEquals(serviceInstances.size(), 1);
Assertions.assertEquals(serviceInstances.get(0).getMetadata(),
Map.of("port.<unset>", "8080", "k8s_namespace", "spring-k8s", "type", "ClusterIP"));
Assertions.assertThat(serviceInstances.size()).isEqualTo(1);
Assertions.assertThat(serviceInstances.get(0).getMetadata())
.isEqualTo(Map.of("port.<unset>", "8080", "k8s_namespace", "spring-k8s", "type", "ClusterIP"));
}
}

68
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientUtilsTests.java
View File

@@ -30,7 +30,7 @@ import io.kubernetes.client.openapi.models.V1EndpointSubsetBuilder;
import io.kubernetes.client.openapi.models.V1ObjectMeta;
import io.kubernetes.client.openapi.models.V1Service;
import io.kubernetes.client.openapi.models.V1ServiceBuilder;
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;
@@ -56,9 +56,9 @@ class KubernetesDiscoveryClientUtilsTests {
V1Service service = new V1ServiceBuilder().withMetadata(new V1ObjectMeta().name("my-service")).build();
boolean result = matchesServiceLabels(service, properties);
Assertions.assertTrue(result);
Assertions.assertTrue(output.getOut()
.contains("service labels from properties are empty, service with name : 'my-service' will match"));
Assertions.assertThat(result).isTrue();
Assertions.assertThat(output.getOut())
.contains("service labels from properties are empty, service with name : 'my-service' will match");
}
/**
@@ -72,8 +72,8 @@ class KubernetesDiscoveryClientUtilsTests {
V1Service service = new V1ServiceBuilder().withMetadata(new V1ObjectMeta().name("my-service")).build();
boolean result = matchesServiceLabels(service, properties);
Assertions.assertFalse(result);
Assertions.assertTrue(output.getOut().contains("service with name : 'my-service' does not have labels"));
Assertions.assertThat(result).isFalse();
Assertions.assertThat(output.getOut()).contains("service with name : 'my-service' does not have labels");
}
/**
@@ -95,9 +95,9 @@ class KubernetesDiscoveryClientUtilsTests {
.build();
boolean result = matchesServiceLabels(service, properties);
Assertions.assertTrue(result);
Assertions.assertTrue(output.getOut().contains("Service labels from properties : {a=b}"));
Assertions.assertTrue(output.getOut().contains("Service labels from service : {a=b}"));
Assertions.assertThat(result).isTrue();
Assertions.assertThat(output.getOut()).contains("Service labels from properties : {a=b}");
Assertions.assertThat(output.getOut()).contains("Service labels from service : {a=b}");
}
/**
@@ -119,9 +119,9 @@ class KubernetesDiscoveryClientUtilsTests {
.build();
boolean result = matchesServiceLabels(service, properties);
Assertions.assertFalse(result);
Assertions.assertTrue(output.getOut().contains("Service labels from properties : {a=b, c=d}"));
Assertions.assertTrue(output.getOut().contains("Service labels from service : {a=b}"));
Assertions.assertThat(result).isFalse();
Assertions.assertThat(output.getOut()).contains("Service labels from properties : {a=b, c=d}");
Assertions.assertThat(output.getOut()).contains("Service labels from service : {a=b}");
}
/**
@@ -143,9 +143,9 @@ class KubernetesDiscoveryClientUtilsTests {
.build();
boolean result = matchesServiceLabels(service, properties);
Assertions.assertTrue(result);
Assertions.assertTrue(output.getOut().contains("Service labels from properties : {a=b, c=d}"));
Assertions.assertTrue(output.getOut().contains("Service labels from service : {a=b, c=d}"));
Assertions.assertThat(result).isTrue();
Assertions.assertThat(output.getOut()).contains("Service labels from properties : {a=b, c=d}");
Assertions.assertThat(output.getOut()).contains("Service labels from service : {a=b, c=d}");
}
/**
@@ -167,9 +167,9 @@ class KubernetesDiscoveryClientUtilsTests {
.build();
boolean result = matchesServiceLabels(service, properties);
Assertions.assertTrue(result);
Assertions.assertTrue(output.getOut().contains("Service labels from properties : {a=b}"));
Assertions.assertTrue(output.getOut().contains("Service labels from service : {a=b, c=d}"));
Assertions.assertThat(result).isTrue();
Assertions.assertThat(output.getOut()).contains("Service labels from properties : {a=b}");
Assertions.assertThat(output.getOut()).contains("Service labels from service : {a=b, c=d}");
}
@Test
@@ -183,9 +183,9 @@ class KubernetesDiscoveryClientUtilsTests {
.build());
Map<String, Integer> portsData = endpointSubsetsPortData(endpointSubsets);
Assertions.assertEquals(portsData.size(), 2);
Assertions.assertEquals(portsData.get("https"), 8080);
Assertions.assertEquals(portsData.get("<unset>"), 8081);
Assertions.assertThat(portsData.size()).isEqualTo(2);
Assertions.assertThat(portsData.get("https")).isEqualTo(8080);
Assertions.assertThat(portsData.get("<unset>")).isEqualTo(8081);
}
@Test
@@ -199,9 +199,9 @@ class KubernetesDiscoveryClientUtilsTests {
.build());
Map<String, Integer> portsData = endpointSubsetsPortData(endpointSubsets);
Assertions.assertEquals(portsData.size(), 2);
Assertions.assertEquals(portsData.get("https"), 8080);
Assertions.assertEquals(portsData.get("http"), 8081);
Assertions.assertThat(portsData.size()).isEqualTo(2);
Assertions.assertThat(portsData.get("https")).isEqualTo(8080);
Assertions.assertThat(portsData.get("http")).isEqualTo(8081);
}
@Test
@@ -209,7 +209,7 @@ class KubernetesDiscoveryClientUtilsTests {
V1EndpointSubset endpointSubset = new V1EndpointSubsetBuilder().build();
Map<String, Integer> result = endpointSubsetsPortData(List.of(endpointSubset));
Assertions.assertEquals(result.size(), 0);
Assertions.assertThat(result).isEmpty();
}
@Test
@@ -219,8 +219,8 @@ class KubernetesDiscoveryClientUtilsTests {
.build();
Map<String, Integer> result = endpointSubsetsPortData(List.of(endpointSubset));
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get("name"), 80);
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get("name")).isEqualTo(80);
}
@Test
@@ -230,8 +230,8 @@ class KubernetesDiscoveryClientUtilsTests {
.build();
Map<String, Integer> result = endpointSubsetsPortData(List.of(endpointSubset));
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get("<unset>"), 80);
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get("<unset>")).isEqualTo(80);
}
/**
@@ -247,7 +247,7 @@ class KubernetesDiscoveryClientUtilsTests {
includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false);
V1EndpointSubset endpointSubset = new V1EndpointSubsetBuilder().build();
List<V1EndpointAddress> addresses = KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties);
Assertions.assertEquals(addresses.size(), 0);
Assertions.assertThat(addresses).isEmpty();
}
/**
@@ -266,7 +266,7 @@ class KubernetesDiscoveryClientUtilsTests {
new V1EndpointAddressBuilder().withHostname("two").build())
.build();
List<V1EndpointAddress> addresses = KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties);
Assertions.assertEquals(addresses.size(), 2);
Assertions.assertThat(addresses.size()).isEqualTo(2);
}
/**
@@ -286,9 +286,8 @@ class KubernetesDiscoveryClientUtilsTests {
.withNotReadyAddresses(new V1EndpointAddressBuilder().withHostname("three").build())
.build();
List<V1EndpointAddress> addresses = KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties);
Assertions.assertEquals(addresses.size(), 2);
List<String> hostNames = addresses.stream().map(V1EndpointAddress::getHostname).sorted().toList();
Assertions.assertEquals(hostNames, List.of("one", "two"));
Assertions.assertThat(hostNames).containsExactly("one", "two");
}
/**
@@ -308,9 +307,8 @@ class KubernetesDiscoveryClientUtilsTests {
.withNotReadyAddresses(new V1EndpointAddressBuilder().withHostname("three").build())
.build();
List<V1EndpointAddress> addresses = KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties);
Assertions.assertEquals(addresses.size(), 3);
List<String> hostNames = addresses.stream().map(V1EndpointAddress::getHostname).sorted().toList();
Assertions.assertEquals(hostNames, List.of("one", "three", "two"));
Assertions.assertThat(hostNames).containsExactly("one", "three", "two");
}
// preserve order for testing reasons

35
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java
View File

@@ -47,7 +47,6 @@ import io.kubernetes.client.openapi.models.V1ServiceBuilder;
import io.kubernetes.client.openapi.models.V1ServiceSpec;
import io.kubernetes.client.openapi.models.V1ServiceSpecBuilder;
import io.kubernetes.client.util.ClientBuilder;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -545,14 +544,14 @@ class KubernetesInformerDiscoveryClientTests {
SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, properties);
List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
Assertions.assertEquals(result.size(), 1);
assertThat(result.size()).isEqualTo(1);
DefaultKubernetesServiceInstance externalNameServiceInstance = (DefaultKubernetesServiceInstance) result.get(0);
Assertions.assertEquals(externalNameServiceInstance.getServiceId(), "blue-service");
Assertions.assertEquals(externalNameServiceInstance.getHost(), "k8s-spring-b");
Assertions.assertEquals(externalNameServiceInstance.getPort(), -1);
Assertions.assertFalse(externalNameServiceInstance.isSecure());
Assertions.assertEquals(externalNameServiceInstance.getUri().toASCIIString(), "k8s-spring-b");
Assertions.assertEquals(externalNameServiceInstance.getMetadata(), Map.of("k8s_namespace", "b",
assertThat(externalNameServiceInstance.getServiceId()).isEqualTo("blue-service");
assertThat(externalNameServiceInstance.getHost()).isEqualTo("k8s-spring-b");
assertThat(externalNameServiceInstance.getPort()).isEqualTo(-1);
assertThat(externalNameServiceInstance.isSecure()).isFalse();
assertThat(externalNameServiceInstance.getUri().toASCIIString()).isEqualTo("k8s-spring-b");
assertThat(externalNameServiceInstance.getMetadata()).isEqualTo(Map.of("k8s_namespace", "b",
"labels-prefix-label-key", "label-value", "annotations-prefix-abc", "def", "type", "ExternalName"));
}
@@ -603,17 +602,17 @@ class KubernetesInformerDiscoveryClientTests {
discoveryClient.coreV1Api = new CoreV1Api(apiClient);
List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
Assertions.assertEquals(result.size(), 1);
assertThat(result.size()).isEqualTo(1);
DefaultKubernetesServiceInstance serviceInstance = (DefaultKubernetesServiceInstance) result.get(0);
Assertions.assertEquals(serviceInstance.getServiceId(), "blue-service");
Assertions.assertEquals(serviceInstance.getHost(), "127.0.0.1");
Assertions.assertEquals(serviceInstance.getPort(), 8080);
Assertions.assertFalse(serviceInstance.isSecure());
Assertions.assertEquals(serviceInstance.getUri().toASCIIString(), "http://127.0.0.1:8080");
Assertions.assertEquals(serviceInstance.getMetadata(),
Map.of("k8s_namespace", "a", "type", "ClusterIP", "ports-prefix<unset>", "8080"));
Assertions.assertEquals(serviceInstance.podMetadata().get("labels"), Map.of("a", "b"));
Assertions.assertEquals(serviceInstance.podMetadata().get("annotations"), Map.of("c", "d"));
assertThat(serviceInstance.getServiceId()).isEqualTo("blue-service");
assertThat(serviceInstance.getHost()).isEqualTo("127.0.0.1");
assertThat(serviceInstance.getPort()).isEqualTo(8080);
assertThat(serviceInstance.isSecure()).isFalse();
assertThat(serviceInstance.getUri().toASCIIString()).isEqualTo("http://127.0.0.1:8080");
assertThat(serviceInstance.getMetadata())
.isEqualTo(Map.of("k8s_namespace", "a", "type", "ClusterIP", "ports-prefix<unset>", "8080"));
assertThat(serviceInstance.podMetadata().get("labels")).isEqualTo(Map.of("a", "b"));
assertThat(serviceInstance.podMetadata().get("annotations")).isEqualTo(Map.of("c", "d"));
server.shutdown();
}

8
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesCatalogWatchContextTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.client.discovery.catalog;
import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
/**
@@ -30,13 +30,13 @@ class KubernetesCatalogWatchContextTests {
@Test
void emptyLabels() {
String result = KubernetesCatalogWatchContext.labelSelector(Map.of());
Assertions.assertEquals("", result);
Assertions.assertThat(result).isEmpty();
}
@Test
void singleLabel() {
String result = KubernetesCatalogWatchContext.labelSelector(Map.of("a", "b"));
Assertions.assertEquals("a=b", result);
Assertions.assertThat(result).isEqualTo("a=b");
}
@Test
@@ -45,7 +45,7 @@ class KubernetesCatalogWatchContextTests {
labels.put("a", "b");
labels.put("c", "d");
String result = KubernetesCatalogWatchContext.labelSelector(labels);
Assertions.assertEquals("a=b,c=d", result);
Assertions.assertThat(result).isEqualTo("a=b,c=d");
}
}

16
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesClientCatalogWatchEndpointSlicesSupportTests.java
View File

@@ -28,9 +28,9 @@ import io.kubernetes.client.openapi.models.V1APIResourceBuilder;
import io.kubernetes.client.openapi.models.V1APIResourceList;
import io.kubernetes.client.openapi.models.V1APIResourceListBuilder;
import io.kubernetes.client.util.ClientBuilder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterAll;
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.mockito.Mockito;
@@ -95,8 +95,9 @@ class KubernetesClientCatalogWatchEndpointSlicesSupportTests {
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(list))));
KubernetesCatalogWatch watch = new KubernetesCatalogWatch(null, apiClient, properties, NAMESPACE_PROVIDER);
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class, watch::postConstruct);
Assertions.assertEquals("EndpointSlices are not supported on the cluster", ex.getMessage());
Assertions.assertThatThrownBy(watch::postConstruct)
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("EndpointSlices are not supported on the cluster");
}
/**
@@ -119,8 +120,9 @@ class KubernetesClientCatalogWatchEndpointSlicesSupportTests {
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(list))));
KubernetesCatalogWatch watch = new KubernetesCatalogWatch(null, apiClient, properties, NAMESPACE_PROVIDER);
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class, watch::postConstruct);
Assertions.assertEquals("EndpointSlices are not supported on the cluster", ex.getMessage());
Assertions.assertThatThrownBy(watch::postConstruct)
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("EndpointSlices are not supported on the cluster");
}
/**
@@ -134,7 +136,7 @@ class KubernetesClientCatalogWatchEndpointSlicesSupportTests {
false, "", Set.of(), Map.of(), "", null, 0, useEndpointSlices);
KubernetesCatalogWatch watch = new KubernetesCatalogWatch(null, apiClient, properties, NAMESPACE_PROVIDER);
Assertions.assertEquals(KubernetesEndpointsCatalogWatch.class, watch.stateGenerator().getClass());
Assertions.assertThat(watch.stateGenerator().getClass()).isEqualTo(KubernetesEndpointsCatalogWatch.class);
}
/**
@@ -154,7 +156,7 @@ class KubernetesClientCatalogWatchEndpointSlicesSupportTests {
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(list))));
KubernetesCatalogWatch watch = new KubernetesCatalogWatch(null, apiClient, properties, NAMESPACE_PROVIDER);
Assertions.assertEquals(KubernetesEndpointSlicesCatalogWatch.class, watch.stateGenerator().getClass());
Assertions.assertThat(watch.stateGenerator().getClass()).isEqualTo(KubernetesEndpointSlicesCatalogWatch.class);
}
}

24
spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientTests.java
View File

@@ -31,8 +31,8 @@ import io.kubernetes.client.openapi.models.V1ObjectMeta;
import io.kubernetes.client.openapi.models.V1Service;
import io.kubernetes.client.openapi.models.V1ServiceSpec;
import io.kubernetes.client.openapi.models.V1ServiceSpecBuilder;
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.Mockito;
import reactor.test.StepVerifier;
@@ -190,9 +190,9 @@ class KubernetesInformerReactiveDiscoveryClientTests {
kubernetesDiscoveryProperties));
List<String> result = discoveryClient.getServices().collectList().block();
Assertions.assertEquals(result.size(), 2);
Assertions.assertTrue(result.contains("service-a"));
Assertions.assertTrue(result.contains("service-b"));
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result).contains("service-a");
Assertions.assertThat(result).contains("service-b");
}
/**
@@ -224,9 +224,9 @@ class KubernetesInformerReactiveDiscoveryClientTests {
kubernetesDiscoveryProperties));
List<String> result = discoveryClient.getServices().collectList().block();
Assertions.assertEquals(result.size(), 1);
Assertions.assertTrue(result.contains("service-a"));
Assertions.assertFalse(result.contains("service-b"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result).contains("service-a");
Assertions.assertThat(result).doesNotContain("service-b");
}
/**
@@ -274,10 +274,10 @@ class KubernetesInformerReactiveDiscoveryClientTests {
kubernetesDiscoveryProperties));
List<ServiceInstance> result = discoveryClient.getInstances("endpoints-x").collectList().block();
Assertions.assertEquals(result.size(), 2);
Assertions.assertThat(result.size()).isEqualTo(2);
List<String> byIp = result.stream().map(ServiceInstance::getHost).sorted().toList();
Assertions.assertTrue(byIp.contains("1.1.1.1"));
Assertions.assertTrue(byIp.contains("2.2.2.2"));
Assertions.assertThat(byIp).contains("1.1.1.1");
Assertions.assertThat(byIp).contains("2.2.2.2");
}
/**
@@ -325,9 +325,9 @@ class KubernetesInformerReactiveDiscoveryClientTests {
kubernetesDiscoveryProperties));
List<ServiceInstance> result = discoveryClient.getInstances("endpoints-x").collectList().block();
Assertions.assertEquals(result.size(), 1);
Assertions.assertThat(result.size()).isEqualTo(1);
List<String> byIp = result.stream().map(ServiceInstance::getHost).sorted().toList();
Assertions.assertTrue(byIp.contains("1.1.1.1"));
Assertions.assertThat(byIp).contains("1.1.1.1");
}
private Lister<V1Service> setupServiceLister(String namespace, V1Service... services) {

42
spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java
View File

@@ -25,7 +25,7 @@ import io.kubernetes.client.openapi.models.V1ServiceBuilder;
import io.kubernetes.client.openapi.models.V1ServicePort;
import io.kubernetes.client.openapi.models.V1ServicePortBuilder;
import io.kubernetes.client.openapi.models.V1ServiceSpecBuilder;
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;
@@ -116,9 +116,9 @@ class KubernetesClientServiceInstanceMapperTests {
List<V1ServicePort> servicePorts = List.of();
V1Service service = createService("database", "default", annotations, labels, servicePorts);
KubernetesServiceInstance serviceInstance = mapper.map(service);
Assertions.assertNull(serviceInstance);
Assertions.assertTrue(output.getOut()
.contains("service : database does not have any ServicePort(s), will not consider it for load balancing"));
Assertions.assertThat(serviceInstance).isNull();
Assertions.assertThat(output.getOut())
.contains("service : database does not have any ServicePort(s), will not consider it for load balancing");
}
@Test
@@ -133,10 +133,10 @@ class KubernetesClientServiceInstanceMapperTests {
List<V1ServicePort> servicePorts = List.of(new V1ServicePortBuilder().withName("http").withPort(80).build());
V1Service service = createService("database", "default", annotations, labels, servicePorts);
KubernetesServiceInstance serviceInstance = mapper.map(service);
Assertions.assertNotNull(serviceInstance);
Assertions.assertTrue(output.getOut()
Assertions.assertThat(serviceInstance).isNotNull();
Assertions.assertThat(output.getOut())
.contains("single ServicePort found, "
+ "will use it as-is (without checking 'spring.cloud.kubernetes.loadbalancer.portName')"));
+ "will use it as-is (without checking 'spring.cloud.kubernetes.loadbalancer.portName')");
}
@Test
@@ -151,10 +151,10 @@ class KubernetesClientServiceInstanceMapperTests {
List<V1ServicePort> servicePorts = List.of(new V1ServicePortBuilder().withName("http").withPort(80).build());
V1Service service = createService("database", "default", annotations, labels, servicePorts);
KubernetesServiceInstance serviceInstance = mapper.map(service);
Assertions.assertNotNull(serviceInstance);
Assertions.assertTrue(output.getOut()
Assertions.assertThat(serviceInstance).isNotNull();
Assertions.assertThat(output.getOut())
.contains("single ServicePort found, "
+ "will use it as-is (without checking 'spring.cloud.kubernetes.loadbalancer.portName')"));
+ "will use it as-is (without checking 'spring.cloud.kubernetes.loadbalancer.portName')");
}
@Test
@@ -170,9 +170,9 @@ class KubernetesClientServiceInstanceMapperTests {
new V1ServicePortBuilder().withName("https").withPort(443).build());
V1Service service = createService("database", "default", annotations, labels, servicePorts);
KubernetesServiceInstance serviceInstance = mapper.map(service);
Assertions.assertNotNull(serviceInstance);
Assertions.assertTrue(output.getOut().contains("found port name that matches : http"));
Assertions.assertEquals(serviceInstance.getPort(), 80);
Assertions.assertThat(serviceInstance).isNotNull();
Assertions.assertThat(output.getOut()).contains("found port name that matches : http");
Assertions.assertThat(serviceInstance.getPort()).isEqualTo(80);
}
@Test
@@ -188,10 +188,10 @@ class KubernetesClientServiceInstanceMapperTests {
new V1ServicePortBuilder().withName("https").withPort(443).build());
V1Service service = createService("database", "default", annotations, labels, servicePorts);
KubernetesServiceInstance serviceInstance = mapper.map(service);
Assertions.assertNotNull(serviceInstance);
Assertions.assertTrue(output.getOut().contains("Did not find a port name that is equal to the value http"));
Assertions.assertTrue(output.getOut().contains("Will return 'first' port found, which is non-deterministic"));
Assertions.assertTrue(serviceInstance.getPort() == 80 || serviceInstance.getPort() == 443);
Assertions.assertThat(serviceInstance).isNotNull();
Assertions.assertThat(output.getOut()).contains("Did not find a port name that is equal to the value http");
Assertions.assertThat(output.getOut()).contains("Will return 'first' port found, which is non-deterministic");
Assertions.assertThat(serviceInstance.getPort()).isIn(80, 443);
}
@Test
@@ -207,10 +207,10 @@ class KubernetesClientServiceInstanceMapperTests {
new V1ServicePortBuilder().withName("https").withPort(443).build());
V1Service service = createService("database", "default", annotations, labels, servicePorts);
KubernetesServiceInstance serviceInstance = mapper.map(service);
Assertions.assertNotNull(serviceInstance);
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.assertTrue(serviceInstance.getPort() == 80 || serviceInstance.getPort() == 443);
Assertions.assertThat(serviceInstance).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");
Assertions.assertThat(serviceInstance.getPort()).isIn(80, 443);
}
private V1Service createService(String name, String namespace, Map<String, String> annotations,

22
spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java
View File

@@ -34,9 +34,9 @@ import io.kubernetes.client.openapi.models.V1ServiceList;
import io.kubernetes.client.openapi.models.V1ServicePortBuilder;
import io.kubernetes.client.openapi.models.V1ServiceSpecBuilder;
import io.kubernetes.client.util.ClientBuilder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterAll;
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;
@@ -155,8 +155,8 @@ class KubernetesClientServicesListSupplierTests {
services.add(serviceA);
StepVerifier.create(instances).expectNext(services).verifyComplete();
Assertions.assertTrue(output.getOut().contains("serviceID : service-a"));
Assertions.assertTrue(output.getOut().contains("discovering services in namespace : default"));
Assertions.assertThat(output.getOut()).contains("serviceID : service-a");
Assertions.assertThat(output.getOut()).contains("discovering services in namespace : default");
}
@Test
@@ -186,9 +186,9 @@ class KubernetesClientServicesListSupplierTests {
List<ServiceInstance> services = List.of();
StepVerifier.create(instances).expectNext(services).verifyComplete();
Assertions.assertTrue(output.getOut().contains("serviceID : service-a"));
Assertions.assertTrue(output.getOut().contains("discovering services in namespace : default"));
Assertions.assertTrue(output.getOut().contains("Error retrieving service with name service-a"));
Assertions.assertThat(output.getOut()).contains("serviceID : service-a");
Assertions.assertThat(output.getOut()).contains("discovering services in namespace : default");
Assertions.assertThat(output.getOut()).contains("Error retrieving service with name service-a");
}
@Test
@@ -226,7 +226,7 @@ class KubernetesClientServicesListSupplierTests {
services.add(serviceATestNamespace);
StepVerifier.create(instances).expectNext(services).verifyComplete();
Assertions.assertTrue(output.getOut().contains("discovering services in all namespaces"));
Assertions.assertThat(output.getOut()).contains("discovering services in all namespaces");
}
@Test
@@ -271,10 +271,10 @@ class KubernetesClientServicesListSupplierTests {
services.add(serviceATestNamespace);
StepVerifier.create(instances).expectNext(services).verifyComplete();
Assertions.assertTrue(
output.getOut().contains("Error retrieving service with name service-a in namespace : no-service"));
Assertions.assertTrue(
output.getOut().contains("discovering services in selective namespaces : [default, no-service, test]"));
Assertions.assertThat(output.getOut())
.contains("Error retrieving service with name service-a in namespace : no-service");
Assertions.assertThat(output.getOut())
.contains("discovering services in selective namespaces : [default, no-service, test]");
}
}

14
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/SanitizeTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.commons;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.endpoint.SanitizableData;
@@ -63,7 +63,7 @@ class SanitizeTests {
Sanitizer sanitizer = new Sanitizer(SANITIZING_FUNCTIONS);
SanitizableData sanitizableData = new SanitizableData(bootstrapPropertySource, "secret", "xyz");
Assertions.assertEquals(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED), "xyz");
Assertions.assertThat(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED)).isEqualTo("xyz");
}
@Test
@@ -75,7 +75,7 @@ class SanitizeTests {
Sanitizer sanitizer = new Sanitizer(SANITIZING_FUNCTIONS);
SanitizableData sanitizableData = new SanitizableData(bootstrapPropertySource, "secret", "xyz");
Assertions.assertEquals(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED), SANITIZED_VALUE);
Assertions.assertThat(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED)).isEqualTo(SANITIZED_VALUE);
}
@Test
@@ -87,7 +87,7 @@ class SanitizeTests {
Sanitizer sanitizer = new Sanitizer(SANITIZING_FUNCTIONS);
SanitizableData sanitizableData = new SanitizableData(bootstrapPropertySource, "secret", "xyz");
Assertions.assertEquals(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED), "xyz");
Assertions.assertThat(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED)).isEqualTo("xyz");
}
@Test
@@ -99,7 +99,7 @@ class SanitizeTests {
Sanitizer sanitizer = new Sanitizer(SANITIZING_FUNCTIONS);
SanitizableData sanitizableData = new SanitizableData(bootstrapPropertySource, "secret", "xyz");
Assertions.assertEquals(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED), SANITIZED_VALUE);
Assertions.assertThat(sanitizer.sanitize(sanitizableData, SHOW_UNSANITIZED)).isEqualTo(SANITIZED_VALUE);
}
@Test
@@ -114,8 +114,8 @@ class SanitizeTests {
SanitizableData sanitizableDataSecret = new SanitizableData(compositePropertySource, "secret", "xyz");
SanitizableData sanitizableDataMount = new SanitizableData(compositePropertySource, "mount", "abc");
Assertions.assertEquals(sanitizer.sanitize(sanitizableDataSecret, SHOW_UNSANITIZED), SANITIZED_VALUE);
Assertions.assertEquals(sanitizer.sanitize(sanitizableDataMount, SHOW_UNSANITIZED), "abc");
Assertions.assertThat(sanitizer.sanitize(sanitizableDataSecret, SHOW_UNSANITIZED)).isEqualTo(SANITIZED_VALUE);
Assertions.assertThat(sanitizer.sanitize(sanitizableDataMount, SHOW_UNSANITIZED)).isEqualTo("abc");
}
}

88
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesBindingTests.java
View File

@@ -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();
});
}

87
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigPropertiesTests.java
View File

@@ -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,10 @@ class ConfigMapConfigPropertiesTests {
"config-map-a", "spring-k8s", false, false, false, RetryProperties.DEFAULT);
List<NormalizedSource> 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 +76,10 @@ class ConfigMapConfigPropertiesTests {
"config-map-a", "spring-k8s", true, false, false, RetryProperties.DEFAULT);
List<NormalizedSource> 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 +107,10 @@ class ConfigMapConfigPropertiesTests {
true, "config-map-a", "spring-k8s", true, false, false, RetryProperties.DEFAULT);
List<NormalizedSource> 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 +150,14 @@ class ConfigMapConfigPropertiesTests {
Map.of(), true, "config-map-a", "spring-k8s", true, false, false, RetryProperties.DEFAULT);
List<NormalizedSource> 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 +201,16 @@ class ConfigMapConfigPropertiesTests {
RetryProperties.DEFAULT);
List<NormalizedSource> 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 +234,9 @@ class ConfigMapConfigPropertiesTests {
"config-map-a", "spring-k8s", false, true, false, RetryProperties.DEFAULT);
List<NormalizedSource> 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 +263,9 @@ class ConfigMapConfigPropertiesTests {
"config-map-a", "spring-k8s", false, false, false, RetryProperties.DEFAULT);
List<NormalizedSource> 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()).isFalse();
}
/**
@@ -306,11 +307,11 @@ class ConfigMapConfigPropertiesTests {
Map.of(), true, "config-map-a", "spring-k8s", false, false, false, RetryProperties.DEFAULT);
List<NormalizedSource> 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 +369,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()).isFalse();
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<NormalizedSource> set = new LinkedHashSet<>(sources);
Assertions.assertEquals(5, set.size());
Assertions.assertThat(set.size()).isEqualTo(5);
}
}

39
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigReloadPropertiesTests.java
View File

@@ -17,9 +17,8 @@
package org.springframework.cloud.kubernetes.commons.config;
import java.time.Duration;
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.boot.context.properties.EnableConfigurationProperties;
@@ -38,15 +37,15 @@ class ConfigReloadPropertiesTests {
void testDefaults() {
new ApplicationContextRunner().withUserConfiguration(Config.class).run(context -> {
ConfigReloadProperties properties = context.getBean(ConfigReloadProperties.class);
Assertions.assertNotNull(properties);
Assertions.assertFalse(properties.enabled());
Assertions.assertTrue(properties.monitoringConfigMaps());
Assertions.assertFalse(properties.monitoringSecrets());
Assertions.assertEquals(ConfigReloadProperties.ReloadStrategy.REFRESH, properties.strategy());
Assertions.assertEquals(ConfigReloadProperties.ReloadDetectionMode.EVENT, properties.mode());
Assertions.assertEquals(Duration.ofMillis(15000), properties.period());
Assertions.assertTrue(properties.namespaces().isEmpty());
Assertions.assertEquals(Duration.ofSeconds(2), properties.maxWaitForRestart());
Assertions.assertThat(properties).isNotNull();
Assertions.assertThat(properties.enabled()).isFalse();
Assertions.assertThat(properties.monitoringConfigMaps()).isTrue();
Assertions.assertThat(properties.monitoringSecrets()).isFalse();
Assertions.assertThat(ConfigReloadProperties.ReloadStrategy.REFRESH).isEqualTo(properties.strategy());
Assertions.assertThat(ConfigReloadProperties.ReloadDetectionMode.EVENT).isEqualTo(properties.mode());
Assertions.assertThat(Duration.ofMillis(15000)).isEqualTo(properties.period());
Assertions.assertThat(properties.namespaces().isEmpty()).isTrue();
Assertions.assertThat(Duration.ofSeconds(2)).isEqualTo(properties.maxWaitForRestart());
});
}
@@ -62,15 +61,15 @@ class ConfigReloadPropertiesTests {
"spring.cloud.kubernetes.reload.max-wait-for-restart=5s")
.run(context -> {
ConfigReloadProperties properties = context.getBean(ConfigReloadProperties.class);
Assertions.assertNotNull(properties);
Assertions.assertTrue(properties.enabled());
Assertions.assertFalse(properties.monitoringConfigMaps());
Assertions.assertTrue(properties.monitoringSecrets());
Assertions.assertEquals(ConfigReloadProperties.ReloadStrategy.SHUTDOWN, properties.strategy());
Assertions.assertEquals(ConfigReloadProperties.ReloadDetectionMode.POLLING, properties.mode());
Assertions.assertEquals(Duration.ofMillis(1000), properties.period());
Assertions.assertEquals(Set.of("a", "b"), properties.namespaces());
Assertions.assertEquals(Duration.ofSeconds(5), properties.maxWaitForRestart());
Assertions.assertThat(properties).isNotNull();
Assertions.assertThat(properties.enabled()).isTrue();
Assertions.assertThat(properties.monitoringConfigMaps()).isFalse();
Assertions.assertThat(properties.monitoringSecrets()).isTrue();
Assertions.assertThat(ConfigReloadProperties.ReloadStrategy.SHUTDOWN).isEqualTo(properties.strategy());
Assertions.assertThat(ConfigReloadProperties.ReloadDetectionMode.POLLING).isEqualTo(properties.mode());
Assertions.assertThat(Duration.ofMillis(1000)).isEqualTo(properties.period());
Assertions.assertThat(properties.namespaces()).containsExactlyInAnyOrder("a", "b");
Assertions.assertThat(Duration.ofSeconds(5)).isEqualTo(properties.maxWaitForRestart());
});
}

60
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsProcessSourceTests.java
View File

@@ -20,7 +20,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
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;
@@ -58,7 +58,7 @@ class ConfigUtilsProcessSourceTests {
Map<String, String> sourceRawData = Map.of();
boolean result = ConfigUtils.processSource(includeDefaultProfileData, environment, sourceName, sourceRawData);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -79,9 +79,9 @@ class ConfigUtilsProcessSourceTests {
MultipleSourcesContainer result = ConfigUtils.processNamedData(strippedSources, environment, sourceNames,
namespace, decode, includeDefaultProfileData);
Assertions.assertNotNull(result);
Assertions.assertEquals(result.names().toString(), "[configmap-a]");
Assertions.assertEquals(result.data(), Map.of("one", "1"));
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("configmap-a");
Assertions.assertThat(result.data()).containsExactlyInAnyOrderEntriesOf(Map.of("one", "1"));
}
/**
@@ -104,7 +104,7 @@ class ConfigUtilsProcessSourceTests {
Map<String, String> sourceRawData = Map.of();
boolean result = ConfigUtils.processSource(includeDefaultProfileData, environment, sourceName, sourceRawData);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -158,8 +158,8 @@ class ConfigUtilsProcessSourceTests {
MultipleSourcesContainer result = ConfigUtils.processNamedData(strippedSources, environment, sourceNames,
namespace, decode, includeDefaultProfileData);
Assertions.assertNotNull(result);
Assertions.assertEquals(result.names().toString(), "[account]");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("account");
/**
* <pre>
@@ -173,8 +173,9 @@ class ConfigUtilsProcessSourceTests {
* since 'k8s' is not an active profile.
* </pre>
*/
Assertions.assertEquals(result.data(), Map.of("one", "1", "two", "2", "three", "3", "five", "5"));
Assertions.assertTrue(output.getOut().contains("entry : account-k8s.properties will be skipped"));
Assertions.assertThat(result.data())
.containsExactlyInAnyOrderEntriesOf(Map.of("one", "1", "two", "2", "three", "3", "five", "5"));
Assertions.assertThat(output.getOut()).contains("entry : account-k8s.properties will be skipped");
}
/**
@@ -197,7 +198,7 @@ class ConfigUtilsProcessSourceTests {
Map<String, String> sourceRawData = Map.of();
boolean result = ConfigUtils.processSource(includeDefaultProfileData, environment, sourceName, sourceRawData);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -251,8 +252,8 @@ class ConfigUtilsProcessSourceTests {
MultipleSourcesContainer result = ConfigUtils.processNamedData(strippedSources, environment, sourceNames,
namespace, decode, includeDefaultProfileData);
Assertions.assertNotNull(result);
Assertions.assertEquals(result.names().toString(), "[account-default]");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("account-default");
/**
* <pre>
@@ -268,8 +269,9 @@ class ConfigUtilsProcessSourceTests {
* 6. we do not have 'four=4' since we do not read 'account-k8s.properties'
* </pre>
*/
Assertions.assertEquals(result.data(), Map.of("one", "1", "two", "2", "three", "3", "five", "5"));
Assertions.assertTrue(output.getOut().contains("entry : account-k8s.properties will be skipped"));
Assertions.assertThat(result.data())
.containsExactlyInAnyOrderEntriesOf(Map.of("one", "1", "two", "2", "three", "3", "five", "5"));
Assertions.assertThat(output.getOut()).contains("entry : account-k8s.properties will be skipped");
}
@@ -292,7 +294,7 @@ class ConfigUtilsProcessSourceTests {
Map<String, String> sourceRawData = Map.of("one", "1");
boolean result = ConfigUtils.processSource(includeDefaultProfileData, environment, sourceName, sourceRawData);
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
/**
@@ -314,7 +316,7 @@ class ConfigUtilsProcessSourceTests {
Map<String, String> sourceRawData = Map.of("one", "1", "account-k8s.properties", "one=11");
boolean result = ConfigUtils.processSource(includeDefaultProfileData, environment, sourceName, sourceRawData);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -363,17 +365,17 @@ class ConfigUtilsProcessSourceTests {
MultipleSourcesContainer result = ConfigUtils.processNamedData(strippedSources, environment, sourceNames,
namespace, decode, includeDefaultProfileData);
Assertions.assertNotNull(result);
Assertions.assertEquals(result.names().toString(), "[account]");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("account");
/**
* <pre>
* - we only read from 'account-k8s.properties'
* </pre>
*/
Assertions.assertEquals(result.data(), Map.of("one", "1111", "four", "4"));
Assertions.assertTrue(output.getOut().contains("entry : account.properties will be skipped"));
Assertions.assertTrue(output.getOut().contains("entry : account-default.properties will be skipped"));
Assertions.assertThat(result.data()).containsExactlyInAnyOrderEntriesOf(Map.of("one", "1111", "four", "4"));
Assertions.assertThat(output.getOut()).contains("entry : account.properties will be skipped");
Assertions.assertThat(output.getOut()).contains("entry : account-default.properties will be skipped");
}
@@ -396,7 +398,7 @@ class ConfigUtilsProcessSourceTests {
Map<String, String> sourceRawData = Map.of("one", "1", "account-k8s.properties", "one=11");
boolean result = ConfigUtils.processSource(includeDefaultProfileData, environment, sourceName, sourceRawData);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
/**
@@ -451,8 +453,8 @@ class ConfigUtilsProcessSourceTests {
MultipleSourcesContainer result = ConfigUtils.processNamedData(strippedSources, environment, sourceNames,
namespace, decode, includeDefaultProfileData);
Assertions.assertNotNull(result);
Assertions.assertEquals(result.names().toString(), "[account-k8s]");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("account-k8s");
/**
* <pre>
@@ -471,10 +473,10 @@ class ConfigUtilsProcessSourceTests {
* (because 'prod' is not an active profile)
* </pre>
*/
Assertions.assertEquals(result.data(), Map.of("one", "1111", "five", "5"));
Assertions.assertTrue(output.getOut().contains("entry : account-prod.properties will be skipped"));
Assertions.assertTrue(output.getOut().contains("entry : account.properties will be skipped"));
Assertions.assertTrue(output.getOut().contains("entry : account-default.properties will be skipped"));
Assertions.assertThat(result.data()).containsExactlyInAnyOrderEntriesOf(Map.of("one", "1111", "five", "5"));
Assertions.assertThat(output.getOut()).contains("entry : account-prod.properties will be skipped");
Assertions.assertThat(output.getOut()).contains("entry : account.properties will be skipped");
Assertions.assertThat(output.getOut()).contains("entry : account-default.properties will be skipped");
}

16
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsRawDataContainsProfileBasedSourceTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.commons.config;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
/**
@@ -35,7 +35,7 @@ class ConfigUtilsRawDataContainsProfileBasedSourceTests {
Map<String, String> rawData = null;
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
@Test
@@ -44,7 +44,7 @@ class ConfigUtilsRawDataContainsProfileBasedSourceTests {
Map<String, String> rawData = Map.of("account-k8s.yaml", "value");
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
@Test
@@ -53,7 +53,7 @@ class ConfigUtilsRawDataContainsProfileBasedSourceTests {
Map<String, String> rawData = Map.of("account", "value");
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
@Test
@@ -62,7 +62,7 @@ class ConfigUtilsRawDataContainsProfileBasedSourceTests {
Map<String, String> rawData = Map.of("account-dev.yml", "value");
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
@Test
@@ -71,7 +71,7 @@ class ConfigUtilsRawDataContainsProfileBasedSourceTests {
Map<String, String> rawData = Map.of("account-dev.yml", "value");
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
@Test
@@ -80,7 +80,7 @@ class ConfigUtilsRawDataContainsProfileBasedSourceTests {
Map<String, String> rawData = Map.of("account-dev.yaml", "value");
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
@Test
@@ -89,7 +89,7 @@ class ConfigUtilsRawDataContainsProfileBasedSourceTests {
Map<String, String> rawData = Map.of("account-dev.properties", "value");
boolean result = ConfigUtils.rawDataContainsProfileBasedSource(activeProfiles, rawData).getAsBoolean();
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
}

71
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsTests.java
View File

@@ -23,7 +23,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.mock.env.MockEnvironment;
@@ -38,54 +38,55 @@ class ConfigUtilsTests {
@Test
void testExplicitPrefixSet() {
ConfigUtils.Prefix result = ConfigUtils.findPrefix("explicitPrefix", null, false, "irrelevant");
Assertions.assertSame(result, ConfigUtils.Prefix.KNOWN);
Assertions.assertEquals(result.prefixProvider().get(), "explicitPrefix");
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.KNOWN);
Assertions.assertThat(result.prefixProvider().get()).isEqualTo("explicitPrefix");
}
@Test
void testUseNameAsPrefixTrue() {
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", Boolean.TRUE, false, "name-to-use");
Assertions.assertSame(result, ConfigUtils.Prefix.KNOWN);
Assertions.assertEquals(result.prefixProvider().get(), "name-to-use");
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.KNOWN);
Assertions.assertThat(result.prefixProvider().get()).isEqualTo("name-to-use");
}
@Test
void testUseNameAsPrefixFalse() {
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", Boolean.FALSE, false, "name-not-to-use");
Assertions.assertSame(result, ConfigUtils.Prefix.DEFAULT);
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.DEFAULT);
}
@Test
void testDefaultUseNameAsPrefixTrue() {
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", null, true, "name-to-use");
Assertions.assertSame(result, ConfigUtils.Prefix.KNOWN);
Assertions.assertEquals(result.prefixProvider().get(), "name-to-use");
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.KNOWN);
Assertions.assertThat(result.prefixProvider().get()).isEqualTo("name-to-use");
}
@Test
void testNoMatch() {
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", null, false, "name-not-to-use");
Assertions.assertSame(result, ConfigUtils.Prefix.DEFAULT);
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.DEFAULT);
}
@Test
void testUnsetEmpty() {
ConfigUtils.Prefix result = ConfigUtils.findPrefix("", null, false, "name-not-to-use");
Assertions.assertSame(result, ConfigUtils.Prefix.DEFAULT);
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.DEFAULT);
String expected = Assertions.assertDoesNotThrow(() -> result.prefixProvider().get());
Assertions.assertEquals("", expected);
String[] expected = new String[1];
Assertions.assertThatCode(() -> expected[0] = result.prefixProvider().get()).doesNotThrowAnyException();
Assertions.assertThat(expected[0]).isEmpty();
}
@Test
void testDelayed() {
ConfigUtils.Prefix result = ConfigUtils.findPrefix(null, true, false, null);
Assertions.assertSame(result, ConfigUtils.Prefix.DELAYED);
Assertions.assertThat(result).isSameAs(ConfigUtils.Prefix.DELAYED);
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class,
() -> result.prefixProvider().get());
Assertions.assertThatThrownBy(() -> result.prefixProvider().get())
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("prefix is delayed, needs to be taken elsewhere");
Assertions.assertEquals("prefix is delayed, needs to be taken elsewhere", ex.getMessage());
}
/**
@@ -101,7 +102,7 @@ class ConfigUtilsTests {
*/
@Test
void testUseIncludeProfileSpecificSourcesOnlyDefaultSet() {
Assertions.assertTrue(ConfigUtils.includeProfileSpecificSources(true, null));
Assertions.assertThat(ConfigUtils.includeProfileSpecificSources(true, null)).isTrue();
}
/**
@@ -117,7 +118,7 @@ class ConfigUtilsTests {
*/
@Test
void testUseIncludeProfileSpecificSourcesOnlyDefaultNotSet() {
Assertions.assertFalse(ConfigUtils.includeProfileSpecificSources(false, null));
Assertions.assertThat(ConfigUtils.includeProfileSpecificSources(false, null)).isFalse();
}
/**
@@ -136,7 +137,7 @@ class ConfigUtilsTests {
*/
@Test
void testUseIncludeProfileSpecificSourcesSourcesOverridesDefault() {
Assertions.assertFalse(ConfigUtils.includeProfileSpecificSources(true, false));
Assertions.assertThat(ConfigUtils.includeProfileSpecificSources(true, false)).isFalse();
}
@Test
@@ -146,10 +147,10 @@ class ConfigUtilsTests {
SourceData result = ConfigUtils.withPrefix("configmap", context);
Assertions.assertEquals(result.sourceName(), "configmap.name1.name2.namespace");
Assertions.assertThat(result.sourceName()).isEqualTo("configmap.name1.name2.namespace");
Assertions.assertEquals(result.sourceData().get("prefix.a"), "b");
Assertions.assertEquals(result.sourceData().get("prefix.c"), "d");
Assertions.assertThat(result.sourceData().get("prefix.a")).isEqualTo("b");
Assertions.assertThat(result.sourceData().get("prefix.c")).isEqualTo("d");
}
/*
@@ -161,10 +162,10 @@ class ConfigUtilsTests {
Set.of("namec", "namea", "nameb"));
SourceData result = ConfigUtils.withPrefix("configmap", context);
Assertions.assertEquals(result.sourceName(), "configmap.namea.nameb.namec.namespace");
Assertions.assertThat(result.sourceName()).isEqualTo("configmap.namea.nameb.namec.namespace");
Assertions.assertEquals(result.sourceData().get("prefix.a"), "b");
Assertions.assertEquals(result.sourceData().get("prefix.c"), "d");
Assertions.assertThat(result.sourceData().get("prefix.a")).isEqualTo("b");
Assertions.assertThat(result.sourceData().get("prefix.c")).isEqualTo("d");
}
/**
@@ -192,36 +193,36 @@ class ConfigUtilsTests {
MultipleSourcesContainer result = ConfigUtils.processNamedData(List.of(configMapOne, configMapOneK8s),
new MockEnvironment(), sourceNames, "default", false);
Assertions.assertEquals(result.data().size(), 3);
Assertions.assertEquals(result.data().get("propA"), "AA");
Assertions.assertEquals(result.data().get("propB"), "B");
Assertions.assertEquals(result.data().get("propC"), "C");
Assertions.assertThat(result.data().size()).isEqualTo(3);
Assertions.assertThat(result.data().get("propA")).isEqualTo("AA");
Assertions.assertThat(result.data().get("propB")).isEqualTo("B");
Assertions.assertThat(result.data().get("propC")).isEqualTo("C");
}
@Test
void testKeysWithPrefixNullMap() {
Map<String, String> result = ConfigUtils.keysWithPrefix(null, "");
Assertions.assertTrue(result.isEmpty());
Assertions.assertThat(result.isEmpty()).isTrue();
}
@Test
void testKeysWithPrefixEmptyMap() {
Map<String, String> result = ConfigUtils.keysWithPrefix(Map.of(), "");
Assertions.assertTrue(result.isEmpty());
Assertions.assertThat(result.isEmpty()).isTrue();
}
@Test
void testKeysWithPrefixEmptyPrefix() {
Map<String, String> result = ConfigUtils.keysWithPrefix(Map.of("a", "b"), "");
Assertions.assertFalse(result.isEmpty());
Assertions.assertEquals(Map.of("a", "b"), result);
Assertions.assertThat(result.isEmpty()).isFalse();
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("a", "b"));
}
@Test
void testKeysWithPrefixNonEmptyPrefix() {
Map<String, String> result = ConfigUtils.keysWithPrefix(Map.of("a", "b", "c", "d"), "prefix-");
Assertions.assertFalse(result.isEmpty());
Assertions.assertEquals(Map.of("prefix-a", "b", "prefix-c", "d"), result);
Assertions.assertThat(result.isEmpty()).isFalse();
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("prefix-a", "b", "prefix-c", "d"));
}
@Test

36
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLoaderTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.commons.config;
import java.io.IOException;
import java.util.List;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.BootstrapRegistry;
@@ -60,7 +60,7 @@ class KubernetesConfigDataLoaderTests {
@Test
void testIsLoadable() {
KubernetesConfigDataLoader loader = new KubernetesConfigDataLoader();
Assertions.assertTrue(loader.isLoadable(null, null));
Assertions.assertThat(loader.isLoadable(null, null)).isTrue();
}
/**
@@ -76,14 +76,14 @@ class KubernetesConfigDataLoaderTests {
MockPropertySource propertySource = new MockPropertySource("k8s");
Assertions.assertNotNull(configData);
Assertions.assertEquals(0, configData.getPropertySources().size());
Assertions.assertThat(configData).isNotNull();
Assertions.assertThat(configData.getPropertySources()).isEmpty();
ConfigData.Options options = configData.getOptions(propertySource);
Assertions.assertNotNull(options);
Assertions.assertTrue(options.contains(ConfigData.Option.IGNORE_IMPORTS));
Assertions.assertTrue(options.contains(ConfigData.Option.IGNORE_PROFILES));
Assertions.assertThat(options).isNotNull();
Assertions.assertThat(options.contains(ConfigData.Option.IGNORE_IMPORTS)).isTrue();
Assertions.assertThat(options.contains(ConfigData.Option.IGNORE_PROFILES)).isTrue();
Assertions.assertFalse(options.contains(ConfigData.Option.PROFILE_SPECIFIC));
Assertions.assertThat(options.contains(ConfigData.Option.PROFILE_SPECIFIC)).isFalse();
}
/**
@@ -101,14 +101,14 @@ class KubernetesConfigDataLoaderTests {
MockPropertySource propertySource = new MockPropertySource("k8s-dev");
Assertions.assertNotNull(configData);
Assertions.assertEquals(0, configData.getPropertySources().size());
Assertions.assertThat(configData).isNotNull();
Assertions.assertThat(configData.getPropertySources()).isEmpty();
ConfigData.Options options = configData.getOptions(propertySource);
Assertions.assertNotNull(options);
Assertions.assertTrue(options.contains(ConfigData.Option.IGNORE_IMPORTS));
Assertions.assertTrue(options.contains(ConfigData.Option.IGNORE_PROFILES));
Assertions.assertThat(options).isNotNull();
Assertions.assertThat(options.contains(ConfigData.Option.IGNORE_IMPORTS)).isTrue();
Assertions.assertThat(options.contains(ConfigData.Option.IGNORE_PROFILES)).isTrue();
Assertions.assertTrue(options.contains(ConfigData.Option.PROFILE_SPECIFIC));
Assertions.assertThat(options.contains(ConfigData.Option.PROFILE_SPECIFIC)).isTrue();
}
/**
@@ -135,10 +135,10 @@ class KubernetesConfigDataLoaderTests {
KubernetesConfigDataLoader loader = new KubernetesConfigDataLoader();
ConfigData configData = loader.load(CONTEXT, EMPTY_RESOURCE);
Assertions.assertNotNull(configData);
Assertions.assertEquals(2, configData.getPropertySources().size());
Assertions.assertEquals("k8s-secrets", configData.getPropertySources().get(0).getName());
Assertions.assertEquals("k8s-config-map", configData.getPropertySources().get(1).getName());
Assertions.assertThat(configData).isNotNull();
Assertions.assertThat(configData.getPropertySources().size()).isEqualTo(2);
Assertions.assertThat(configData.getPropertySources().get(0).getName()).isEqualTo("k8s-secrets");
Assertions.assertThat(configData.getPropertySources().get(1).getName()).isEqualTo("k8s-config-map");
}
}

73
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLocationResolverTests.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -58,7 +58,7 @@ class KubernetesConfigDataLocationResolverTests {
@Test
void testGetPrefix() {
Assertions.assertEquals("kubernetes:", NOOP_RESOLVER.getPrefix());
Assertions.assertThat(NOOP_RESOLVER.getPrefix()).isEqualTo("kubernetes:");
}
/**
@@ -75,7 +75,7 @@ class KubernetesConfigDataLocationResolverTests {
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
boolean result = NOOP_RESOLVER.isResolvable(RESOLVER_CONTEXT, configDataLocation);
Assertions.assertTrue(result);
Assertions.assertThat(result).isTrue();
}
@Test
@@ -88,14 +88,14 @@ class KubernetesConfigDataLocationResolverTests {
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
boolean result = NOOP_RESOLVER.isResolvable(RESOLVER_CONTEXT, configDataLocation);
Assertions.assertFalse(result);
Assertions.assertThat(result).isFalse();
}
@Test
void testResolve() {
ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
List<KubernetesConfigDataResource> result = NOOP_RESOLVER.resolve(RESOLVER_CONTEXT, configDataLocation);
Assertions.assertEquals(0, result.size());
Assertions.assertThat(result).isEmpty();
}
/**
@@ -123,14 +123,16 @@ class KubernetesConfigDataLocationResolverTests {
List<KubernetesConfigDataResource> result = NOOP_RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT,
configDataLocation, profiles);
Assertions.assertEquals(1, result.size());
Assertions.assertEquals("k8s-app-name",
result.get(0).getEnvironment().getRequiredProperty("spring.application.name"));
Assertions.assertEquals("non-default-namespace",
result.get(0).getEnvironment().getRequiredProperty("spring.cloud.kubernetes.client.namespace"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getEnvironment().getRequiredProperty("spring.application.name"))
.isEqualTo("k8s-app-name");
Assertions
.assertThat(result.get(0).getEnvironment().getRequiredProperty("spring.cloud.kubernetes.client.namespace"))
.isEqualTo("non-default-namespace");
// ensures that we called 'bindOrCreate' and as such @Default is picked-up
Assertions.assertEquals("Spring-Cloud-Kubernetes-Application", result.get(0).getProperties().userAgent());
Assertions.assertEquals("non-default-namespace", result.get(0).getProperties().namespace());
Assertions.assertThat(result.get(0).getProperties().userAgent())
.isEqualTo("Spring-Cloud-Kubernetes-Application");
Assertions.assertThat(result.get(0).getProperties().namespace()).isEqualTo("non-default-namespace");
}
@@ -165,14 +167,15 @@ class KubernetesConfigDataLocationResolverTests {
List<KubernetesConfigDataResource> result = NOOP_RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT,
configDataLocation, profiles);
Assertions.assertEquals(1, result.size());
Assertions.assertEquals("k8s-app-name",
result.get(0).getEnvironment().getRequiredProperty("spring.application.name"));
Assertions.assertEquals("non-default-namespace",
result.get(0).getEnvironment().getRequiredProperty("spring.cloud.kubernetes.client.namespace"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getEnvironment().getRequiredProperty("spring.application.name"))
.isEqualTo("k8s-app-name");
Assertions
.assertThat(result.get(0).getEnvironment().getRequiredProperty("spring.cloud.kubernetes.client.namespace"))
.isEqualTo("non-default-namespace");
// ensures we bind existing from bootstrap context, and not call 'bindOrCreate'
Assertions.assertEquals("user-agent", result.get(0).getProperties().userAgent());
Assertions.assertEquals("non-default-namespace", result.get(0).getProperties().namespace());
Assertions.assertThat(result.get(0).getProperties().userAgent()).isEqualTo("user-agent");
Assertions.assertThat(result.get(0).getProperties().namespace()).isEqualTo("non-default-namespace");
}
/**
@@ -198,9 +201,9 @@ class KubernetesConfigDataLocationResolverTests {
SecretsConfigProperties secretsConfigProperties = RESOLVER_CONTEXT.getBootstrapContext()
.get(SecretsConfigProperties.class);
Assertions.assertNotNull(kubernetesClientProperties);
Assertions.assertNotNull(configMapConfigProperties);
Assertions.assertNotNull(secretsConfigProperties);
Assertions.assertThat(kubernetesClientProperties).isNotNull();
Assertions.assertThat(configMapConfigProperties).isNotNull();
Assertions.assertThat(secretsConfigProperties).isNotNull();
}
/**
@@ -237,9 +240,9 @@ class KubernetesConfigDataLocationResolverTests {
SecretsConfigProperties secretsConfigProperties = RESOLVER_CONTEXT.getBootstrapContext()
.getOrElse(SecretsConfigProperties.class, two);
Assertions.assertNotNull(kubernetesClientProperties);
Assertions.assertSame(one, configMapConfigProperties);
Assertions.assertSame(two, secretsConfigProperties);
Assertions.assertThat(kubernetesClientProperties).isNotNull();
Assertions.assertThat(one).isSameAs(configMapConfigProperties);
Assertions.assertThat(two).isSameAs(secretsConfigProperties);
}
/**
@@ -261,10 +264,10 @@ class KubernetesConfigDataLocationResolverTests {
configDataLocation, profiles);
// we have @DefaultValue("true") boolean enableApi
Assertions.assertTrue(result.get(0).getConfigMapProperties().enableApi());
Assertions.assertThat(result.get(0).getConfigMapProperties().enableApi()).isTrue();
// we have @DefaultValue("true") boolean enabled
Assertions.assertTrue(result.get(0).getSecretsConfigProperties().enabled());
Assertions.assertThat(result.get(0).getSecretsConfigProperties().enabled()).isTrue();
}
/**
@@ -290,15 +293,15 @@ class KubernetesConfigDataLocationResolverTests {
// we have @DefaultValue("true") boolean enableApi, but it is not going to be
// picked up
// because of the explicit property we set in environment
Assertions.assertFalse(result.get(0).getConfigMapProperties().enableApi());
Assertions.assertThat(result.get(0).getConfigMapProperties().enableApi()).isFalse();
// on the other hand, @Default will be picked here
Assertions.assertTrue(result.get(0).getConfigMapProperties().enabled());
Assertions.assertThat(result.get(0).getConfigMapProperties().enabled()).isTrue();
// we have @DefaultValue enabled on paths, but it is not going to be picked up
// because of the explicit property we set in environment
Assertions.assertEquals("a", result.get(0).getSecretsConfigProperties().paths().get(0));
Assertions.assertThat(result.get(0).getSecretsConfigProperties().paths().get(0)).isEqualTo("a");
// on the other hand, @Default will be picked here
Assertions.assertTrue(result.get(0).getSecretsConfigProperties().includeProfileSpecificSources());
Assertions.assertThat(result.get(0).getSecretsConfigProperties().includeProfileSpecificSources()).isTrue();
}
@Test
@@ -315,7 +318,7 @@ class KubernetesConfigDataLocationResolverTests {
List<KubernetesConfigDataResource> result = NOOP_RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT,
configDataLocation, profiles);
Assertions.assertFalse(result.get(0).isOptional());
Assertions.assertThat(result.get(0).isOptional()).isFalse();
}
@Test
@@ -334,9 +337,9 @@ class KubernetesConfigDataLocationResolverTests {
List<KubernetesConfigDataResource> result = NOOP_RESOLVER.resolveProfileSpecific(RESOLVER_CONTEXT,
configDataLocation, profiles);
Assertions.assertEquals(List.of("a", "b"),
Arrays.stream(result.get(0).getEnvironment().getActiveProfiles()).toList());
Assertions.assertEquals("a,b", result.get(0).getProfiles());
Assertions.assertThat(Arrays.stream(result.get(0).getEnvironment().getActiveProfiles()).toList())
.containsExactly("a", "b");
Assertions.assertThat(result.get(0).getProfiles()).isEqualTo("a,b");
}
}

30
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/LabeledConfigMapNormalizedSourceTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.kubernetes.commons.config;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
/**
@@ -35,44 +35,44 @@ class LabeledConfigMapNormalizedSourceTests {
LabeledConfigMapNormalizedSource right = new LabeledConfigMapNormalizedSource("name", Map.of("key", "value"),
true, false);
Assertions.assertEquals(left.hashCode(), right.hashCode());
Assertions.assertEquals(left, right);
Assertions.assertThat(left.hashCode()).isEqualTo(right.hashCode());
Assertions.assertThat(left).isEqualTo(right);
}
@Test
void testType() {
LabeledConfigMapNormalizedSource source = new LabeledConfigMapNormalizedSource("name", Map.of("key", "value"),
false, false);
Assertions.assertSame(source.type(), NormalizedSourceType.LABELED_CONFIG_MAP);
Assertions.assertThat(source.type()).isSameAs(NormalizedSourceType.LABELED_CONFIG_MAP);
}
@Test
void testTarget() {
LabeledConfigMapNormalizedSource source = new LabeledConfigMapNormalizedSource("name", Map.of("key", "value"),
false, false);
Assertions.assertEquals(source.target(), "configmap");
Assertions.assertThat(source.target()).isEqualTo("configmap");
}
@Test
void testConstructorFields() {
LabeledConfigMapNormalizedSource source = new LabeledConfigMapNormalizedSource("namespace",
Map.of("key", "value"), false, PREFIX, true);
Assertions.assertEquals(source.labels(), Map.of("key", "value"));
Assertions.assertEquals(source.namespace().get(), "namespace");
Assertions.assertFalse(source.failFast());
Assertions.assertSame(PREFIX, source.prefix());
Assertions.assertTrue(source.profileSpecificSources());
Assertions.assertThat(source.labels()).containsExactlyInAnyOrderEntriesOf(Map.of("key", "value"));
Assertions.assertThat(source.namespace().get()).isEqualTo("namespace");
Assertions.assertThat(source.failFast()).isFalse();
Assertions.assertThat(PREFIX).isSameAs(source.prefix());
Assertions.assertThat(source.profileSpecificSources()).isTrue();
}
@Test
void testConstructorWithoutPrefixFields() {
LabeledConfigMapNormalizedSource source = new LabeledConfigMapNormalizedSource("namespace",
Map.of("key", "value"), true, true);
Assertions.assertEquals(source.labels(), Map.of("key", "value"));
Assertions.assertEquals(source.namespace().get(), "namespace");
Assertions.assertTrue(source.failFast());
Assertions.assertSame(ConfigUtils.Prefix.DEFAULT, source.prefix());
Assertions.assertTrue(source.profileSpecificSources());
Assertions.assertThat(source.labels()).containsExactlyInAnyOrderEntriesOf(Map.of("key", "value"));
Assertions.assertThat(source.namespace().get()).isEqualTo("namespace");
Assertions.assertThat(source.failFast()).isTrue();
Assertions.assertThat(ConfigUtils.Prefix.DEFAULT).isSameAs(source.prefix());
Assertions.assertThat(source.profileSpecificSources()).isTrue();
}
}

32
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/LabeledSecretNormalizedSourceTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.commons.config;
import java.util.Collections;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
/**
@@ -34,8 +34,8 @@ class LabeledSecretNormalizedSourceTests {
LabeledSecretNormalizedSource left = new LabeledSecretNormalizedSource("namespace", labels, false, false);
LabeledSecretNormalizedSource right = new LabeledSecretNormalizedSource("namespace", labels, true, false);
Assertions.assertEquals(left.hashCode(), right.hashCode());
Assertions.assertEquals(left, right);
Assertions.assertThat(left.hashCode()).isEqualTo(right.hashCode());
Assertions.assertThat(left).isEqualTo(right);
}
/*
@@ -53,26 +53,26 @@ class LabeledSecretNormalizedSourceTests {
LabeledSecretNormalizedSource right = new LabeledSecretNormalizedSource("namespace", labels, true, knownRight,
false);
Assertions.assertEquals(left.hashCode(), right.hashCode());
Assertions.assertEquals(left, right);
Assertions.assertThat(left.hashCode()).isEqualTo(right.hashCode());
Assertions.assertThat(left).isEqualTo(right);
}
@Test
void testType() {
LabeledSecretNormalizedSource source = new LabeledSecretNormalizedSource("namespace", labels, false, false);
Assertions.assertSame(source.type(), NormalizedSourceType.LABELED_SECRET);
Assertions.assertThat(source.type()).isSameAs(NormalizedSourceType.LABELED_SECRET);
}
@Test
void testImmutableGetLabels() {
LabeledSecretNormalizedSource source = new LabeledSecretNormalizedSource("namespace", labels, false, false);
Assertions.assertThrows(RuntimeException.class, () -> source.labels().put("c", "d"));
Assertions.assertThatThrownBy(() -> source.labels().put("c", "d")).isInstanceOf(RuntimeException.class);
}
@Test
void testTarget() {
LabeledSecretNormalizedSource source = new LabeledSecretNormalizedSource("namespace", labels, false, false);
Assertions.assertEquals(source.target(), "secret");
Assertions.assertThat(source.target()).isEqualTo("secret");
}
@Test
@@ -80,19 +80,19 @@ class LabeledSecretNormalizedSourceTests {
ConfigUtils.Prefix prefix = ConfigUtils.findPrefix("prefix", false, false, "some");
LabeledSecretNormalizedSource source = new LabeledSecretNormalizedSource("namespace", labels, false, prefix,
true);
Assertions.assertTrue(source.name().isEmpty());
Assertions.assertEquals(source.namespace().get(), "namespace");
Assertions.assertFalse(source.failFast());
Assertions.assertTrue(source.profileSpecificSources());
Assertions.assertThat(source.name().isEmpty()).isTrue();
Assertions.assertThat(source.namespace().get()).isEqualTo("namespace");
Assertions.assertThat(source.failFast()).isFalse();
Assertions.assertThat(source.profileSpecificSources()).isTrue();
}
@Test
void testConstructorWithoutPrefixFields() {
LabeledSecretNormalizedSource source = new LabeledSecretNormalizedSource("namespace", labels, true, true);
Assertions.assertEquals(source.namespace().get(), "namespace");
Assertions.assertTrue(source.failFast());
Assertions.assertSame(ConfigUtils.Prefix.DEFAULT, source.prefix());
Assertions.assertTrue(source.profileSpecificSources());
Assertions.assertThat(source.namespace().get()).isEqualTo("namespace");
Assertions.assertThat(source.failFast()).isTrue();
Assertions.assertThat(ConfigUtils.Prefix.DEFAULT).isSameAs(source.prefix());
Assertions.assertThat(source.profileSpecificSources()).isTrue();
}
}

16
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/NamedConfigMapNormalizedSourceTests.java
View File

@@ -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;
/**
@@ -37,8 +37,8 @@ class NamedConfigMapNormalizedSourceTests {
NamedConfigMapNormalizedSource right = new NamedConfigMapNormalizedSource("name", "namespace", true, knownRight,
false);
Assertions.assertEquals(left.hashCode(), right.hashCode());
Assertions.assertEquals(left, right);
Assertions.assertThat(left.hashCode()).isEqualTo(right.hashCode());
Assertions.assertThat(left).isEqualTo(right);
}
@Test
@@ -46,23 +46,23 @@ class NamedConfigMapNormalizedSourceTests {
NamedConfigMapNormalizedSource one = new NamedConfigMapNormalizedSource("name", "namespace", false, PREFIX,
true);
Assertions.assertSame(one.type(), NormalizedSourceType.NAMED_CONFIG_MAP);
Assertions.assertThat(one.type()).isSameAs(NormalizedSourceType.NAMED_CONFIG_MAP);
}
@Test
void testTarget() {
NamedConfigMapNormalizedSource one = new NamedConfigMapNormalizedSource("name", "namespace", false, PREFIX,
true);
Assertions.assertEquals(one.target(), "configmap");
Assertions.assertThat(one.target()).isEqualTo("configmap");
}
@Test
void testConstructorFields() {
NamedConfigMapNormalizedSource one = new NamedConfigMapNormalizedSource("name", "namespace", false, PREFIX,
true);
Assertions.assertEquals(one.name().get(), "name");
Assertions.assertEquals(one.namespace().get(), "namespace");
Assertions.assertFalse(one.failFast());
Assertions.assertThat(one.name().get()).isEqualTo("name");
Assertions.assertThat(one.namespace().get()).isEqualTo("namespace");
Assertions.assertThat(one.failFast()).isFalse();
}
}

30
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/NamedSecretNormalizedSourceTests.java
View File

@@ -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;
/**
@@ -31,40 +31,40 @@ class NamedSecretNormalizedSourceTests {
NamedSecretNormalizedSource left = new NamedSecretNormalizedSource("name", "namespace", false, false);
NamedSecretNormalizedSource right = new NamedSecretNormalizedSource("name", "namespace", true, false);
Assertions.assertEquals(left.hashCode(), right.hashCode());
Assertions.assertEquals(left, right);
Assertions.assertThat(left.hashCode()).isEqualTo(right.hashCode());
Assertions.assertThat(left).isEqualTo(right);
}
@Test
void testType() {
NamedSecretNormalizedSource source = new NamedSecretNormalizedSource("name", "namespace", false, false);
Assertions.assertSame(source.type(), NormalizedSourceType.NAMED_SECRET);
Assertions.assertThat(source.type()).isEqualTo(NormalizedSourceType.NAMED_SECRET);
}
@Test
void testTarget() {
NamedSecretNormalizedSource source = new NamedSecretNormalizedSource("name", "namespace", false, false);
Assertions.assertEquals(source.target(), "secret");
Assertions.assertThat(source.target()).isEqualTo("secret");
}
@Test
void testConstructorFields() {
NamedSecretNormalizedSource source = new NamedSecretNormalizedSource("name", "namespace", false, PREFIX, true);
Assertions.assertEquals(source.name().get(), "name");
Assertions.assertEquals(source.namespace().get(), "namespace");
Assertions.assertFalse(source.failFast());
Assertions.assertSame(PREFIX, source.prefix());
Assertions.assertTrue(source.profileSpecificSources());
Assertions.assertThat(source.name().get()).isEqualTo("name");
Assertions.assertThat(source.namespace().get()).isEqualTo("namespace");
Assertions.assertThat(source.failFast()).isFalse();
Assertions.assertThat(source.prefix()).isEqualTo(PREFIX);
Assertions.assertThat(source.profileSpecificSources()).isTrue();
}
@Test
void testConstructorWithoutPrefixFields() {
NamedSecretNormalizedSource source = new NamedSecretNormalizedSource("name", "namespace", true, true);
Assertions.assertEquals(source.name().get(), "name");
Assertions.assertEquals(source.namespace().get(), "namespace");
Assertions.assertTrue(source.failFast());
Assertions.assertSame(ConfigUtils.Prefix.DEFAULT, source.prefix());
Assertions.assertTrue(source.profileSpecificSources());
Assertions.assertThat(source.name().get()).isEqualTo("name");
Assertions.assertThat(source.namespace().get()).isEqualTo("namespace");
Assertions.assertThat(source.failFast()).isTrue();
Assertions.assertThat(ConfigUtils.Prefix.DEFAULT).isSameAs(source.prefix());
Assertions.assertThat(source.profileSpecificSources()).isTrue();
}
}

88
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigPropertiesBindingTests.java
View File

@@ -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 SecretsConfigPropertiesBindingTests {
void testWithDefaults() {
new ApplicationContextRunner().withUserConfiguration(Config.class).run(context -> {
SecretsConfigProperties props = context.getBean(SecretsConfigProperties.class);
Assertions.assertNotNull(props);
Assertions.assertFalse(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()).isFalse();
Assertions.assertThat(props.paths()).isEmpty();
Assertions.assertThat(props.sources()).isEmpty();
Assertions.assertThat(props.labels()).isEmpty();
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 SecretsConfigPropertiesBindingTests {
"spring.cloud.kubernetes.secrets.retry.enabled=false")
.run(context -> {
SecretsConfigProperties props = context.getBean(SecretsConfigProperties.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);
SecretsConfigProperties.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();
});
}

94
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigPropertiesTests.java
View File

@@ -16,14 +16,13 @@
package org.springframework.cloud.kubernetes.commons.config;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
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;
@@ -43,10 +42,10 @@ class SecretsConfigPropertiesTests {
null, "namespace", false, true, false, RetryProperties.DEFAULT);
List<NormalizedSource> source = properties.determineSources(new MockEnvironment());
Assertions.assertEquals(source.size(), 1);
Assertions.assertTrue(source.get(0) instanceof NamedSecretNormalizedSource);
Assertions.assertTrue(source.get(0).name().isPresent());
Assertions.assertEquals(source.get(0).name().get(), "application");
Assertions.assertThat(source.size()).isEqualTo(1);
Assertions.assertThat(source.get(0) instanceof NamedSecretNormalizedSource).isTrue();
Assertions.assertThat(source.get(0).name().isPresent()).isTrue();
Assertions.assertThat(source.get(0).name().get()).isEqualTo("application");
}
/**
@@ -84,30 +83,27 @@ class SecretsConfigPropertiesTests {
List.of(one, two, three), true, null, "namespace", false, true, false, RetryProperties.DEFAULT);
List<NormalizedSource> result = properties.determineSources(new MockEnvironment());
Assertions.assertEquals(result.size(), 6);
Assertions.assertThat(result.size()).isEqualTo(6);
Set<NormalizedSource> resultAsSet = new LinkedHashSet<>(result);
Assertions.assertEquals(resultAsSet.size(), 5);
Assertions.assertThat(resultAsSet.size()).isEqualTo(5);
Iterator<NormalizedSource> iterator = resultAsSet.iterator();
NormalizedSource oneResult = iterator.next();
Assertions.assertEquals(oneResult.name().get(), "one");
Assertions.assertThat(oneResult.name().get()).isEqualTo("one");
NormalizedSource twoResult = iterator.next();
Assertions.assertEquals(((LabeledSecretNormalizedSource) twoResult).labels(),
Collections.singletonMap("one", "1"));
Assertions.assertThat(((LabeledSecretNormalizedSource) twoResult).labels()).isEqualTo(Map.of("one", "1"));
NormalizedSource threeResult = iterator.next();
Assertions.assertEquals(threeResult.name().get(), "application");
Assertions.assertThat(threeResult.name().get()).isEqualTo("application");
NormalizedSource fourResult = iterator.next();
Assertions.assertEquals(((LabeledSecretNormalizedSource) fourResult).labels(),
Collections.singletonMap("two", "2"));
Assertions.assertThat(((LabeledSecretNormalizedSource) fourResult).labels()).isEqualTo(Map.of("two", "2"));
NormalizedSource fiveResult = iterator.next();
Assertions.assertEquals(((LabeledSecretNormalizedSource) fiveResult).labels(),
Collections.singletonMap("three", "3"));
Assertions.assertThat(((LabeledSecretNormalizedSource) fiveResult).labels()).isEqualTo(Map.of("three", "3"));
}
/**
@@ -129,9 +125,10 @@ class SecretsConfigPropertiesTests {
"secret-a", "namespace", false, true, false, RetryProperties.DEFAULT);
List<NormalizedSource> 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(((NamedSecretNormalizedSource) sources.get(0)).prefix(), ConfigUtils.Prefix.DEFAULT);
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(0)).prefix())
.isSameAs(ConfigUtils.Prefix.DEFAULT);
}
/**
@@ -155,11 +152,10 @@ class SecretsConfigPropertiesTests {
"secret-a", "namespace", true, true, false, RetryProperties.DEFAULT);
List<NormalizedSource> 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(((NamedSecretNormalizedSource) sources.get(0)).prefix(), ConfigUtils.Prefix.DEFAULT,
"empty sources must generate a List with a single NormalizedSource, where prefix is unset,"
+ "no matter of 'spring.cloud.kubernetes.secret.useNameAsPrefix' value");
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(0)).prefix())
.isSameAs(ConfigUtils.Prefix.DEFAULT);
}
/**
@@ -187,10 +183,10 @@ class SecretsConfigPropertiesTests {
"secret-one", null, false, true, false, RetryProperties.DEFAULT);
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
Assertions.assertEquals(sources.size(), 1, "a single NormalizedSource is expected");
Assertions.assertThat(sources.size()).isEqualTo(1);
Assertions.assertEquals(((NamedSecretNormalizedSource) sources.get(0)).prefix().prefixProvider().get(),
"secret-one");
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(0)).prefix().prefixProvider().get())
.isEqualTo("secret-one");
}
/**
@@ -230,13 +226,14 @@ class SecretsConfigPropertiesTests {
List.of(one, two, three), true, "secret-one", null, false, true, false, RetryProperties.DEFAULT);
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
Assertions.assertEquals(sources.size(), 3, "3 NormalizedSources are expected");
Assertions.assertThat(sources.size()).isEqualTo(3);
Assertions.assertSame(((NamedSecretNormalizedSource) sources.get(0)).prefix(), ConfigUtils.Prefix.DEFAULT);
Assertions.assertEquals(((NamedSecretNormalizedSource) sources.get(1)).prefix().prefixProvider().get(),
"secret-two");
Assertions.assertEquals(((NamedSecretNormalizedSource) sources.get(2)).prefix().prefixProvider().get(),
"secret-three");
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(0)).prefix())
.isSameAs(ConfigUtils.Prefix.DEFAULT);
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(1)).prefix().prefixProvider().get())
.isEqualTo("secret-two");
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(2)).prefix().prefixProvider().get())
.isEqualTo("secret-three");
}
/**
@@ -280,13 +277,16 @@ class SecretsConfigPropertiesTests {
RetryProperties.DEFAULT);
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
Assertions.assertEquals(sources.size(), 4, "4 NormalizedSources are expected");
Assertions.assertThat(sources.size()).isEqualTo(4);
Assertions.assertEquals(((NamedSecretNormalizedSource) sources.get(0)).prefix().prefixProvider().get(), "one");
Assertions.assertEquals(((NamedSecretNormalizedSource) sources.get(1)).prefix().prefixProvider().get(), "two");
Assertions.assertEquals(((NamedSecretNormalizedSource) sources.get(2)).prefix().prefixProvider().get(),
"three");
Assertions.assertSame(((NamedSecretNormalizedSource) sources.get(3)).prefix(), ConfigUtils.Prefix.DEFAULT);
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(0)).prefix().prefixProvider().get())
.isEqualTo("one");
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(1)).prefix().prefixProvider().get())
.isEqualTo("two");
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(2)).prefix().prefixProvider().get())
.isEqualTo("three");
Assertions.assertThat(((NamedSecretNormalizedSource) sources.get(3)).prefix())
.isSameAs(ConfigUtils.Prefix.DEFAULT);
}
/**
@@ -344,26 +344,26 @@ class SecretsConfigPropertiesTests {
// 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);
LabeledSecretNormalizedSource labeled1 = (LabeledSecretNormalizedSource) 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()).isFalse();
LabeledSecretNormalizedSource labeled3 = (LabeledSecretNormalizedSource) 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();
LabeledSecretNormalizedSource labeled5 = (LabeledSecretNormalizedSource) 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();
LabeledSecretNormalizedSource labeled7 = (LabeledSecretNormalizedSource) 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<NormalizedSource> set = new LinkedHashSet<>(sources);
Assertions.assertEquals(5, set.size());
Assertions.assertThat(set.size()).isEqualTo(5);
}
}

20
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SourceDataEntriesProcessorOrderedPropertiesTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.commons.config;
import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.mock.env.MockEnvironment;
@@ -42,7 +42,7 @@ class SourceDataEntriesProcessorOrderedPropertiesTests {
MockEnvironment mockEnvironment = new MockEnvironment();
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, mockEnvironment);
Assertions.assertEquals(Map.of("my-key", "my-value"), result);
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("my-key", "my-value"));
}
/**
@@ -58,7 +58,7 @@ class SourceDataEntriesProcessorOrderedPropertiesTests {
MockEnvironment mockEnvironment = new MockEnvironment();
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, mockEnvironment);
Assertions.assertEquals(Map.of("my-key", "from-app"), result);
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("my-key", "from-app"));
}
/**
@@ -86,7 +86,8 @@ class SourceDataEntriesProcessorOrderedPropertiesTests {
MockEnvironment mockEnvironment = new MockEnvironment();
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, mockEnvironment);
Assertions.assertEquals(Map.of("firstKey", "abc", "secondKey", "secondFromProperties"), result);
Assertions.assertThat(result)
.containsExactlyInAnyOrderEntriesOf(Map.of("firstKey", "abc", "secondKey", "secondFromProperties"));
}
/**
@@ -127,9 +128,9 @@ class SourceDataEntriesProcessorOrderedPropertiesTests {
mockEnvironment.setActiveProfiles("dev");
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, mockEnvironment);
Assertions.assertEquals(
Map.of("firstKey", "abc", "secondKey", "secondFromDevProperties", "thirdKey", "thirdFromProperties"),
result);
Assertions.assertThat(result)
.containsExactlyInAnyOrderEntriesOf(Map.of("firstKey", "abc", "secondKey", "secondFromDevProperties",
"thirdKey", "thirdFromProperties"));
}
/**
@@ -175,8 +176,9 @@ class SourceDataEntriesProcessorOrderedPropertiesTests {
mockEnvironment.setActiveProfiles("dev");
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, mockEnvironment);
Assertions.assertEquals(Map.of("firstKey", "abc", "secondKey", "secondFromDevProperties", "thirdKey",
"thirdFromProperties", "fourthKey", "def"), result);
Assertions.assertThat(result)
.containsExactlyInAnyOrderEntriesOf(Map.of("firstKey", "abc", "secondKey", "secondFromDevProperties",
"thirdKey", "thirdFromProperties", "fourthKey", "def"));
}
}

124
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SourceDataEntriesProcessorSortedTests.java
View File

@@ -20,7 +20,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.mock.env.MockEnvironment;
@@ -39,9 +39,9 @@ class SourceDataEntriesProcessorSortedTests {
MockEnvironment mockEnvironment = new MockEnvironment();
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getKey(), "simple-property");
Assertions.assertEquals(result.get(0).getValue(), "value");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getKey()).isEqualTo("simple-property");
Assertions.assertThat(result.get(0).getValue()).isEqualTo("value");
}
@Test
@@ -54,12 +54,12 @@ class SourceDataEntriesProcessorSortedTests {
MockEnvironment mockEnvironment = new MockEnvironment();
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result.get(0).getKey(), "one");
Assertions.assertEquals(result.get(0).getValue(), "1");
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result.get(0).getKey()).isEqualTo("one");
Assertions.assertThat(result.get(0).getValue()).isEqualTo("1");
Assertions.assertEquals(result.get(1).getKey(), "two");
Assertions.assertEquals(result.get(1).getValue(), "2");
Assertions.assertThat(result.get(1).getKey()).isEqualTo("two");
Assertions.assertThat(result.get(1).getValue()).isEqualTo("2");
}
@Test
@@ -71,9 +71,9 @@ class SourceDataEntriesProcessorSortedTests {
MockEnvironment mockEnvironment = new MockEnvironment();
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getKey(), Constants.APPLICATION_PROPERTIES);
Assertions.assertEquals(result.get(0).getValue(), "key=value");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getKey()).isEqualTo(Constants.APPLICATION_PROPERTIES);
Assertions.assertThat(result.get(0).getValue()).isEqualTo("key=value");
}
@Test
@@ -86,12 +86,12 @@ class SourceDataEntriesProcessorSortedTests {
MockEnvironment mockEnvironment = new MockEnvironment();
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result.get(0).getKey(), Constants.APPLICATION_PROPERTIES);
Assertions.assertEquals(result.get(0).getValue(), "key=value");
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result.get(0).getKey()).isEqualTo(Constants.APPLICATION_PROPERTIES);
Assertions.assertThat(result.get(0).getValue()).isEqualTo("key=value");
Assertions.assertEquals(result.get(1).getKey(), "simple");
Assertions.assertEquals(result.get(1).getValue(), "other_value");
Assertions.assertThat(result.get(1).getKey()).isEqualTo("simple");
Assertions.assertThat(result.get(1).getValue()).isEqualTo("other_value");
}
@Test
@@ -104,12 +104,12 @@ class SourceDataEntriesProcessorSortedTests {
MockEnvironment mockEnvironment = new MockEnvironment();
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result.get(0).getKey(), Constants.APPLICATION_PROPERTIES);
Assertions.assertEquals(result.get(0).getValue(), "key=value");
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result.get(0).getKey()).isEqualTo(Constants.APPLICATION_PROPERTIES);
Assertions.assertThat(result.get(0).getValue()).isEqualTo("key=value");
Assertions.assertEquals(result.get(1).getKey(), "simple");
Assertions.assertEquals(result.get(1).getValue(), "other_value");
Assertions.assertThat(result.get(1).getKey()).isEqualTo("simple");
Assertions.assertThat(result.get(1).getValue()).isEqualTo("other_value");
}
@Test
@@ -124,15 +124,15 @@ class SourceDataEntriesProcessorSortedTests {
mockEnvironment.setActiveProfiles("dev");
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 3);
Assertions.assertEquals(result.get(0).getKey(), Constants.APPLICATION_PROPERTIES);
Assertions.assertEquals(result.get(0).getValue(), "key=value");
Assertions.assertThat(result.size()).isEqualTo(3);
Assertions.assertThat(result.get(0).getKey()).isEqualTo(Constants.APPLICATION_PROPERTIES);
Assertions.assertThat(result.get(0).getValue()).isEqualTo("key=value");
Assertions.assertEquals(result.get(1).getKey(), "application-dev.properties");
Assertions.assertEquals(result.get(1).getValue(), "key-dev=value-dev");
Assertions.assertThat(result.get(1).getKey()).isEqualTo("application-dev.properties");
Assertions.assertThat(result.get(1).getValue()).isEqualTo("key-dev=value-dev");
Assertions.assertEquals(result.get(2).getKey(), "simple");
Assertions.assertEquals(result.get(2).getValue(), "other_value");
Assertions.assertThat(result.get(2).getKey()).isEqualTo("simple");
Assertions.assertThat(result.get(2).getValue()).isEqualTo("other_value");
}
@Test
@@ -147,10 +147,10 @@ class SourceDataEntriesProcessorSortedTests {
mockEnvironment.setActiveProfiles("dev");
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment, false);
Assertions.assertEquals(1, result.size());
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertEquals(result.get(0).getKey(), "application-dev.properties");
Assertions.assertEquals(result.get(0).getValue(), "key-dev=value-dev");
Assertions.assertThat(result.get(0).getKey()).isEqualTo("application-dev.properties");
Assertions.assertThat(result.get(0).getValue()).isEqualTo("key-dev=value-dev");
}
@Test
@@ -168,18 +168,18 @@ class SourceDataEntriesProcessorSortedTests {
mockEnvironment.setActiveProfiles("k8s");
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 4);
Assertions.assertEquals(result.get(0).getKey(), Constants.APPLICATION_PROPERTIES);
Assertions.assertEquals(result.get(0).getValue(), "key=value");
Assertions.assertThat(result.size()).isEqualTo(4);
Assertions.assertThat(result.get(0).getKey()).isEqualTo(Constants.APPLICATION_PROPERTIES);
Assertions.assertThat(result.get(0).getValue()).isEqualTo("key=value");
Assertions.assertEquals(result.get(1).getKey(), "application-k8s.properties");
Assertions.assertEquals(result.get(1).getValue(), "key-k8s=value-k8s");
Assertions.assertThat(result.get(1).getKey()).isEqualTo("application-k8s.properties");
Assertions.assertThat(result.get(1).getValue()).isEqualTo("key-k8s=value-k8s");
Assertions.assertEquals(result.get(2).getKey(), "simple");
Assertions.assertEquals(result.get(2).getValue(), "other_value");
Assertions.assertThat(result.get(2).getKey()).isEqualTo("simple");
Assertions.assertThat(result.get(2).getValue()).isEqualTo("other_value");
Assertions.assertEquals(result.get(3).getKey(), "second-simple");
Assertions.assertEquals(result.get(3).getValue(), "second_other_value");
Assertions.assertThat(result.get(3).getKey()).isEqualTo("second-simple");
Assertions.assertThat(result.get(3).getValue()).isEqualTo("second_other_value");
}
@Test
@@ -198,13 +198,13 @@ class SourceDataEntriesProcessorSortedTests {
mockEnvironment.setActiveProfiles("k8s");
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 2);
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertEquals(result.get(0).getKey(), "simple");
Assertions.assertEquals(result.get(0).getValue(), "other_value");
Assertions.assertThat(result.get(0).getKey()).isEqualTo("simple");
Assertions.assertThat(result.get(0).getValue()).isEqualTo("other_value");
Assertions.assertEquals(result.get(1).getKey(), "second-simple");
Assertions.assertEquals(result.get(1).getValue(), "second_other_value");
Assertions.assertThat(result.get(1).getKey()).isEqualTo("second-simple");
Assertions.assertThat(result.get(1).getValue()).isEqualTo("second_other_value");
}
@Test
@@ -223,18 +223,18 @@ class SourceDataEntriesProcessorSortedTests {
mockEnvironment.setActiveProfiles("k8s");
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 4);
Assertions.assertEquals(result.get(0).getKey(), "sorted.properties");
Assertions.assertEquals(result.get(0).getValue(), "key=value");
Assertions.assertThat(result.size()).isEqualTo(4);
Assertions.assertThat(result.get(0).getKey()).isEqualTo("sorted.properties");
Assertions.assertThat(result.get(0).getValue()).isEqualTo("key=value");
Assertions.assertEquals(result.get(1).getKey(), "sorted-k8s.properties");
Assertions.assertEquals(result.get(1).getValue(), "key-k8s=value-k8s");
Assertions.assertThat(result.get(1).getKey()).isEqualTo("sorted-k8s.properties");
Assertions.assertThat(result.get(1).getValue()).isEqualTo("key-k8s=value-k8s");
Assertions.assertEquals(result.get(2).getKey(), "simple");
Assertions.assertEquals(result.get(2).getValue(), "other_value");
Assertions.assertThat(result.get(2).getKey()).isEqualTo("simple");
Assertions.assertThat(result.get(2).getValue()).isEqualTo("other_value");
Assertions.assertEquals(result.get(3).getKey(), "second-simple");
Assertions.assertEquals(result.get(3).getValue(), "second_other_value");
Assertions.assertThat(result.get(3).getKey()).isEqualTo("second-simple");
Assertions.assertThat(result.get(3).getValue()).isEqualTo("second_other_value");
}
@Test
@@ -250,15 +250,15 @@ class SourceDataEntriesProcessorSortedTests {
mockEnvironment.setActiveProfiles("k8s");
List<Map.Entry<String, String>> result = SourceDataEntriesProcessor.sorted(k8sSource, mockEnvironment);
Assertions.assertEquals(result.size(), 3);
Assertions.assertEquals(result.get(0).getKey(), "sorted-k8s.properties");
Assertions.assertEquals(result.get(0).getValue(), "key-k8s=value-k8s");
Assertions.assertThat(result.size()).isEqualTo(3);
Assertions.assertThat(result.get(0).getKey()).isEqualTo("sorted-k8s.properties");
Assertions.assertThat(result.get(0).getValue()).isEqualTo("key-k8s=value-k8s");
Assertions.assertEquals(result.get(1).getKey(), "simple");
Assertions.assertEquals(result.get(1).getValue(), "other_value");
Assertions.assertThat(result.get(1).getKey()).isEqualTo("simple");
Assertions.assertThat(result.get(1).getValue()).isEqualTo("other_value");
Assertions.assertEquals(result.get(2).getKey(), "second-simple");
Assertions.assertEquals(result.get(2).getValue(), "second_other_value");
Assertions.assertThat(result.get(2).getKey()).isEqualTo("second-simple");
Assertions.assertThat(result.get(2).getValue()).isEqualTo("second_other_value");
}
}

35
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SourceDataEntriesProcessorTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.kubernetes.commons.config;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.mock.env.MockEnvironment;
@@ -34,8 +34,7 @@ class SourceDataEntriesProcessorTests {
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(Map.of("one.yml", "key: \n value"),
new MockEnvironment());
Assertions.assertEquals(1, result.size());
Assertions.assertEquals("value", result.get("key"));
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("key", "value"));
}
@Test
@@ -44,8 +43,7 @@ class SourceDataEntriesProcessorTests {
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(Map.of("one.yaml", "key: \n value"),
new MockEnvironment());
Assertions.assertEquals(1, result.size());
Assertions.assertEquals("value", result.get("key"));
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("key", "value"));
}
@Test
@@ -54,8 +52,7 @@ class SourceDataEntriesProcessorTests {
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(Map.of("one.properties", "key=value"),
new MockEnvironment());
Assertions.assertEquals(1, result.size());
Assertions.assertEquals("value", result.get("key"));
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("key", "value"));
}
/**
@@ -72,9 +69,7 @@ class SourceDataEntriesProcessorTests {
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, new MockEnvironment());
Assertions.assertEquals(2, result.size());
Assertions.assertEquals("1", result.get("one"));
Assertions.assertEquals("2", result.get("two"));
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("one", "1", "two", "2"));
}
/**
@@ -92,8 +87,7 @@ class SourceDataEntriesProcessorTests {
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, new MockEnvironment());
Assertions.assertEquals(1, result.size());
Assertions.assertEquals("1", result.get("one"));
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("one", "1"));
}
/**
@@ -111,9 +105,7 @@ class SourceDataEntriesProcessorTests {
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, new MockEnvironment());
Assertions.assertEquals(2, result.size());
Assertions.assertEquals("1", result.get("one"));
Assertions.assertEquals("blue", result.get("color"));
Assertions.assertThat(result).containsExactlyInAnyOrderEntriesOf(Map.of("one", "1", "color", "blue"));
}
/**
@@ -135,10 +127,8 @@ class SourceDataEntriesProcessorTests {
env.setActiveProfiles("dev");
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, env);
Assertions.assertEquals(3, result.size());
Assertions.assertEquals("1", result.get("one"));
Assertions.assertEquals("blue", result.get("color"));
Assertions.assertEquals("sport", result.get("fit"));
Assertions.assertThat(result)
.containsExactlyInAnyOrderEntriesOf(Map.of("one", "1", "color", "blue", "fit", "sport"));
}
/**
@@ -164,11 +154,8 @@ class SourceDataEntriesProcessorTests {
env.setActiveProfiles("fit", "color");
Map<String, Object> result = SourceDataEntriesProcessor.processAllEntries(map, env);
Assertions.assertEquals(4, result.size());
Assertions.assertEquals("1", result.get("one"));
Assertions.assertEquals("jacket", result.get("name"));
Assertions.assertEquals("sport", result.get("fit"));
Assertions.assertEquals("black", result.get("color"));
Assertions.assertThat(result)
.containsExactlyInAnyOrderEntriesOf(Map.of("one", "1", "name", "jacket", "color", "black", "fit", "sport"));
}
}

4
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/SourceDataTests.java
View File

@@ -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();
}
}

12
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtilTests.java
View File

@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.bootstrap.config.BootstrapPropertySource;
@@ -145,10 +145,12 @@ class ConfigReloadUtilTests {
List<? extends PropertySource> result = ConfigReloadUtil.findPropertySources(PlainPropertySource.class,
environment);
Assertions.assertEquals(3, result.size());
Assertions.assertEquals("b", result.get(0).getProperty("a"));
Assertions.assertEquals("plain", result.get(1).getProperty(""));
Assertions.assertEquals("from-inner-two-composite", result.get(2).getProperty(""));
Assertions.assertThat(result.size()).isEqualTo(3);
Assertions.assertThat(result.get(0).getProperty("a")).isEqualTo("b");
Assertions.assertThat(result.get(1).getProperty("")).isEqualTo("plain");
Assertions.assertThat(result.get(2).getProperty("")).isEqualTo("from-inner-two-composite");
}
@Test

12
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/reload/condition/EventReloadDetectionModeTest.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.commons.config.reload.condition;
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;
import org.mockito.Mock;
@@ -55,7 +55,7 @@ class EventReloadDetectionModeTest {
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(true);
Mockito.when(environment.getProperty(RELOAD_PROPERTY)).thenReturn(null);
boolean matches = underTest.matches(context, metadata);
Assertions.assertFalse(matches);
Assertions.assertThat(matches).isFalse();
}
// lack of this property being set, means a match.
@@ -64,7 +64,7 @@ class EventReloadDetectionModeTest {
Mockito.when(context.getEnvironment()).thenReturn(environment);
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(false);
boolean matches = underTest.matches(context, metadata);
Assertions.assertTrue(matches);
Assertions.assertThat(matches).isTrue();
}
@Test
@@ -73,7 +73,7 @@ class EventReloadDetectionModeTest {
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(true);
Mockito.when(environment.getProperty(RELOAD_PROPERTY)).thenReturn("EVENT");
boolean matches = underTest.matches(context, metadata);
Assertions.assertTrue(matches);
Assertions.assertThat(matches).isTrue();
}
@Test
@@ -82,7 +82,7 @@ class EventReloadDetectionModeTest {
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(true);
Mockito.when(environment.getProperty(RELOAD_PROPERTY)).thenReturn("eVeNt");
boolean matches = underTest.matches(context, metadata);
Assertions.assertTrue(matches);
Assertions.assertThat(matches).isTrue();
}
@Test
@@ -91,7 +91,7 @@ class EventReloadDetectionModeTest {
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(true);
Mockito.when(environment.getProperty(RELOAD_PROPERTY)).thenReturn("not-eVeNt");
boolean matches = underTest.matches(context, metadata);
Assertions.assertFalse(matches);
Assertions.assertThat(matches).isFalse();
}
}

12
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/reload/condition/PollingReloadDetectionModeTest.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.commons.config.reload.condition;
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;
import org.mockito.Mock;
@@ -55,7 +55,7 @@ class PollingReloadDetectionModeTest {
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(true);
Mockito.when(environment.getProperty(RELOAD_PROPERTY)).thenReturn(null);
boolean matches = underTest.matches(context, metadata);
Assertions.assertFalse(matches);
Assertions.assertThat(matches).isFalse();
}
// lack of this property being set, means a NO match (unlike EventReloadDetectionMode)
@@ -64,7 +64,7 @@ class PollingReloadDetectionModeTest {
Mockito.when(context.getEnvironment()).thenReturn(environment);
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(false);
boolean matches = underTest.matches(context, metadata);
Assertions.assertFalse(matches);
Assertions.assertThat(matches).isFalse();
}
@Test
@@ -73,7 +73,7 @@ class PollingReloadDetectionModeTest {
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(true);
Mockito.when(environment.getProperty(RELOAD_PROPERTY)).thenReturn("POLLING");
boolean matches = underTest.matches(context, metadata);
Assertions.assertTrue(matches);
Assertions.assertThat(matches).isTrue();
}
@Test
@@ -82,7 +82,7 @@ class PollingReloadDetectionModeTest {
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(true);
Mockito.when(environment.getProperty(RELOAD_PROPERTY)).thenReturn("PoLLiNG");
boolean matches = underTest.matches(context, metadata);
Assertions.assertTrue(matches);
Assertions.assertThat(matches).isTrue();
}
@Test
@@ -91,7 +91,7 @@ class PollingReloadDetectionModeTest {
Mockito.when(environment.containsProperty(RELOAD_PROPERTY)).thenReturn(true);
Mockito.when(environment.getProperty(RELOAD_PROPERTY)).thenReturn("not-POLLING");
boolean matches = underTest.matches(context, metadata);
Assertions.assertFalse(matches);
Assertions.assertThat(matches).isFalse();
}
}

283
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtilsTests.java
View File

@@ -22,7 +22,7 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
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;
@@ -71,8 +71,8 @@ class DiscoveryClientUtilsTests {
serviceAnnotations);
Map<String, String> result = serviceInstanceMetadata(portsData, serviceMetadata, properties);
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result, Map.of("k8s_namespace", "default", "type", "ClusterIP"));
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result).isEqualTo(Map.of("k8s_namespace", "default", "type", "ClusterIP"));
}
/**
@@ -103,8 +103,8 @@ class DiscoveryClientUtilsTests {
serviceAnnotations);
Map<String, String> result = serviceInstanceMetadata(portsData, serviceMetadata, properties);
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result, Map.of("k8s_namespace", "default", "type", "ClusterIP"));
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result).isEqualTo(Map.of("k8s_namespace", "default", "type", "ClusterIP"));
}
/**
@@ -136,11 +136,11 @@ class DiscoveryClientUtilsTests {
Map<String, String> result = serviceInstanceMetadata(portsData, serviceMetadata, properties);
Assertions.assertEquals(result.size(), 3);
Assertions.assertEquals(result, Map.of("a", "b", "k8s_namespace", "default", "type", "ClusterIP"));
Assertions.assertThat(result.size()).isEqualTo(3);
Assertions.assertThat(result).isEqualTo(Map.of("a", "b", "k8s_namespace", "default", "type", "ClusterIP"));
String labelsMetadata = filterOnK8sNamespaceAndType(result);
Assertions.assertTrue(
output.getOut().contains("Adding labels metadata: " + labelsMetadata + " for serviceId: my-service"));
Assertions.assertThat(output.getOut())
.contains("Adding labels metadata: " + labelsMetadata + " for serviceId: my-service");
}
/**
@@ -172,13 +172,13 @@ class DiscoveryClientUtilsTests {
Map<String, String> result = serviceInstanceMetadata(portsData, serviceMetadata, properties);
Assertions.assertEquals(result.size(), 4);
Assertions.assertEquals(result,
Map.of("prefix-a", "b", "prefix-c", "d", "k8s_namespace", "default", "type", "ClusterIP"));
Assertions.assertThat(result.size()).isEqualTo(4);
Assertions.assertThat(result)
.isEqualTo(Map.of("prefix-a", "b", "prefix-c", "d", "k8s_namespace", "default", "type", "ClusterIP"));
// so that result is deterministic in assertion
String labelsMetadata = filterOnK8sNamespaceAndType(result);
Assertions.assertTrue(
output.getOut().contains("Adding labels metadata: " + labelsMetadata + " for serviceId: my-service"));
Assertions.assertThat(output.getOut())
.contains("Adding labels metadata: " + labelsMetadata + " for serviceId: my-service");
}
/**
@@ -210,10 +210,10 @@ class DiscoveryClientUtilsTests {
Map<String, String> result = serviceInstanceMetadata(portsData, serviceMetadata, properties);
Assertions.assertEquals(result.size(), 3);
Assertions.assertEquals(result, Map.of("aa", "bb", "k8s_namespace", "default", "type", "ClusterIP"));
Assertions
.assertTrue(output.getOut().contains("Adding annotations metadata: {aa=bb} for serviceId: my-service"));
Assertions.assertThat(result.size()).isEqualTo(3);
Assertions.assertThat(result).isEqualTo(Map.of("aa", "bb", "k8s_namespace", "default", "type", "ClusterIP"));
Assertions.assertThat(output.getOut())
.contains("Adding annotations metadata: {aa=bb} for serviceId: my-service");
}
/**
@@ -245,13 +245,13 @@ class DiscoveryClientUtilsTests {
Map<String, String> result = serviceInstanceMetadata(portsData, serviceMetadata, properties);
Assertions.assertEquals(result.size(), 4);
Assertions.assertEquals(result,
Map.of("prefix-aa", "bb", "prefix-cc", "dd", "k8s_namespace", "default", "type", "ClusterIP"));
Assertions.assertThat(result.size()).isEqualTo(4);
Assertions.assertThat(result)
.isEqualTo(Map.of("prefix-aa", "bb", "prefix-cc", "dd", "k8s_namespace", "default", "type", "ClusterIP"));
// so that result is deterministic in assertion
String annotations = filterOnK8sNamespaceAndType(result);
Assertions.assertTrue(
output.getOut().contains("Adding annotations metadata: " + annotations + " for serviceId: my-service"));
Assertions.assertThat(output.getOut())
.contains("Adding annotations metadata: " + annotations + " for serviceId: my-service");
}
/**
@@ -283,9 +283,9 @@ class DiscoveryClientUtilsTests {
Map<String, String> result = serviceInstanceMetadata(portsData, serviceMetadata, properties);
Assertions.assertEquals(result.size(), 6);
Assertions.assertEquals(result, Map.of("annotation-aa", "bb", "annotation-cc", "dd", "label-a", "b", "label-c",
"d", "k8s_namespace", "default", "type", "ClusterIP"));
Assertions.assertThat(result)
.containsExactlyInAnyOrderEntriesOf(Map.of("annotation-aa", "bb", "annotation-cc", "dd", "label-a", "b",
"label-c", "d", "k8s_namespace", "default", "type", "ClusterIP"));
// so that result is deterministic in assertion
String labels = result.entrySet()
.stream()
@@ -297,10 +297,10 @@ class DiscoveryClientUtilsTests {
.filter(en -> en.getKey().contains("annotation"))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
.toString();
Assertions
.assertTrue(output.getOut().contains("Adding labels metadata: " + labels + " for serviceId: my-service"));
Assertions.assertTrue(
output.getOut().contains("Adding annotations metadata: " + annotations + " for serviceId: my-service"));
Assertions.assertThat(output.getOut())
.contains("Adding labels metadata: " + labels + " for serviceId: my-service");
Assertions.assertThat(output.getOut())
.contains("Adding annotations metadata: " + annotations + " for serviceId: my-service");
}
/**
@@ -331,10 +331,11 @@ class DiscoveryClientUtilsTests {
Map<String, String> result = serviceInstanceMetadata(portsData, serviceMetadata, properties);
Assertions.assertEquals(result.size(), 3);
Assertions.assertEquals(result, Map.of("https", "8080", "k8s_namespace", "default", "type", "ClusterIP"));
Assertions
.assertTrue(output.getOut().contains("Adding port metadata: {https=8080} for serviceId : my-service"));
Assertions.assertThat(result)
.containsExactlyInAnyOrderEntriesOf(
Map.of("https", "8080", "k8s_namespace", "default", "type", "ClusterIP"));
Assertions.assertThat(output.getOut())
.contains("Adding port metadata: {https=8080} for serviceId : my-service");
}
/**
@@ -365,11 +366,11 @@ class DiscoveryClientUtilsTests {
Map<String, String> result = serviceInstanceMetadata(portsData, serviceMetadata, properties);
Assertions.assertEquals(result.size(), 4);
Assertions.assertEquals(result,
Map.of("prefix-https", "8080", "prefix-http", "8081", "k8s_namespace", "default", "type", "ClusterIP"));
Assertions.assertTrue(output.getOut()
.contains("Adding port metadata: {prefix-http=8081, prefix-https=8080} for serviceId : my-service"));
Assertions.assertThat(result)
.containsExactlyInAnyOrderEntriesOf(Map.of("prefix-https", "8080", "prefix-http", "8081", "k8s_namespace",
"default", "type", "ClusterIP"));
Assertions.assertThat(output.getOut())
.contains("Adding port metadata: {prefix-http=8081, prefix-https=8080} for serviceId : my-service");
}
/**
@@ -387,10 +388,10 @@ class DiscoveryClientUtilsTests {
Map<String, String> serviceLabels = Map.of();
String result = primaryPortName(properties, serviceLabels, "abc");
Assertions.assertNull(result);
Assertions.assertTrue(output.getOut()
Assertions.assertThat(result).isNull();
Assertions.assertThat(output.getOut())
.contains(
"did not find a primary-port-name in neither properties nor service labels for service with ID : abc"));
"did not find a primary-port-name in neither properties nor service labels for service with ID : abc");
}
/**
@@ -410,9 +411,9 @@ class DiscoveryClientUtilsTests {
Map<String, String> serviceLabels = Map.of();
String result = primaryPortName(properties, serviceLabels, "abc");
Assertions.assertNotNull(result);
Assertions.assertEquals(result, primaryPortName);
Assertions.assertTrue(output.getOut().contains("will use primaryPortName : https for service with ID = abc"));
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result).isEqualTo(primaryPortName);
Assertions.assertThat(output.getOut()).contains("will use primaryPortName : https for service with ID = abc");
}
/**
@@ -429,9 +430,9 @@ class DiscoveryClientUtilsTests {
KubernetesDiscoveryProperties properties = KubernetesDiscoveryProperties.DEFAULT;
String result = primaryPortName(properties, serviceLabels, "abc");
Assertions.assertNotNull(result);
Assertions.assertEquals(result, "https");
Assertions.assertTrue(output.getOut().contains("will use primaryPortName : https for service with ID = abc"));
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result).isEqualTo("https");
Assertions.assertThat(output.getOut()).contains("will use primaryPortName : https for service with ID = abc");
}
/**
@@ -450,9 +451,9 @@ class DiscoveryClientUtilsTests {
true, "", Set.of(), Map.of(), primaryPortName, null, 0, false);
String result = primaryPortName(properties, serviceLabels, "abc");
Assertions.assertNotNull(result);
Assertions.assertEquals(result, "http");
Assertions.assertTrue(output.getOut().contains("will use primaryPortName : http for service with ID = abc"));
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result).isEqualTo("http");
Assertions.assertThat(output.getOut()).contains("will use primaryPortName : http for service with ID = abc");
}
/**
@@ -471,9 +472,9 @@ class DiscoveryClientUtilsTests {
Map.of());
ServicePortNameAndNumber portData = endpointsPort(endpointsPorts, serviceMetadata, properties);
Assertions.assertEquals(portData.portNumber(), 0);
Assertions.assertEquals(portData.portName(), "http");
Assertions.assertTrue(output.getOut().contains("no ports found for service : spring-k8s, will return zero"));
Assertions.assertThat(portData.portNumber()).isEqualTo(0);
Assertions.assertThat(portData.portName()).isEqualTo("http");
Assertions.assertThat(output.getOut()).contains("no ports found for service : spring-k8s, will return zero");
}
/**
@@ -493,9 +494,9 @@ class DiscoveryClientUtilsTests {
Map.of());
ServicePortNameAndNumber portData = endpointsPort(endpointsPorts, serviceMetadata, properties);
Assertions.assertEquals(portData.portNumber(), 8080);
Assertions.assertEquals(portData.portName(), "http");
Assertions.assertTrue(output.getOut().contains("endpoint ports has a single entry, using port : 8080"));
Assertions.assertThat(portData.portNumber()).isEqualTo(8080);
Assertions.assertThat(portData.portName()).isEqualTo("http");
Assertions.assertThat(output.getOut()).contains("endpoint ports has a single entry, using port : 8080");
}
/**
@@ -517,22 +518,22 @@ class DiscoveryClientUtilsTests {
Map.of());
ServicePortNameAndNumber portData = endpointsPort(endpointsPorts, serviceMetadata, properties);
Assertions.assertEquals(portData.portNumber(), 8080);
Assertions.assertEquals(portData.portName(), "not-null");
Assertions.assertTrue(output.getOut()
Assertions.assertThat(portData.portNumber()).isEqualTo(8080);
Assertions.assertThat(portData.portName()).isEqualTo("not-null");
Assertions.assertThat(output.getOut())
.contains(
"did not find a primary-port-name in neither properties nor service labels for service with ID : spring-k8s"));
Assertions.assertTrue(output.getOut()
.contains("not found primary-port-name (with value: 'null') via properties or service labels"));
Assertions.assertTrue(output.getOut().contains("not found primary-port-name via 'https' to match port"));
Assertions.assertTrue(output.getOut().contains("not found primary-port-name via 'http' to match port"));
Assertions.assertTrue(
output.getOut().contains("Could not find a port named 'https' or 'http' for service 'spring-k8s'."));
Assertions.assertTrue(output.getOut().contains("""
"did not find a primary-port-name in neither properties nor service labels for service with ID : spring-k8s");
Assertions.assertThat(output.getOut())
.contains("not found primary-port-name (with value: 'null') via properties or service labels");
Assertions.assertThat(output.getOut()).contains("not found primary-port-name via 'https' to match port");
Assertions.assertThat(output.getOut()).contains("not found primary-port-name via 'http' to match port");
Assertions.assertThat(output.getOut())
.contains("Could not find a port named 'https' or 'http' for service 'spring-k8s'.");
Assertions.assertThat(output.getOut()).contains("""
Make sure that either the primary-port-name label has been added to the service,
or spring.cloud.kubernetes.discovery.primary-port-name has been configured.
Alternatively name the primary port 'https' or 'http'.
An incorrect configuration may result in non-deterministic behaviour."""));
An incorrect configuration may result in non-deterministic behaviour.""");
}
/**
@@ -556,21 +557,21 @@ class DiscoveryClientUtilsTests {
Map.of());
ServicePortNameAndNumber portData = endpointsPort(endpointsPorts, serviceMetadata, properties);
Assertions.assertEquals(portData.portNumber(), 8080);
Assertions.assertEquals(portData.portName(), "one");
Assertions
.assertTrue(output.getOut().contains("will use primaryPortName : three for service with ID = spring-k8s"));
Assertions.assertTrue(output.getOut()
.contains("not found primary-port-name (with value: 'three') via properties or service labels"));
Assertions.assertTrue(output.getOut().contains("not found primary-port-name via 'https' to match port"));
Assertions.assertTrue(output.getOut().contains("not found primary-port-name via 'http' to match port"));
Assertions.assertTrue(output.getOut()
.contains("Could not find a port named 'three', 'https', or 'http' for service 'spring-k8s'."));
Assertions.assertTrue(output.getOut().contains("""
Assertions.assertThat(portData.portNumber()).isEqualTo(8080);
Assertions.assertThat(portData.portName()).isEqualTo("one");
Assertions.assertThat(output.getOut())
.contains("will use primaryPortName : three for service with ID = spring-k8s");
Assertions.assertThat(output.getOut())
.contains("not found primary-port-name (with value: 'three') via properties or service labels");
Assertions.assertThat(output.getOut()).contains("not found primary-port-name via 'https' to match port");
Assertions.assertThat(output.getOut()).contains("not found primary-port-name via 'http' to match port");
Assertions.assertThat(output.getOut())
.contains("Could not find a port named 'three', 'https', or 'http' for service 'spring-k8s'.");
Assertions.assertThat(output.getOut()).contains("""
Make sure that either the primary-port-name label has been added to the service,
or spring.cloud.kubernetes.discovery.primary-port-name has been configured.
Alternatively name the primary port 'https' or 'http'.
An incorrect configuration may result in non-deterministic behaviour."""));
An incorrect configuration may result in non-deterministic behaviour.""");
}
/**
@@ -594,13 +595,13 @@ class DiscoveryClientUtilsTests {
Map.of());
ServicePortNameAndNumber portData = endpointsPort(endpointsPorts, serviceMetadata, properties);
Assertions.assertEquals(portData.portNumber(), 8081);
Assertions.assertEquals(portData.portName(), "two");
Assertions
.assertTrue(output.getOut().contains("will use primaryPortName : two for service with ID = spring-k8s"));
Assertions.assertTrue(output.getOut()
Assertions.assertThat(portData.portNumber()).isEqualTo(8081);
Assertions.assertThat(portData.portName()).isEqualTo("two");
Assertions.assertThat(output.getOut())
.contains("will use primaryPortName : two for service with ID = spring-k8s");
Assertions.assertThat(output.getOut())
.contains(
"found primary-port-name (with value: 'two') via properties or service labels to match port : 8081"));
"found primary-port-name (with value: 'two') via properties or service labels to match port : 8081");
}
/**
@@ -626,14 +627,14 @@ class DiscoveryClientUtilsTests {
Map.of());
ServicePortNameAndNumber portData = endpointsPort(endpointsPorts, serviceMetadata, properties);
Assertions.assertEquals(portData.portNumber(), 8082);
Assertions.assertEquals(portData.portName(), "https");
Assertions
.assertTrue(output.getOut().contains("will use primaryPortName : three for service with ID = spring-k8s"));
Assertions.assertTrue(output.getOut()
Assertions.assertThat(portData.portNumber()).isEqualTo(8082);
Assertions.assertThat(portData.portName()).isEqualTo("https");
Assertions.assertThat(output.getOut())
.contains("will use primaryPortName : three for service with ID = spring-k8s");
Assertions.assertThat(output.getOut())
.contains(
"not found primary-port-name (with value: 'three') via properties or service labels to match port"));
Assertions.assertTrue(output.getOut().contains("found primary-port-name via 'https' to match port : 8082"));
"not found primary-port-name (with value: 'three') via properties or service labels to match port");
Assertions.assertThat(output.getOut()).contains("found primary-port-name via 'https' to match port : 8082");
}
/**
@@ -659,14 +660,14 @@ class DiscoveryClientUtilsTests {
Map.of());
ServicePortNameAndNumber portData = endpointsPort(endpointsPorts, serviceMetadata, properties);
Assertions.assertEquals(portData.portNumber(), 8082);
Assertions.assertEquals(portData.portName(), "http");
Assertions
.assertTrue(output.getOut().contains("will use primaryPortName : three for service with ID = spring-k8s"));
Assertions.assertTrue(output.getOut()
Assertions.assertThat(portData.portNumber()).isEqualTo(8082);
Assertions.assertThat(portData.portName()).isEqualTo("http");
Assertions.assertThat(output.getOut())
.contains("will use primaryPortName : three for service with ID = spring-k8s");
Assertions.assertThat(output.getOut())
.contains(
"not found primary-port-name (with value: 'three') via properties or service labels to match port"));
Assertions.assertTrue(output.getOut().contains("found primary-port-name via 'http' to match port : 8082"));
"not found primary-port-name (with value: 'three') via properties or service labels to match port");
Assertions.assertThat(output.getOut()).contains("found primary-port-name via 'http' to match port : 8082");
}
@Test
@@ -682,18 +683,18 @@ class DiscoveryClientUtilsTests {
ServiceInstance serviceInstance = serviceInstance(resolver, forServiceInstance, () -> instanceIdHostPodName,
null, portData, serviceMetadata, properties);
Assertions.assertTrue(serviceInstance instanceof DefaultKubernetesServiceInstance);
Assertions.assertThat(serviceInstance).isInstanceOf(DefaultKubernetesServiceInstance.class);
DefaultKubernetesServiceInstance defaultInstance = (DefaultKubernetesServiceInstance) serviceInstance;
Assertions.assertEquals(defaultInstance.getInstanceId(), "123");
Assertions.assertEquals(defaultInstance.getServiceId(), "my-service");
Assertions.assertEquals(defaultInstance.getHost(), "127.0.0.1");
Assertions.assertEquals(defaultInstance.getPort(), 8080);
Assertions.assertFalse(defaultInstance.isSecure());
Assertions.assertEquals(defaultInstance.getUri().toASCIIString(), "http://127.0.0.1:8080");
Assertions.assertEquals(defaultInstance.getMetadata(), Map.of("a", "b"));
Assertions.assertEquals(defaultInstance.getScheme(), "http");
Assertions.assertEquals(defaultInstance.getNamespace(), "k8s");
Assertions.assertNull(defaultInstance.getCluster());
Assertions.assertThat(defaultInstance.getInstanceId()).isEqualTo("123");
Assertions.assertThat(defaultInstance.getServiceId()).isEqualTo("my-service");
Assertions.assertThat(defaultInstance.getHost()).isEqualTo("127.0.0.1");
Assertions.assertThat(defaultInstance.getPort()).isEqualTo(8080);
Assertions.assertThat(defaultInstance.isSecure()).isFalse();
Assertions.assertThat(defaultInstance.getUri().toASCIIString()).isEqualTo("http://127.0.0.1:8080");
Assertions.assertThat(defaultInstance.getMetadata()).containsExactlyEntriesOf(Map.of("a", "b"));
Assertions.assertThat(defaultInstance.getScheme()).isEqualTo("http");
Assertions.assertThat(defaultInstance.getNamespace()).isEqualTo("k8s");
Assertions.assertThat(defaultInstance.getCluster()).isNull();
}
@Test
@@ -710,18 +711,18 @@ class DiscoveryClientUtilsTests {
ServiceInstance serviceInstance = serviceInstance(null, forServiceInstance, () -> instanceIdHostPodName, null,
portData, serviceMetadata, properties);
Assertions.assertTrue(serviceInstance instanceof DefaultKubernetesServiceInstance);
Assertions.assertThat(serviceInstance).isInstanceOf(DefaultKubernetesServiceInstance.class);
DefaultKubernetesServiceInstance defaultInstance = (DefaultKubernetesServiceInstance) serviceInstance;
Assertions.assertEquals(defaultInstance.getInstanceId(), "123");
Assertions.assertEquals(defaultInstance.getServiceId(), "my-service");
Assertions.assertEquals(defaultInstance.getHost(), "spring.io");
Assertions.assertEquals(defaultInstance.getPort(), -1);
Assertions.assertFalse(defaultInstance.isSecure());
Assertions.assertEquals(defaultInstance.getUri().toASCIIString(), "spring.io");
Assertions.assertEquals(defaultInstance.getMetadata(), Map.of("a", "b"));
Assertions.assertEquals(defaultInstance.getScheme(), "http");
Assertions.assertEquals(defaultInstance.getNamespace(), "k8s");
Assertions.assertNull(defaultInstance.getCluster());
Assertions.assertThat(defaultInstance.getInstanceId()).isEqualTo("123");
Assertions.assertThat(defaultInstance.getServiceId()).isEqualTo("my-service");
Assertions.assertThat(defaultInstance.getHost()).isEqualTo("spring.io");
Assertions.assertThat(defaultInstance.getPort()).isEqualTo(-1);
Assertions.assertThat(defaultInstance.isSecure()).isFalse();
Assertions.assertThat(defaultInstance.getUri().toASCIIString()).isEqualTo("spring.io");
Assertions.assertThat(defaultInstance.getMetadata()).isEqualTo(Map.of("a", "b"));
Assertions.assertThat(defaultInstance.getScheme()).isEqualTo("http");
Assertions.assertThat(defaultInstance.getNamespace()).isEqualTo("k8s");
Assertions.assertThat(defaultInstance.getCluster()).isNull();
}
/**
@@ -741,7 +742,7 @@ class DiscoveryClientUtilsTests {
Map<String, Map<String, String>> result = podMetadata(podName, serviceMetadata, properties,
podLabelsAndMetadata);
Assertions.assertTrue(result.isEmpty());
Assertions.assertThat(result).isEmpty();
}
/**
@@ -762,7 +763,7 @@ class DiscoveryClientUtilsTests {
Map<String, Map<String, String>> result = podMetadata(podName, serviceMetadata, properties,
podLabelsAndMetadata);
Assertions.assertTrue(result.isEmpty());
Assertions.assertThat(result).isEmpty();
}
/**
@@ -788,7 +789,7 @@ class DiscoveryClientUtilsTests {
Map<String, Map<String, String>> result = podMetadata(podName, serviceMetadata, properties,
podLabelsAndMetadata);
Assertions.assertTrue(result.isEmpty());
Assertions.assertThat(result).isEmpty();
}
/**
@@ -817,9 +818,9 @@ class DiscoveryClientUtilsTests {
Map<String, Map<String, String>> result = podMetadata(podName, serviceMetadata, properties,
podLabelsAndMetadata);
Assertions.assertTrue(result.isEmpty());
Assertions.assertThat(result).isEmpty();
Assertions.assertTrue(output.getOut().contains("adding podMetadata : {} from pod : my-pod"));
Assertions.assertThat(output.getOut()).contains("adding podMetadata : {} from pod : my-pod");
}
/**
@@ -848,10 +849,10 @@ class DiscoveryClientUtilsTests {
Map<String, Map<String, String>> result = podMetadata(podName, serviceMetadata, properties,
podLabelsAndMetadata);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get("labels"), Map.of("a", "b"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get("labels")).isEqualTo(Map.of("a", "b"));
Assertions.assertTrue(output.getOut().contains("adding podMetadata : {labels={a=b}} from pod : my-pod"));
Assertions.assertThat(output.getOut()).contains("adding podMetadata : {labels={a=b}} from pod : my-pod");
}
/**
@@ -880,9 +881,9 @@ class DiscoveryClientUtilsTests {
Map<String, Map<String, String>> result = podMetadata(podName, serviceMetadata, properties,
podLabelsAndMetadata);
Assertions.assertTrue(result.isEmpty());
Assertions.assertThat(result).isEmpty();
Assertions.assertTrue(output.getOut().contains("adding podMetadata : {} from pod : my-pod"));
Assertions.assertThat(output.getOut()).contains("adding podMetadata : {} from pod : my-pod");
}
/**
@@ -911,10 +912,10 @@ class DiscoveryClientUtilsTests {
Map<String, Map<String, String>> result = podMetadata(podName, serviceMetadata, properties,
podLabelsAndMetadata);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get("annotations"), Map.of("c", "d"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get("annotations")).isEqualTo(Map.of("c", "d"));
Assertions.assertTrue(output.getOut().contains("adding podMetadata : {annotations={c=d}} from pod : my-pod"));
Assertions.assertThat(output.getOut()).contains("adding podMetadata : {annotations={c=d}} from pod : my-pod");
}
/**
@@ -943,12 +944,12 @@ class DiscoveryClientUtilsTests {
Map<String, Map<String, String>> result = podMetadata(podName, serviceMetadata, properties,
podLabelsAndMetadata);
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result.get("annotations"), Map.of("c", "d"));
Assertions.assertEquals(result.get("labels"), Map.of("a", "b"));
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result.get("annotations")).isEqualTo(Map.of("c", "d"));
Assertions.assertThat(result.get("labels")).isEqualTo(Map.of("a", "b"));
Assertions.assertTrue(
output.getOut().contains("adding podMetadata : {annotations={c=d}, labels={a=b}} from pod : my-pod"));
Assertions.assertThat(output.getOut())
.contains("adding podMetadata : {annotations={c=d}, labels={a=b}} from pod : my-pod");
}
private String filterOnK8sNamespaceAndType(Map<String, String> result) {

13
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/leader/LeaderInfoContributorTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.kubernetes.commons.leader;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -45,7 +45,8 @@ class LeaderInfoContributorTests {
Info.Builder builder = new Info.Builder();
leaderInfoContributor.contribute(builder);
Assertions.assertEquals(builder.build().getDetails().get("leaderElection"), Map.of("leaderId", "Unknown"));
Assertions.assertThat(builder.build().getDetails().get("leaderElection"))
.isEqualTo(Map.of("leaderId", "Unknown"));
}
@Test
@@ -65,8 +66,8 @@ class LeaderInfoContributorTests {
Info.Builder builder = new Info.Builder();
leaderInfoContributor.contribute(builder);
Assertions.assertEquals(builder.build().getDetails().get("leaderElection"),
Map.of("role", "leaderRole", "isLeader", true, "leaderId", "leaderId"));
Assertions.assertThat(builder.build().getDetails().get("leaderElection"))
.isEqualTo(Map.of("role", "leaderRole", "isLeader", true, "leaderId", "leaderId"));
}
@Test
@@ -86,8 +87,8 @@ class LeaderInfoContributorTests {
Info.Builder builder = new Info.Builder();
leaderInfoContributor.contribute(builder);
Assertions.assertEquals(builder.build().getDetails().get("leaderElection"),
Map.of("role", "leaderRole", "isLeader", false, "leaderId", "leaderId"));
Assertions.assertThat(builder.build().getDetails().get("leaderElection"))
.isEqualTo(Map.of("role", "leaderRole", "isLeader", false, "leaderId", "leaderId"));
}
}

8
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/leader/LeaderPropertiesTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.commons.leader;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
/**
@@ -28,7 +28,7 @@ class LeaderPropertiesTests {
void getNamespaceNull() {
LeaderProperties leaderProperties = new LeaderProperties();
String namespace = leaderProperties.getNamespace("a");
Assertions.assertEquals("a", namespace);
Assertions.assertThat(namespace).isEqualTo("a");
}
@Test
@@ -36,7 +36,7 @@ class LeaderPropertiesTests {
LeaderProperties leaderProperties = new LeaderProperties();
leaderProperties.setNamespace("");
String namespace = leaderProperties.getNamespace("a");
Assertions.assertEquals("a", namespace);
Assertions.assertThat(namespace).isEqualTo("a");
}
@Test
@@ -44,7 +44,7 @@ class LeaderPropertiesTests {
LeaderProperties leaderProperties = new LeaderProperties();
leaderProperties.setNamespace("c");
String namespace = leaderProperties.getNamespace("a");
Assertions.assertEquals("c", namespace);
Assertions.assertThat(namespace).isEqualTo("c");
}
}

6
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/leader/LeaderUtilsTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.commons.leader;
import java.net.InetAddress;
import java.net.UnknownHostException;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
@@ -38,7 +38,7 @@ class LeaderUtilsTests {
envReaderMockedStatic.when(() -> EnvReader.getEnv("HOSTNAME")).thenReturn("from-env");
String hostname = LeaderUtils.hostName();
Assertions.assertEquals("from-env", hostname);
Assertions.assertThat(hostname).isEqualTo("from-env");
envReaderMockedStatic.close();
@@ -56,7 +56,7 @@ class LeaderUtilsTests {
inet4AddressMockedStatic.when(InetAddress::getLocalHost).thenReturn(inetAddress);
String hostname = LeaderUtils.hostName();
Assertions.assertEquals("from-api-call", hostname);
Assertions.assertThat(hostname).isEqualTo("from-api-call");
envReaderMockedStatic.close();
inet4AddressMockedStatic.close();

17
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/profile/KubernetesProfileEnvironmentPostProcessorTest.java
View File

@@ -22,8 +22,8 @@ import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Optional;
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;
@@ -178,16 +178,14 @@ public class KubernetesProfileEnvironmentPostProcessorTest {
* 'kubernetes' profile is not present
*/
private void assertKubernetesProfileNotPresent() {
Assertions.assertFalse(kubernetesProfile().isPresent(),
"'kubernetes' profile must not be present when not running in kubernetes");
Assertions.assertThat(kubernetesProfile().isPresent()).isFalse();
}
/*
* 'kubernetes' profile is present
*/
private void assertKubernetesProfilePresent() {
Assertions.assertTrue(kubernetesProfile().isPresent(),
"'kubernetes' profile must be present when running in kubernetes");
Assertions.assertThat(kubernetesProfile().isPresent()).isTrue();
}
/*
@@ -196,8 +194,7 @@ public class KubernetesProfileEnvironmentPostProcessorTest {
private void assertKubernetesPropertySourceNotPresent() {
Optional<PropertySource<?>> kubernetesPropertySource = kubernetesPropertySource();
Assertions.assertFalse(kubernetesPropertySource.isPresent(),
"'KUBERNETES_NAMESPACE_PROPERTY_SOURCE' source must not be present when not running on kubernetes");
Assertions.assertThat(kubernetesPropertySource.isPresent()).isFalse();
}
/*
@@ -206,13 +203,11 @@ public class KubernetesProfileEnvironmentPostProcessorTest {
private void assertKubernetesPropertySourcePresent() {
Optional<PropertySource<?>> kubernetesPropertySource = kubernetesPropertySource();
Assertions.assertTrue(kubernetesPropertySource.isPresent(),
"'KUBERNETES_NAMESPACE_PROPERTY_SOURCE' source must be present when running on kubernetes");
Assertions.assertThat(kubernetesPropertySource.isPresent()).isTrue();
String property = (String) kubernetesPropertySource.get()
.getProperty("spring.cloud.kubernetes.client.namespace");
Assertions.assertEquals(property, FOUNT_IT,
"'spring.cloud.kubernetes.client.namespace' must be set to 'foundIt'");
Assertions.assertThat(property).isEqualTo(FOUNT_IT);
}
/**

2
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java
View File

@@ -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;

28
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtilTests.java
View File

@@ -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<String, String> 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<String, String> res = WatcherUtil.labels(secret);
Assertions.assertEquals(res.size(), 1);
Assertions.assertThat(res.size()).isEqualTo(1);
}
@Test
void appsNoMetadata() {
V1Secret secret = new V1SecretBuilder().build();
Set<String> 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<String> 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<String> 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<String> 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<String> 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");
}
}

26
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerApplicationContextTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.discoveryserver;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -54,9 +54,9 @@ class DiscoveryServerApplicationContextTests {
@Test
void test() {
Assertions.assertNotNull(discoveryServerController.getIfAvailable());
Assertions.assertNotNull(discoveryCatalogWatcherController.getIfAvailable());
Assertions.assertNotNull(heartBeatListener.getIfAvailable());
Assertions.assertThat(discoveryServerController.getIfAvailable()).isNotNull();
Assertions.assertThat(discoveryCatalogWatcherController.getIfAvailable()).isNotNull();
Assertions.assertThat(heartBeatListener.getIfAvailable()).isNotNull();
}
}
@@ -83,9 +83,9 @@ class DiscoveryServerApplicationContextTests {
@Test
void test() {
Assertions.assertNotNull(discoveryServerController.getIfAvailable());
Assertions.assertNull(discoveryCatalogWatcherController.getIfAvailable());
Assertions.assertNull(heartBeatListener.getIfAvailable());
Assertions.assertThat(discoveryServerController.getIfAvailable()).isNotNull();
Assertions.assertThat(discoveryCatalogWatcherController.getIfAvailable()).isNull();
Assertions.assertThat(heartBeatListener.getIfAvailable()).isNull();
}
}
@@ -112,9 +112,9 @@ class DiscoveryServerApplicationContextTests {
@Test
void test() {
Assertions.assertNotNull(discoveryServerController.getIfAvailable());
Assertions.assertNull(discoveryCatalogWatcherController.getIfAvailable());
Assertions.assertNull(heartBeatListener.getIfAvailable());
Assertions.assertThat(discoveryServerController.getIfAvailable()).isNotNull();
Assertions.assertThat(discoveryCatalogWatcherController.getIfAvailable()).isNull();
Assertions.assertThat(heartBeatListener.getIfAvailable()).isNull();
}
}
@@ -141,9 +141,9 @@ class DiscoveryServerApplicationContextTests {
@Test
void test() {
Assertions.assertNotNull(discoveryServerController.getIfAvailable());
Assertions.assertNull(discoveryCatalogWatcherController.getIfAvailable());
Assertions.assertNull(heartBeatListener.getIfAvailable());
Assertions.assertThat(discoveryServerController.getIfAvailable()).isNotNull();
Assertions.assertThat(discoveryCatalogWatcherController.getIfAvailable()).isNull();
Assertions.assertThat(heartBeatListener.getIfAvailable()).isNull();
}
}

2
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.cloud.kubernetes.discoveryserver;
import java.util.List;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -56,7 +55,6 @@ class HeartbeatTests {
@Test
void testHeartbeat() {
Assertions.assertTrue(true);
client.get().uri("/state").exchange().expectStatus().is2xxSuccessful().expectBody().json("[]");
context.getBean(HeartbeatPublisher.class).publishEvent();

4
spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/BlockingDiscoveryHealthPublishedEventTest.java
View File

@@ -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();
}
}

10
spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/HealthEventListenerConfiguration.java
View File

@@ -16,7 +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;
@@ -43,11 +43,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");
}
}

20
spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTests.java
View File

@@ -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<EndpointNameAndNamespace> state = (List<EndpointNameAndNamespace>) 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<EndpointNameAndNamespace> stateOne = (List<EndpointNameAndNamespace>) 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<EndpointNameAndNamespace> stateTwo = (List<EndpointNameAndNamespace>) 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");
}

6
spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ReactiveDiscoveryHealthPublishedEventTest.java
View File

@@ -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();
}
}

24
spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8PodUtilsTest.java
View File

@@ -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<Pod> 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<Pod> 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<Pod> 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<Pod> 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<Pod> 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) {

75
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigDataLocationResolverTests.java
View File

@@ -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,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(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 +156,21 @@ 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 +202,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);
}
}

87
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigUtilsTests.java
View File

@@ -27,8 +27,8 @@ import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.fabric8.kubernetes.api.model.SecretBuilder;
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.Test;
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
@@ -62,8 +62,8 @@ class Fabric8ConfigUtilsTests {
.create();
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
Map.of("color", "red"), new MockEnvironment(), Set.of());
Assertions.assertEquals(Map.of(), result.data());
Assertions.assertTrue(result.names().isEmpty());
Assertions.assertThat(result.data()).isEmpty();
Assertions.assertThat(result.names()).isEmpty();
}
// secret "my-secret" is deployed with label {color:pink}; we search for it by same
@@ -80,8 +80,8 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
Map.of("color", "pink"), new MockEnvironment(), Set.of());
Assertions.assertEquals(Set.of("my-secret"), result.names());
Assertions.assertEquals(Map.of("property", "value"), result.data());
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("my-secret");
Assertions.assertThat(result.data()).containsExactlyInAnyOrderEntriesOf(Map.of("property", "value"));
}
// secret "my-secret" is deployed with label {color:pink}; we search for it by same
@@ -99,8 +99,8 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
Map.of("color", "pink"), new MockEnvironment(), Set.of());
Assertions.assertEquals(Set.of("my-secret"), result.names());
Assertions.assertEquals(Map.of("key1", "value1"), result.data());
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("my-secret");
Assertions.assertThat(result.data()).containsExactlyInAnyOrderEntriesOf(Map.of("key1", "value1"));
}
// secrets "my-secret" and "my-secret-2" are deployed with label {color:pink};
@@ -126,12 +126,11 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
Map.of("color", "pink"), new MockEnvironment(), Set.of());
Assertions.assertTrue(result.names().contains("my-secret"));
Assertions.assertTrue(result.names().contains("my-secret-2"));
Assertions.assertThat(result.names()).contains("my-secret");
Assertions.assertThat(result.names()).contains("my-secret-2");
Assertions.assertEquals(2, result.data().size());
Assertions.assertEquals("value", result.data().get("property"));
Assertions.assertEquals("value-2", result.data().get("property-2"));
Assertions.assertThat(result.data())
.containsExactlyInAnyOrderEntriesOf(Map.of("property-2", "value-2", "property", "value"));
}
/**
@@ -192,14 +191,12 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
Map.of("tag", "fit", "color", "blue"), new MockEnvironment(), Set.of("k8s"));
Assertions.assertTrue(result.names().contains("blue-circle-secret"));
Assertions.assertTrue(result.names().contains("blue-square-secret"));
Assertions.assertTrue(result.names().contains("blue-square-secret-k8s"));
Assertions.assertThat(result.names()).contains("blue-circle-secret");
Assertions.assertThat(result.names()).contains("blue-square-secret");
Assertions.assertThat(result.names()).contains("blue-square-secret-k8s");
Assertions.assertEquals(3, result.data().size());
Assertions.assertEquals("1", result.data().get("one"));
Assertions.assertEquals("2", result.data().get("two"));
Assertions.assertEquals("4", result.data().get("four"));
Assertions.assertThat(result.data())
.containsExactlyInAnyOrderEntriesOf(Map.of("one", "1", "two", "2", "four", "4"));
}
// secret "my-secret" is deployed; we search for it by name and do not find it.
@@ -213,8 +210,8 @@ class Fabric8ConfigUtilsTests {
names.add("nope");
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByName(client, "spring-k8s", names,
new MockEnvironment());
Assertions.assertEquals(0, result.names().size());
Assertions.assertEquals(0, result.data().size());
Assertions.assertThat(result.names()).isEmpty();
Assertions.assertThat(result.data()).isEmpty();
}
// secret "my-secret" is deployed; we search for it by name and find it.
@@ -231,8 +228,8 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByName(client, "spring-k8s", names,
new MockEnvironment());
Assertions.assertEquals(1, result.names().size());
Assertions.assertEquals("value", result.data().get("property"));
Assertions.assertThat(result.names().size()).isEqualTo(1);
Assertions.assertThat(result.data().get("property")).isEqualTo("value");
}
// secrets "my-secret" and "my-secret-2" are deployed;
@@ -258,12 +255,12 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByName(client, "spring-k8s", names,
new MockEnvironment());
Assertions.assertTrue(result.names().contains("my-secret"));
Assertions.assertTrue(result.names().contains("my-secret-2"));
Assertions.assertThat(result.names()).contains("my-secret");
Assertions.assertThat(result.names()).contains("my-secret-2");
Assertions.assertEquals(2, result.data().size());
Assertions.assertEquals("value", result.data().get("property"));
Assertions.assertEquals("value-2", result.data().get("property-2"));
Assertions.assertThat(result.data().size()).isEqualTo(2);
Assertions.assertThat(result.data().get("property")).isEqualTo("value");
Assertions.assertThat(result.data().get("property-2")).isEqualTo("value-2");
}
// config-map "my-config-map" is deployed without any data; we search for it by name
@@ -280,8 +277,8 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.configMapsDataByName(client, "spring-k8s", names,
new MockEnvironment());
Assertions.assertEquals(Set.of("my-config-map"), result.names());
Assertions.assertTrue(result.data().isEmpty());
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("my-config-map");
Assertions.assertThat(result.data()).isEmpty();
}
// config-map "my-config-map" is deployed; we search for it and do not find it.
@@ -296,8 +293,8 @@ class Fabric8ConfigUtilsTests {
names.add("my-config-map-not-found");
MultipleSourcesContainer result = Fabric8ConfigUtils.configMapsDataByName(client, "spring-k8s", names,
new MockEnvironment());
Assertions.assertEquals(Set.of(), result.names());
Assertions.assertTrue(result.data().isEmpty());
Assertions.assertThat(result.names()).isEmpty();
Assertions.assertThat(result.data()).isEmpty();
}
// config-map "my-config-map" is deployed; we search for it and find it
@@ -315,8 +312,8 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.configMapsDataByName(client, "spring-k8s", names,
new MockEnvironment());
Assertions.assertEquals(Set.of("my-config-map"), result.names());
Assertions.assertEquals(Map.of("property", "value"), result.data());
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("my-config-map");
Assertions.assertThat(result.data()).containsExactlyInAnyOrderEntriesOf(Map.of("property", "value"));
}
// config-map "my-config-map" is deployed; we search for it and find it.
@@ -335,8 +332,8 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.configMapsDataByName(client, "spring-k8s", names,
new MockEnvironment());
Assertions.assertEquals(Set.of("my-config-map"), result.names());
Assertions.assertEquals(Map.of("key1", "value1"), result.data());
Assertions.assertThat(result.names()).containsExactlyInAnyOrder("my-config-map");
Assertions.assertThat(result.data()).containsExactlyInAnyOrderEntriesOf(Map.of("key1", "value1"));
}
// config-map "my-config-map" and "my-config-map-2" are deployed;
@@ -363,12 +360,12 @@ class Fabric8ConfigUtilsTests {
MultipleSourcesContainer result = Fabric8ConfigUtils.configMapsDataByName(client, "spring-k8s", names,
new MockEnvironment());
Assertions.assertTrue(result.names().contains("my-config-map"));
Assertions.assertTrue(result.names().contains("my-config-map-2"));
Assertions.assertThat(result.names()).contains("my-config-map");
Assertions.assertThat(result.names()).contains("my-config-map-2");
Assertions.assertEquals(2, result.data().size());
Assertions.assertEquals("value", result.data().get("property"));
Assertions.assertEquals("value-2", result.data().get("property-2"));
Assertions.assertThat(result.data().size()).isEqualTo(2);
Assertions.assertThat(result.data().get("property")).isEqualTo("value");
Assertions.assertThat(result.data().get("property-2")).isEqualTo("value-2");
}
@Test
@@ -378,8 +375,8 @@ class Fabric8ConfigUtilsTests {
Duration.ofMillis(15000), Set.of("non-default"), false, Duration.ofSeconds(2));
Set<String> namespaces = Fabric8ConfigUtils.namespaces(null,
new KubernetesNamespaceProvider(new MockEnvironment()), configReloadProperties, "configmap");
Assertions.assertEquals(1, namespaces.size());
Assertions.assertEquals(namespaces.iterator().next(), "non-default");
Assertions.assertThat(namespaces.size()).isEqualTo(1);
Assertions.assertThat(namespaces.iterator().next()).isEqualTo("non-default");
}
@Test
@@ -389,8 +386,8 @@ class Fabric8ConfigUtilsTests {
KubernetesNamespaceProvider provider = new KubernetesNamespaceProvider(environment);
Set<String> namespaces = Fabric8ConfigUtils.namespaces(null, provider, ConfigReloadProperties.DEFAULT,
"configmap");
Assertions.assertEquals(1, namespaces.size());
Assertions.assertEquals(namespaces.iterator().next(), "some");
Assertions.assertThat(namespaces.size()).isEqualTo(1);
Assertions.assertThat(namespaces.iterator().next()).isEqualTo("some");
}
}

103
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledConfigMapContextToSourceDataProviderTests.java
View File

@@ -26,8 +26,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;
@@ -106,8 +106,8 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals("configmap.test-configmap.default", sourceData.sourceName());
Assertions.assertEquals(Map.of("name", "value"), sourceData.sourceData());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.test-configmap.default");
Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("name", "value"));
}
@@ -150,10 +150,10 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.red-configmap.red-configmap-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("configmap.red-configmap.red-configmap-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");
}
@@ -179,8 +179,8 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.color.default");
Assertions.assertEquals(sourceData.sourceData(), Collections.emptyMap());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.color.default");
Assertions.assertThat(sourceData.sourceData()).isEmpty();
}
/**
@@ -210,8 +210,8 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals("configmap.test-configmap.default", sourceData.sourceName());
Assertions.assertEquals(Map.of("name", "value"), sourceData.sourceData());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.test-configmap.default");
Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("name", "value"));
}
/**
@@ -240,8 +240,9 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals("configmap.blue-configmap.default", sourceData.sourceName());
Assertions.assertEquals(Map.of("me.what-color", "blue-color"), sourceData.sourceData());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.blue-configmap.default");
Assertions.assertThat(sourceData.sourceData())
.containsExactlyInAnyOrderEntriesOf(Map.of("me.what-color", "blue-color"));
}
/**
@@ -281,21 +282,22 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "configmap.another-blue-configmap.blue-configmap.default");
Assertions.assertThat(sourceData.sourceName())
.isEqualTo("configmap.another-blue-configmap.blue-configmap.default");
Map<String, Object> properties = sourceData.sourceData();
Assertions.assertEquals(2, properties.size());
Assertions.assertThat(properties.size()).isEqualTo(2);
Iterator<String> keys = properties.keySet().iterator();
String firstKey = keys.next();
String secondKey = keys.next();
if (firstKey.contains("first")) {
Assertions.assertEquals(firstKey, "another-blue-configmap.blue-configmap.first");
Assertions.assertThat(firstKey).isEqualTo("another-blue-configmap.blue-configmap.first");
}
Assertions.assertEquals(secondKey, "another-blue-configmap.blue-configmap.second");
Assertions.assertEquals(properties.get(firstKey), "blue");
Assertions.assertEquals(properties.get(secondKey), "blue");
Assertions.assertThat(secondKey).isEqualTo("another-blue-configmap.blue-configmap.second");
Assertions.assertThat(properties.get(firstKey)).isEqualTo("blue");
Assertions.assertThat(properties.get(secondKey)).isEqualTo("blue");
}
/**
@@ -331,8 +333,8 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertTrue(sourceData.sourceData().isEmpty());
Assertions.assertEquals(sourceData.sourceName(), "configmap.color.default");
Assertions.assertThat(sourceData.sourceData().isEmpty()).isTrue();
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.color.default");
}
@@ -368,9 +370,9 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceData().size(), 1);
Assertions.assertEquals(sourceData.sourceData().get("one"), "1");
Assertions.assertEquals(sourceData.sourceName(), "configmap.color-configmap.default");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(sourceData.sourceData().get("one")).isEqualTo("1");
Assertions.assertThat(sourceData.sourceName()).isEqualTo("configmap.color-configmap.default");
}
@@ -408,10 +410,11 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceData().size(), 2);
Assertions.assertEquals(sourceData.sourceData().get("color-configmap.color-configmap-k8s.one"), "1");
Assertions.assertEquals(sourceData.sourceData().get("color-configmap.color-configmap-k8s.two"), "2");
Assertions.assertEquals(sourceData.sourceName(), "configmap.color-configmap.color-configmap-k8s.default");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
Assertions.assertThat(sourceData.sourceData().get("color-configmap.color-configmap-k8s.one")).isEqualTo("1");
Assertions.assertThat(sourceData.sourceData().get("color-configmap.color-configmap-k8s.two")).isEqualTo("2");
Assertions.assertThat(sourceData.sourceName())
.isEqualTo("configmap.color-configmap.color-configmap-k8s.default");
}
@@ -477,18 +480,26 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceData().size(), 4);
Assertions.assertEquals(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.one"), "1");
Assertions.assertEquals(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.two"), "2");
Assertions.assertEquals(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.four"), "4");
Assertions.assertEquals(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.five"), "5");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(4);
Assertions
.assertThat(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.one"))
.isEqualTo("1");
Assertions
.assertThat(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.two"))
.isEqualTo("2");
Assertions
.assertThat(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.four"))
.isEqualTo("4");
Assertions
.assertThat(sourceData.sourceData()
.get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.five"))
.isEqualTo("5");
Assertions.assertEquals(sourceData.sourceName(),
"configmap.color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.default");
Assertions.assertThat(sourceData.sourceName())
.isEqualTo("configmap.color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.default");
}
@@ -528,9 +539,9 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData redData = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData redSourceData = redData.apply(redContext);
Assertions.assertEquals(redSourceData.sourceData().size(), 1);
Assertions.assertEquals(redSourceData.sourceData().get("red-configmap.one"), "1");
Assertions.assertTrue(output.getAll().contains("Loaded all config maps in namespace '" + NAMESPACE + "'"));
Assertions.assertThat(redSourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(redSourceData.sourceData().get("red-configmap.one")).isEqualTo("1");
Assertions.assertThat(output.getAll()).contains("Loaded all config maps in namespace '" + NAMESPACE + "'");
NormalizedSource greenNormalizedSource = new LabeledConfigMapNormalizedSource(NAMESPACE,
Collections.singletonMap("color", "green"), true, ConfigUtils.Prefix.DELAYED, true);
@@ -539,16 +550,16 @@ class LabeledConfigMapContextToSourceDataProviderTests {
Fabric8ContextToSourceData greenData = new LabeledConfigMapContextToSourceDataProvider().get();
SourceData greenSourceData = greenData.apply(greenContext);
Assertions.assertEquals(greenSourceData.sourceData().size(), 1);
Assertions.assertEquals(greenSourceData.sourceData().get("green-configmap.two"), "2");
Assertions.assertThat(greenSourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(greenSourceData.sourceData().get("green-configmap.two")).isEqualTo("2");
// 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);
}

105
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledSecretContextToSourceDataProviderTests.java
View File

@@ -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,9 @@ 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 +154,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 +183,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 +213,9 @@ 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 +244,9 @@ 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 +285,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<String, Object> properties = sourceData.sourceData();
Assertions.assertEquals(2, properties.size());
Assertions.assertThat(properties.size()).isEqualTo(2);
Iterator<String> 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 +335,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 +372,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 +412,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,18 +481,22 @@ 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(),
"secret.color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.default");
Assertions.assertThat(sourceData.sourceName())
.isEqualTo("secret.color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.default");
}
@@ -515,9 +522,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 +563,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 +574,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);
}

70
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/NamedConfigMapContextToSourceDataProviderTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.cloud.kubernetes.fabric8.config;
import java.util.Collections;
import java.util.Map;
import io.fabric8.kubernetes.api.model.ConfigMap;
@@ -24,8 +23,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 +97,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 +126,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 +167,9 @@ 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 +211,9 @@ 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 +260,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 +290,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 +320,9 @@ 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 +347,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 +377,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 +413,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 +424,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);
}

71
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/NamedSecretContextToSourceDataProviderTests.java
View File

@@ -17,7 +17,6 @@
package org.springframework.cloud.kubernetes.fabric8.config;
import java.util.Base64;
import java.util.Collections;
import java.util.Map;
import io.fabric8.kubernetes.api.model.Secret;
@@ -25,8 +24,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;
@@ -94,8 +93,9 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("color", "really-red"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.red.default");
Assertions.assertThat(sourceData.sourceData())
.containsExactlyInAnyOrderEntriesOf(Map.of("color", "really-red"));
}
@@ -135,9 +135,9 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.default");
Assertions.assertEquals(sourceData.sourceData().size(), 1);
Assertions.assertEquals(sourceData.sourceData().get("color"), "really-red");
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.red.default");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(sourceData.sourceData().get("color")).isEqualTo("really-red");
}
@@ -162,8 +162,8 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.blue.default");
Assertions.assertEquals(sourceData.sourceData(), Collections.emptyMap());
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.blue.default");
Assertions.assertThat(sourceData.sourceData()).isEmpty();
}
/**
@@ -191,8 +191,9 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("color", "really-red"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.red.default");
Assertions.assertThat(sourceData.sourceData())
.containsExactlyInAnyOrderEntriesOf(Map.of("color", "really-red"));
}
/**
@@ -227,10 +228,10 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.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("secret.red.red-with-profile.default.with-profile");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
Assertions.assertThat(sourceData.sourceData().get("color")).isEqualTo("really-red");
Assertions.assertThat(sourceData.sourceData().get("taste")).isEqualTo("mango");
}
@@ -269,10 +270,10 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.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("secret.red.red-with-profile.default");
Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
Assertions.assertThat(sourceData.sourceData().get("some.color")).isEqualTo("really-red");
Assertions.assertThat(sourceData.sourceData().get("some.taste")).isEqualTo("mango");
}
@@ -318,12 +319,12 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.red.red-with-shape.red-with-taste.default");
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.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.sourceData().size()).isEqualTo(3);
Assertions.assertThat(sourceData.sourceData().get("some.color")).isEqualTo("really-red");
Assertions.assertThat(sourceData.sourceData().get("some.taste")).isEqualTo("mango");
Assertions.assertThat(sourceData.sourceData().get("some.shape")).isEqualTo("round");
}
@@ -350,8 +351,8 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData data = new NamedSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
Assertions.assertEquals(sourceData.sourceName(), "secret.single-yaml.default");
Assertions.assertEquals(sourceData.sourceData(), Collections.singletonMap("key", "value"));
Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.single-yaml.default");
Assertions.assertThat(sourceData.sourceData()).containsExactlyInAnyOrderEntriesOf(Map.of("key", "value"));
}
/**
@@ -385,10 +386,10 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData redData = new NamedSecretContextToSourceDataProvider().get();
SourceData redSourceData = redData.apply(redContext);
Assertions.assertEquals(redSourceData.sourceName(), "secret.red.default");
Assertions.assertEquals(redSourceData.sourceData().size(), 1);
Assertions.assertEquals(redSourceData.sourceData().get("some.color"), "red");
Assertions.assertTrue(output.getAll().contains("Loaded all secrets in namespace '" + NAMESPACE + "'"));
Assertions.assertThat(redSourceData.sourceName()).isEqualTo("secret.red.default");
Assertions.assertThat(redSourceData.sourceData().size()).isEqualTo(1);
Assertions.assertThat(redSourceData.sourceData().get("some.color")).isEqualTo("red");
Assertions.assertThat(output.getAll()).contains("Loaded all secrets in namespace '" + NAMESPACE + "'");
NormalizedSource greenNormalizedSource = new NamedSecretNormalizedSource("green", NAMESPACE, true, PREFIX,
false);
@@ -396,17 +397,17 @@ class NamedSecretContextToSourceDataProviderTests {
Fabric8ContextToSourceData greenData = new NamedSecretContextToSourceDataProvider().get();
SourceData greenSourceData = greenData.apply(greenContext);
Assertions.assertEquals(greenSourceData.sourceName(), "secret.green.default");
Assertions.assertEquals(greenSourceData.sourceData().size(), 1);
Assertions.assertEquals(greenSourceData.sourceData().get("some.taste"), "mango");
Assertions.assertThat(greenSourceData.sourceName()).isEqualTo("secret.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 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);
}

5
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/DisabledHealthTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.fabric8.config.actuator;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,8 +57,7 @@ class DisabledHealthTests {
.jsonPath("components.kubernetes")
.doesNotExist();
Assertions.assertNull(registry.getContributor("kubernetes"),
"reactive kubernetes contributor must NOT be present when 'management.health.kubernetes.enabled=false'");
Assertions.assertThat(registry.getContributor("kubernetes")).isNull();
}
}

5
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/EnabledHealthTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.fabric8.config.actuator;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,8 +58,7 @@ class EnabledHealthTests {
.jsonPath("components.kubernetes")
.exists();
Assertions.assertNotNull(registry.getContributor("kubernetes"),
"reactive kubernetes contributor must be present when 'management.health.kubernetes.enabled=true'");
Assertions.assertThat(registry.getContributor("kubernetes")).isNotNull();
}
}

4
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/ConfigFailFastDisabled.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.fabric8.config.locator_retry.config
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.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ abstract class ConfigFailFastDisabled {
Fabric8ConfigMapPropertySourceLocator psl = spy(propertySourceLocator);
mockServer.expect().withPath(API).andReturn(500, "Internal Server Error").once();
Assertions.assertDoesNotThrow(() -> psl.locate(new MockEnvironment()));
Assertions.assertThatCode(() -> psl.locate(new MockEnvironment())).doesNotThrowAnyException();
// verify that propertySourceLocator.locate is called only once
verify(psl, times(1)).locate(any());

18
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigRetryEnabled.java
View File

@@ -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,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 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

69
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/ConfigReloadAutoConfigurationTest.java
View File

@@ -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,9 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
setup(KubernetesClientTestConfiguration.class, "spring.cloud.kubernetes.reload.enabled=true",
"spring.main.cloud-platform=KUBERNETES");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertTrue(map.values()
.iterator()
.next()
.getClass()
.isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class));
Assertions.assertThat(map.size()).isEqualTo(1);
Assertions.assertThat(map.values().iterator().next().getClass())
.isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class);
}
/**
@@ -153,12 +150,9 @@ 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<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertTrue(map.values()
.iterator()
.next()
.getClass()
.isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class));
Assertions.assertThat(map.size()).isEqualTo(1);
Assertions.assertThat(map.values().iterator().next().getClass())
.isAssignableFrom(Fabric8EventBasedConfigMapChangeDetector.class);
}
/**
@@ -178,7 +172,7 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES",
"spring.cloud.kubernetes.reload.monitoring-configMaps=false");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 0);
Assertions.assertThat(map).isEmpty();
}
/**
@@ -198,7 +192,7 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES",
"spring.cloud.kubernetes.reload.monitoring-configMaps=false");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 0);
Assertions.assertThat(map).isEmpty();
}
/**
@@ -217,9 +211,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<String, ConfigurationChangeDetector> 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 +235,9 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
"spring.cloud.kubernetes.reload.mode=event");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertTrue(map.values()
.iterator()
.next()
.getClass()
.isAssignableFrom(Fabric8EventBasedSecretsChangeDetector.class));
Assertions.assertThat(map.size()).isEqualTo(1);
Assertions.assertThat(map.values().iterator().next().getClass())
.isAssignableFrom(Fabric8EventBasedSecretsChangeDetector.class);
}
/**
@@ -268,9 +259,9 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
"spring.cloud.kubernetes.reload.mode=polling");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions
.assertTrue(map.values().iterator().next().getClass().isAssignableFrom(PollingSecretsChangeDetector.class));
Assertions.assertThat(map.size()).isEqualTo(1);
Assertions.assertThat(map.values().iterator().next().getClass())
.isAssignableFrom(PollingSecretsChangeDetector.class);
}
/**
@@ -292,13 +283,13 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
"spring.cloud.kubernetes.reload.mode=event");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 2);
Assertions.assertThat(map.size()).isEqualTo(2);
List<ConfigurationChangeDetector> 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 +311,13 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
"spring.cloud.kubernetes.reload.mode=polling");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 2);
Assertions.assertThat(map.size()).isEqualTo(2);
List<ConfigurationChangeDetector> 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 +339,7 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 0);
Assertions.assertThat(map).isEmpty();
}
/**
@@ -370,7 +361,7 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 0);
Assertions.assertThat(map).isEmpty();
}
/**
@@ -392,12 +383,12 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertThat(map.size()).isEqualTo(1);
List<ConfigurationChangeDetector> 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 +410,12 @@ class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase {
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
Map<String, ConfigurationChangeDetector> map = getContext().getBeansOfType(ConfigurationChangeDetector.class);
Assertions.assertEquals(map.size(), 1);
Assertions.assertThat(map.size()).isEqualTo(1);
List<ConfigurationChangeDetector> 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

18
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java
View File

@@ -25,7 +25,7 @@ import io.fabric8.kubernetes.api.model.SecretListBuilder;
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;
@@ -89,14 +89,16 @@ abstract class SecretsRetryEnabled {
.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.sensitive.prop")).isEqualTo("theSensitiveValue");
assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1");
assertThat(propertySource[0].getProperty("some.sensitive.prop")).isEqualTo("theSensitiveValue");
assertThat(propertySource[0].getProperty("some.sensitive.number")).isEqualTo("1");
}
@Test
@@ -115,14 +117,16 @@ abstract class SecretsRetryEnabled {
.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.sensitive.prop")).isEqualTo("theSensitiveValue");
assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1");
assertThat(propertySource[0].getProperty("some.sensitive.prop")).isEqualTo("theSensitiveValue");
assertThat(propertySource[0].getProperty("some.sensitive.number")).isEqualTo("1");
}
@Test

4
spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/SecretsFailFastDisabled.java
View File

@@ -20,7 +20,7 @@ import io.fabric8.kubernetes.api.model.SecretListBuilder;
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;
@@ -73,7 +73,7 @@ abstract class SecretsFailFastDisabled {
void locateShouldNotRetry() {
mockServer.expect().withPath(API).andReturn(500, "Internal Server Error").once();
Assertions.assertDoesNotThrow(() -> psl.locate(new MockEnvironment()));
Assertions.assertThatCode(() -> psl.locate(new MockEnvironment())).doesNotThrowAnyException();
// verify locate is called only once
verify(verifiablePsl, times(1)).locate(any());

24
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContextTests.java
View File

@@ -21,7 +21,7 @@ import java.util.stream.Stream;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.ObjectReferenceBuilder;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace;
@@ -38,9 +38,9 @@ class Fabric8CatalogWatchContextTests {
.of(new ObjectReferenceBuilder().withName("a").withNamespace("default").build());
List<EndpointNameAndNamespace> result = Fabric8CatalogWatchContext.state(referenceStream);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).endpointName(), "a");
Assertions.assertEquals(result.get(0).namespace(), "default");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).endpointName()).isEqualTo("a");
Assertions.assertThat(result.get(0).namespace()).isEqualTo("default");
}
@@ -51,9 +51,9 @@ class Fabric8CatalogWatchContextTests {
.of(new ObjectReferenceBuilder().withName(null).withNamespace("default").build());
List<EndpointNameAndNamespace> result = Fabric8CatalogWatchContext.state(referenceStream);
Assertions.assertEquals(result.size(), 1);
Assertions.assertNull(result.get(0).endpointName());
Assertions.assertEquals(result.get(0).namespace(), "default");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).endpointName()).isNull();
Assertions.assertThat(result.get(0).namespace()).isEqualTo("default");
}
@@ -65,11 +65,11 @@ class Fabric8CatalogWatchContextTests {
new ObjectReferenceBuilder().withName("a").withNamespace("defaultA").build());
List<EndpointNameAndNamespace> result = Fabric8CatalogWatchContext.state(referenceStream);
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result.get(0).endpointName(), "a");
Assertions.assertEquals(result.get(0).namespace(), "defaultA");
Assertions.assertNull(result.get(1).endpointName());
Assertions.assertEquals(result.get(1).namespace(), "defaultNull");
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result.get(0).endpointName()).isEqualTo("a");
Assertions.assertThat(result.get(0).namespace()).isEqualTo("defaultA");
Assertions.assertThat(result.get(1).endpointName()).isNull();
Assertions.assertThat(result.get(1).namespace()).isEqualTo("defaultNull");
}

77
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryServicesAdapterTests.java
View File

@@ -25,8 +25,8 @@ import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
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.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
@@ -89,11 +89,11 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceB", "serviceB", Map.of("color", "blue"));
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertEquals(result.get(1).getMetadata().getName(), "serviceB");
Assertions.assertEquals(result.get(1).getMetadata().getNamespace(), "namespaceB");
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
Assertions.assertThat(result.get(1).getMetadata().getName()).isEqualTo("serviceB");
Assertions.assertThat(result.get(1).getMetadata().getNamespace()).isEqualTo("namespaceB");
}
/**
@@ -127,9 +127,9 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceB", "serviceB", Map.of("color", "blue"));
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
}
/**
@@ -166,9 +166,9 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceB", "serviceB", Map.of("color", "blue"));
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
}
/**
@@ -207,11 +207,11 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceC", "serviceC", Map.of("color", "purple"));
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertEquals(result.get(1).getMetadata().getName(), "serviceB");
Assertions.assertEquals(result.get(1).getMetadata().getNamespace(), "namespaceB");
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
Assertions.assertThat(result.get(1).getMetadata().getName()).isEqualTo("serviceB");
Assertions.assertThat(result.get(1).getMetadata().getNamespace()).isEqualTo("namespaceB");
}
/**
@@ -249,9 +249,9 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceB", "serviceB", Map.of("color", "blue"));
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
}
/**
@@ -292,9 +292,9 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceC", "serviceC", Map.of("color", "purple"));
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceB");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceB");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
}
/**
@@ -339,10 +339,11 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceC", "serviceC", Map.of("color", "purple", "number", "1"));
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertEquals(result.get(0).getMetadata().getLabels(), Map.of("color", "red", "number", "1"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
Assertions.assertThat(result.get(0).getMetadata().getLabels())
.containsExactlyInAnyOrderEntriesOf(Map.of("color", "red", "number", "1"));
}
/**
@@ -380,12 +381,12 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceC", "serviceC", Map.of());
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 2);
Assertions.assertThat(result.size()).isEqualTo(2);
result = result.stream().sorted(Comparator.comparing(x -> x.getMetadata().getName())).toList();
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertEquals(result.get(1).getMetadata().getName(), "serviceB");
Assertions.assertEquals(result.get(1).getMetadata().getNamespace(), "namespaceB");
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
Assertions.assertThat(result.get(1).getMetadata().getName()).isEqualTo("serviceB");
Assertions.assertThat(result.get(1).getMetadata().getNamespace()).isEqualTo("namespaceB");
}
/**
@@ -423,9 +424,9 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceC", "serviceC", Map.of("color", "purple"));
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
}
/**
@@ -465,9 +466,9 @@ class Fabric8DiscoveryServicesAdapterTests {
service("namespaceC", "serviceC", Map.of("color", "purple", "number", "1"));
List<Service> result = adapter.apply(client);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespaceA");
}
private void service(String namespace, String name, Map<String, String> labels) {

30
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8InstanceIdHostPodNameSupplierTests.java
View File

@@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.ObjectReferenceBuilder;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.kubernetes.commons.discovery.InstanceIdHostPodName;
@@ -43,8 +43,8 @@ class Fabric8InstanceIdHostPodNameSupplierTests {
Fabric8InstanceIdHostPodNameSupplier supplier = Fabric8InstanceIdHostPodNameSupplier.externalName(service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.instanceId(), "123");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.instanceId()).isEqualTo("123");
}
@Test
@@ -60,8 +60,8 @@ class Fabric8InstanceIdHostPodNameSupplierTests {
.nonExternalName(endpointAddress, service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.instanceId(), "456");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.instanceId()).isEqualTo("456");
}
@Test
@@ -74,8 +74,8 @@ class Fabric8InstanceIdHostPodNameSupplierTests {
Fabric8InstanceIdHostPodNameSupplier supplier = Fabric8InstanceIdHostPodNameSupplier.externalName(service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.host(), "external-name");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.host()).isEqualTo("external-name");
}
@Test
@@ -90,8 +90,8 @@ class Fabric8InstanceIdHostPodNameSupplierTests {
.nonExternalName(endpointAddress, service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.host(), "127.0.0.1");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.host()).isEqualTo("127.0.0.1");
}
@Test
@@ -102,8 +102,8 @@ class Fabric8InstanceIdHostPodNameSupplierTests {
Fabric8InstanceIdHostPodNameSupplier supplier = Fabric8InstanceIdHostPodNameSupplier.externalName(service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertNull(result.podName());
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.podName()).isNull();
}
@Test
@@ -120,8 +120,8 @@ class Fabric8InstanceIdHostPodNameSupplierTests {
.nonExternalName(endpointAddress, service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertNull(result.podName());
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.podName()).isNull();
}
@Test
@@ -138,8 +138,8 @@ class Fabric8InstanceIdHostPodNameSupplierTests {
.nonExternalName(endpointAddress, service);
InstanceIdHostPodName result = supplier.get();
Assertions.assertNotNull(result);
Assertions.assertEquals(result.podName(), "my-pod");
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.podName()).isEqualTo("my-pod");
}
}

16
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesCatalogWatchEndpointSlicesSupportTests.java
View File

@@ -32,7 +32,7 @@ import io.fabric8.kubernetes.api.model.GroupVersionForDiscoveryBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
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.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -69,8 +69,9 @@ class Fabric8KubernetesCatalogWatchEndpointSlicesSupportTests {
mockServer.expect().withPath("/apis").andReturn(200, groupList).always();
KubernetesCatalogWatch watch = new KubernetesCatalogWatch(mockClient, properties, NAMESPACE_PROVIDER);
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class, watch::postConstruct);
Assertions.assertEquals("EndpointSlices are not supported on the cluster", ex.getMessage());
Assertions.assertThatThrownBy(watch::postConstruct)
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("EndpointSlices are not supported on the cluster");
}
/**
@@ -96,8 +97,9 @@ class Fabric8KubernetesCatalogWatchEndpointSlicesSupportTests {
mockServer.expect().withPath("/apis/discovery.k8s.io/v1").andReturn(200, apiResourceList).always();
KubernetesCatalogWatch watch = new KubernetesCatalogWatch(mockClient, properties, NAMESPACE_PROVIDER);
IllegalArgumentException ex = Assertions.assertThrows(IllegalArgumentException.class, watch::postConstruct);
Assertions.assertEquals("EndpointSlices are not supported on the cluster", ex.getMessage());
Assertions.assertThatThrownBy(watch::postConstruct)
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("EndpointSlices are not supported on the cluster");
}
/**
@@ -110,7 +112,7 @@ class Fabric8KubernetesCatalogWatchEndpointSlicesSupportTests {
false, "", Set.of(), Map.of(), "", null, 0, false);
KubernetesCatalogWatch watch = new KubernetesCatalogWatch(mockClient, properties, NAMESPACE_PROVIDER);
Assertions.assertEquals(Fabric8EndpointsCatalogWatch.class, watch.stateGenerator().getClass());
Assertions.assertThat(watch.stateGenerator().getClass()).isEqualTo(Fabric8EndpointsCatalogWatch.class);
}
/**
@@ -136,7 +138,7 @@ class Fabric8KubernetesCatalogWatchEndpointSlicesSupportTests {
APIResourceList apiResourceList = new APIResourceListBuilder().withResources(apiResource).build();
mockServer.expect().withPath("/apis/discovery.k8s.io/v1").andReturn(200, apiResourceList).always();
Assertions.assertEquals(Fabric8EndpointSliceV1CatalogWatch.class, watch.stateGenerator().getClass());
Assertions.assertThat(watch.stateGenerator().getClass()).isEqualTo(Fabric8EndpointSliceV1CatalogWatch.class);
}
}

9
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientServiceWithoutPortNameTests.java
View File

@@ -32,7 +32,7 @@ import io.fabric8.kubernetes.api.model.ServicePortBuilder;
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
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.Test;
import org.springframework.cloud.client.ServiceInstance;
@@ -72,9 +72,10 @@ class Fabric8KubernetesDiscoveryClientServiceWithoutPortNameTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, a -> null);
List<ServiceInstance> serviceInstances = discoveryClient.getInstances("no-port-name-service");
Assertions.assertEquals(serviceInstances.size(), 1);
Assertions.assertEquals(serviceInstances.get(0).getMetadata(),
Map.of("port.<unset>", "8080", "k8s_namespace", "spring-k8s", "type", "ClusterIP"));
Assertions.assertThat(serviceInstances.size()).isEqualTo(1);
Assertions.assertThat(serviceInstances.get(0).getMetadata())
.containsExactlyInAnyOrderEntriesOf(
Map.of("port.<unset>", "8080", "k8s_namespace", "spring-k8s", "type", "ClusterIP"));
}
}

125
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTests.java
View File

@@ -34,8 +34,8 @@ import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
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.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -77,8 +77,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("serviceId");
Assertions.assertEquals(result.size(), 0);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in all namespaces"));
Assertions.assertThat(result).isEmpty();
Assertions.assertThat(output.getOut()).contains("discovering endpoints in all namespaces");
}
/**
@@ -103,8 +103,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("blue-service");
Assertions.assertEquals(result.size(), 1);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in all namespaces"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(output.getOut()).contains("discovering endpoints in all namespaces");
}
/**
@@ -129,8 +129,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("blue-service");
Assertions.assertEquals(result.size(), 1);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in all namespaces"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(output.getOut()).contains("discovering endpoints in all namespaces");
}
/**
@@ -154,8 +154,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("blue-service");
Assertions.assertEquals(result.size(), 0);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in all namespaces"));
Assertions.assertThat(result).isEmpty();
Assertions.assertThat(output.getOut()).contains("discovering endpoints in all namespaces");
}
/**
@@ -183,8 +183,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("service-one");
Assertions.assertEquals(result.size(), 1);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in all namespaces"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(output.getOut()).contains("discovering endpoints in all namespaces");
}
/**
@@ -212,11 +212,11 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("service-one");
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(
result.stream().map(Endpoints::getMetadata).map(ObjectMeta::getNamespace).sorted().toList(),
List.of("a", "b"));
Assertions.assertTrue(output.getOut().contains("discovering endpoints in all namespaces"));
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions
.assertThat(result.stream().map(Endpoints::getMetadata).map(ObjectMeta::getNamespace).sorted().toList())
.isEqualTo(List.of("a", "b"));
Assertions.assertThat(output.getOut()).contains("discovering endpoints in all namespaces");
}
/**
@@ -236,8 +236,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("serviceId");
Assertions.assertEquals(result.size(), 0);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespace : test"));
Assertions.assertThat(result).isEmpty();
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespace : test");
}
/**
@@ -262,8 +262,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("blue-service");
Assertions.assertEquals(result.size(), 1);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespace : test"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespace : test");
}
/**
@@ -288,8 +288,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("blue-service");
Assertions.assertEquals(result.size(), 1);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespace : test"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespace : test");
}
/**
@@ -313,8 +313,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("blue-service");
Assertions.assertEquals(result.size(), 0);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespace : test"));
Assertions.assertThat(result).isEmpty();
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespace : test");
}
/**
@@ -342,8 +342,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("service-one");
Assertions.assertEquals(result.size(), 1);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespace : test"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespace : test");
}
/**
@@ -371,11 +371,11 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("service-one");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(
result.stream().map(Endpoints::getMetadata).map(ObjectMeta::getNamespace).sorted().toList(),
List.of("test"));
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespace : test"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions
.assertThat(result.stream().map(Endpoints::getMetadata).map(ObjectMeta::getNamespace).sorted().toList())
.isEqualTo(List.of("test"));
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespace : test");
}
/**
@@ -395,8 +395,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("serviceId");
Assertions.assertEquals(result.size(), 0);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespaces : [test]"));
Assertions.assertThat(result).isEmpty();
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespaces : [test]");
}
/**
@@ -422,8 +422,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, x -> true,
null);
List<Endpoints> result = discoveryClient.getEndPointsList("blue-service");
Assertions.assertEquals(result.size(), 1);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespaces : [test]"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespaces : [test]");
}
/**
@@ -452,9 +452,10 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("blue-service");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getLabels(), Map.of("color", "blue", "shape", "round"));
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespaces : [a]"));
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getLabels())
.containsExactlyInAnyOrderEntriesOf(Map.of("color", "blue", "shape", "round"));
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespaces : [a]");
}
/**
@@ -485,8 +486,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<Endpoints> result = discoveryClient.getEndPointsList("blue-service");
Assertions.assertEquals(result.size(), 2);
Assertions.assertTrue(output.getOut().contains("discovering endpoints in namespaces : " + namespacesAsString));
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(output.getOut()).contains("discovering endpoints in namespaces : " + namespacesAsString);
}
/**
@@ -521,8 +522,8 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<String> result = discoveryClient.getServices();
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0), "blue-service");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0)).isEqualTo("blue-service");
}
@Test
@@ -545,15 +546,16 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
Assertions.assertEquals(result.size(), 1);
Assertions.assertThat(result.size()).isEqualTo(1);
DefaultKubernetesServiceInstance externalNameServiceInstance = (DefaultKubernetesServiceInstance) result.get(0);
Assertions.assertEquals(externalNameServiceInstance.getServiceId(), "blue-service");
Assertions.assertEquals(externalNameServiceInstance.getHost(), "k8s-spring-b");
Assertions.assertEquals(externalNameServiceInstance.getPort(), -1);
Assertions.assertFalse(externalNameServiceInstance.isSecure());
Assertions.assertEquals(externalNameServiceInstance.getUri().toASCIIString(), "k8s-spring-b");
Assertions.assertEquals(externalNameServiceInstance.getMetadata(), Map.of("k8s_namespace", "b",
"labels-prefix-label-key", "label-value", "annotations-prefix-abc", "def", "type", "ExternalName"));
Assertions.assertThat(externalNameServiceInstance.getServiceId()).isEqualTo("blue-service");
Assertions.assertThat(externalNameServiceInstance.getHost()).isEqualTo("k8s-spring-b");
Assertions.assertThat(externalNameServiceInstance.getPort()).isEqualTo(-1);
Assertions.assertThat(externalNameServiceInstance.isSecure()).isFalse();
Assertions.assertThat(externalNameServiceInstance.getUri().toASCIIString()).isEqualTo("k8s-spring-b");
Assertions.assertThat(externalNameServiceInstance.getMetadata())
.containsExactlyInAnyOrderEntriesOf(Map.of("k8s_namespace", "b", "labels-prefix-label-key", "label-value",
"annotations-prefix-abc", "def", "type", "ExternalName"));
}
@Test
@@ -595,17 +597,20 @@ class Fabric8KubernetesDiscoveryClientTests {
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
Assertions.assertEquals(result.size(), 1);
Assertions.assertThat(result.size()).isEqualTo(1);
DefaultKubernetesServiceInstance serviceInstance = (DefaultKubernetesServiceInstance) result.get(0);
Assertions.assertEquals(serviceInstance.getServiceId(), "blue-service");
Assertions.assertEquals(serviceInstance.getHost(), "127.0.0.1");
Assertions.assertEquals(serviceInstance.getPort(), 8080);
Assertions.assertFalse(serviceInstance.isSecure());
Assertions.assertEquals(serviceInstance.getUri().toASCIIString(), "http://127.0.0.1:8080");
Assertions.assertEquals(serviceInstance.getMetadata(),
Map.of("k8s_namespace", "a", "type", "ClusterIP", "ports-prefix<unset>", "8080"));
Assertions.assertEquals(serviceInstance.podMetadata().get("labels"), Map.of("a", "b"));
Assertions.assertEquals(serviceInstance.podMetadata().get("annotations"), Map.of("c", "d"));
Assertions.assertThat(serviceInstance.getServiceId()).isEqualTo("blue-service");
Assertions.assertThat(serviceInstance.getHost()).isEqualTo("127.0.0.1");
Assertions.assertThat(serviceInstance.getPort()).isEqualTo(8080);
Assertions.assertThat(serviceInstance.isSecure()).isFalse();
Assertions.assertThat(serviceInstance.getUri().toASCIIString()).isEqualTo("http://127.0.0.1:8080");
Assertions.assertThat(serviceInstance.getMetadata())
.containsExactlyInAnyOrderEntriesOf(
Map.of("k8s_namespace", "a", "type", "ClusterIP", "ports-prefix<unset>", "8080"));
Assertions.assertThat(serviceInstance.podMetadata().get("labels"))
.containsExactlyInAnyOrderEntriesOf(Map.of("a", "b"));
Assertions.assertThat(serviceInstance.podMetadata().get("annotations"))
.containsExactlyInAnyOrderEntriesOf(Map.of("c", "d"));
}
private void createEndpoints(String namespace, String name, Map<String, String> labels) {

44
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsFilterTests.java
View File

@@ -27,8 +27,8 @@ import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
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.Test;
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
@@ -56,7 +56,7 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests {
void withFilterEmptyInput() {
List<Endpoints> result = Fabric8KubernetesDiscoveryClientUtils.withFilter(List.of(), PROPERTIES, client,
ALWAYS_TRUE);
Assertions.assertEquals(result.size(), 0);
Assertions.assertThat(result).isEmpty();
}
/**
@@ -73,7 +73,7 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests {
createService("a", "namespace-not-a");
List<Endpoints> result = Fabric8KubernetesDiscoveryClientUtils.withFilter(List.of(endpoints), PROPERTIES,
client, x -> true);
Assertions.assertEquals(result.size(), 0);
Assertions.assertThat(result).isEmpty();
}
/**
@@ -90,7 +90,7 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests {
createService("a", "namespace-a");
List<Endpoints> result = Fabric8KubernetesDiscoveryClientUtils.withFilter(List.of(endpoints), PROPERTIES,
client, ALWAYS_TRUE);
Assertions.assertEquals(result.size(), 1);
Assertions.assertThat(result.size()).isEqualTo(1);
}
/**
@@ -109,9 +109,9 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests {
createService("a", "namespace-a");
List<Endpoints> result = Fabric8KubernetesDiscoveryClientUtils.withFilter(List.of(endpointsA, endpointsB),
PROPERTIES, client, x -> true);
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "a");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespace-a");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("a");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespace-a");
}
/**
@@ -133,7 +133,7 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests {
createService("a", "namespace-a");
List<Endpoints> result = Fabric8KubernetesDiscoveryClientUtils.withFilter(List.of(endpointsA, endpointsB),
PROPERTIES, client, ALWAYS_TRUE);
Assertions.assertEquals(result.size(), 2);
Assertions.assertThat(result.size()).isEqualTo(2);
}
/**
@@ -157,12 +157,12 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests {
List<Endpoints> result = Fabric8KubernetesDiscoveryClientUtils.withFilter(List.of(endpointsA, endpointsB),
PROPERTIES, client, ALWAYS_TRUE);
Assertions.assertEquals(result.size(), 2);
Assertions.assertThat(result.size()).isEqualTo(2);
result = result.stream().sorted(Comparator.comparing(x -> x.getMetadata().getName())).toList();
Assertions.assertEquals(result.get(0).getMetadata().getName(), "a");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespace-a");
Assertions.assertEquals(result.get(1).getMetadata().getName(), "b");
Assertions.assertEquals(result.get(1).getMetadata().getNamespace(), "namespace-b");
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("a");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespace-a");
Assertions.assertThat(result.get(1).getMetadata().getName()).isEqualTo("b");
Assertions.assertThat(result.get(1).getMetadata().getNamespace()).isEqualTo("namespace-b");
}
/**
@@ -183,9 +183,9 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests {
List<Endpoints> result = Fabric8KubernetesDiscoveryClientUtils.withFilter(List.of(endpointsA), PROPERTIES,
client, x -> x.getMetadata().getNamespace().equals("namespace-a"));
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "a");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespace-a");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("a");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("namespace-a");
}
/**
@@ -210,12 +210,12 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests {
List<Endpoints> result = Fabric8KubernetesDiscoveryClientUtils.withFilter(
List.of(endpointsA, endpointsB, endpointsC), PROPERTIES, client,
x -> x.getMetadata().getName().contains("1"));
Assertions.assertEquals(result.size(), 2);
Assertions.assertThat(result.size()).isEqualTo(2);
result = result.stream().sorted(Comparator.comparing(x -> x.getMetadata().getName())).toList();
Assertions.assertEquals(result.get(0).getMetadata().getName(), "a-1");
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "default");
Assertions.assertEquals(result.get(1).getMetadata().getName(), "b-1");
Assertions.assertEquals(result.get(1).getMetadata().getNamespace(), "default");
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("a-1");
Assertions.assertThat(result.get(0).getMetadata().getNamespace()).isEqualTo("default");
Assertions.assertThat(result.get(1).getMetadata().getName()).isEqualTo("b-1");
Assertions.assertThat(result.get(1).getMetadata().getNamespace()).isEqualTo("default");
}
/**
@@ -235,7 +235,7 @@ class Fabric8KubernetesDiscoveryClientUtilsFilterTests {
List<Endpoints> result = Fabric8KubernetesDiscoveryClientUtils.withFilter(List.of(endpointsA), PROPERTIES,
client, x -> !x.getMetadata().getName().contains("1"));
Assertions.assertEquals(result.size(), 0);
Assertions.assertThat(result).isEmpty();
}
private Endpoints createEndpoints(String name, String namespace) {

68
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtilsTests.java
View File

@@ -28,8 +28,8 @@ import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
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.Test;
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
@@ -69,9 +69,9 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
service("serviceB", "B", Map.of());
List<Service> result = services(properties, client, null, x -> true, null, "fabric8-discovery");
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result.stream().map(s -> s.getMetadata().getName()).sorted().toList(),
List.of("serviceA", "serviceB"));
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result.stream().map(s -> s.getMetadata().getName()).sorted().toList())
.containsExactlyInAnyOrder("serviceA", "serviceB");
}
/**
@@ -92,8 +92,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
List<Service> result = services(properties, client, null, x -> true, Map.of("metadata.name", "serviceA"),
"fabric8-discovery");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
}
/**
@@ -114,8 +114,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
List<Service> result = services(properties, client, null,
x -> x.getMetadata().getLabels().equals(Map.of("letter", "b")), null, "fabric8-discovery");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceB");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceB");
}
/**
@@ -138,9 +138,9 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
service("serviceC", "C", Map.of());
List<Service> result = services(properties, client, null, x -> true, null, "fabric8-discovery");
Assertions.assertEquals(result.size(), 2);
Assertions.assertEquals(result.stream().map(x -> x.getMetadata().getName()).sorted().toList(),
List.of("serviceA", "serviceB"));
Assertions.assertThat(result.size()).isEqualTo(2);
Assertions.assertThat(result.stream().map(x -> x.getMetadata().getName()).sorted().toList())
.containsExactlyInAnyOrder("serviceA", "serviceB");
}
/**
@@ -164,8 +164,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
List<Service> result = services(properties, client, null, x -> true, Map.of("metadata.name", "serviceA"),
"fabric8-discovery");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
}
/**
@@ -189,8 +189,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
List<Service> result = services(properties, client, null,
x -> x.getMetadata().getLabels().equals(Map.of("letter", "b")), null, "fabric8-discovery");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceB");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceB");
}
/**
@@ -215,8 +215,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
List<Service> result = services(properties, client, namespaceProvider("A"), x -> true, null,
"fabric8-discovery");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
}
/**
@@ -239,8 +239,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
List<Service> result = services(properties, client, namespaceProvider("A"), x -> true,
Map.of("metadata.name", "serviceA"), "fabric8-discovery");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceA");
}
/**
@@ -263,8 +263,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
List<Service> result = services(properties, client, namespaceProvider("A"),
x -> x.getMetadata().getLabels().equals(Map.of("letter", "b")), null, "fabric8-discovery");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceB");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("serviceB");
}
@Test
@@ -283,8 +283,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
List<Service> result = services(properties, client, namespaceProvider("test"),
x -> x.getSpec().getType().equals("ExternalName"), Map.of(), "fabric8-discovery");
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get(0).getMetadata().getName(), "external-name-service");
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get(0).getMetadata().getName()).isEqualTo("external-name-service");
}
@Test
@@ -297,9 +297,9 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
.build());
Map<String, Integer> portsData = endpointSubsetsPortData(endpointSubsets);
Assertions.assertEquals(portsData.size(), 2);
Assertions.assertEquals(portsData.get("https"), 8080);
Assertions.assertEquals(portsData.get("<unset>"), 8081);
Assertions.assertThat(portsData.size()).isEqualTo(2);
Assertions.assertThat(portsData.get("https")).isEqualTo(8080);
Assertions.assertThat(portsData.get("<unset>")).isEqualTo(8081);
}
@Test
@@ -312,9 +312,9 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
.build());
Map<String, Integer> portsData = endpointSubsetsPortData(endpointSubsets);
Assertions.assertEquals(portsData.size(), 2);
Assertions.assertEquals(portsData.get("https"), 8080);
Assertions.assertEquals(portsData.get("http"), 8081);
Assertions.assertThat(portsData.size()).isEqualTo(2);
Assertions.assertThat(portsData.get("https")).isEqualTo(8080);
Assertions.assertThat(portsData.get("http")).isEqualTo(8081);
}
@Test
@@ -322,7 +322,7 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
EndpointSubset endpointSubset = new EndpointSubsetBuilder().build();
Map<String, Integer> result = endpointSubsetsPortData(List.of(endpointSubset));
Assertions.assertEquals(result.size(), 0);
Assertions.assertThat(result).isEmpty();
}
@Test
@@ -332,8 +332,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
.build();
Map<String, Integer> result = endpointSubsetsPortData(List.of(endpointSubset));
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get("name"), 80);
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get("name")).isEqualTo(80);
}
@Test
@@ -343,8 +343,8 @@ class Fabric8KubernetesDiscoveryClientUtilsTests {
.build();
Map<String, Integer> result = endpointSubsetsPortData(List.of(endpointSubset));
Assertions.assertEquals(result.size(), 1);
Assertions.assertEquals(result.get("<unset>"), 80);
Assertions.assertThat(result.size()).isEqualTo(1);
Assertions.assertThat(result.get("<unset>")).isEqualTo(80);
}
private void service(String name, String namespace, Map<String, String> labels) {

14
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8PodLabelsAndAnnotationsSupplierTests.java
View File

@@ -22,8 +22,8 @@ import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.fabric8.kubernetes.api.model.PodBuilder;
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.Test;
import org.springframework.cloud.kubernetes.commons.discovery.PodLabelsAndAnnotations;
@@ -54,9 +54,9 @@ class Fabric8PodLabelsAndAnnotationsSupplierTests {
PodLabelsAndAnnotations result = Fabric8PodLabelsAndAnnotationsSupplier.nonExternalName(client, NAMESPACE)
.apply(POD_NAME);
Assertions.assertNotNull(result);
Assertions.assertTrue(result.labels().isEmpty());
Assertions.assertTrue(result.annotations().isEmpty());
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.labels()).isEmpty();
Assertions.assertThat(result.annotations()).isEmpty();
}
@Test
@@ -73,9 +73,9 @@ class Fabric8PodLabelsAndAnnotationsSupplierTests {
PodLabelsAndAnnotations result = Fabric8PodLabelsAndAnnotationsSupplier.nonExternalName(client, NAMESPACE)
.apply(POD_NAME);
Assertions.assertNotNull(result);
Assertions.assertEquals(result.labels(), Map.of("a", "b"));
Assertions.assertEquals(result.annotations(), Map.of("c", "d"));
Assertions.assertThat(result).isNotNull();
Assertions.assertThat(result.labels()).containsExactlyInAnyOrderEntriesOf(Map.of("a", "b"));
Assertions.assertThat(result.annotations()).containsExactlyInAnyOrderEntriesOf(Map.of("c", "d"));
}
}

6
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.cloud.kubernetes.fabric8.discovery;
import java.util.Collections;
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.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
@@ -62,11 +62,11 @@ class KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests {
setup("server.port=7000", "spring.cloud.config.discovery.enabled=true",
"spring.cloud.kubernetes.discovery.enabled:true", "spring.application.name:test",
"spring.cloud.config.discovery.service-id:configserver");
Assertions.assertEquals(1, context.getParent().getBeanNamesForType(DiscoveryClient.class).length);
Assertions.assertThat(context.getParent().getBeanNamesForType(DiscoveryClient.class).length).isEqualTo(1);
DiscoveryClient client = context.getParent().getBean(DiscoveryClient.class);
verify(client, atLeast(2)).getInstances("configserver");
ConfigClientProperties locator = context.getBean(ConfigClientProperties.class);
Assertions.assertEquals("http://fake:8888/", locator.getUri()[0]);
Assertions.assertThat(locator.getUri()[0]).isEqualTo("http://fake:8888/");
}
private void setup(String... env) {

14
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientUtilsTests.java
View File

@@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.EndpointAddress;
import io.fabric8.kubernetes.api.model.EndpointAddressBuilder;
import io.fabric8.kubernetes.api.model.EndpointSubset;
import io.fabric8.kubernetes.api.model.EndpointSubsetBuilder;
import org.junit.jupiter.api.Assertions;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
@@ -47,7 +47,7 @@ class KubernetesDiscoveryClientUtilsTests {
includeNotReadyAddresses, "", Set.of(), Map.of(), "", null, 0, false, false);
EndpointSubset endpointSubset = new EndpointSubsetBuilder().build();
List<EndpointAddress> addresses = Fabric8KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties);
Assertions.assertEquals(addresses.size(), 0);
Assertions.assertThat(addresses).isEmpty();
}
/**
@@ -66,7 +66,7 @@ class KubernetesDiscoveryClientUtilsTests {
new EndpointAddressBuilder().withHostname("two").build())
.build();
List<EndpointAddress> addresses = Fabric8KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties);
Assertions.assertEquals(addresses.size(), 2);
Assertions.assertThat(addresses.size()).isEqualTo(2);
}
/**
@@ -86,9 +86,9 @@ class KubernetesDiscoveryClientUtilsTests {
.withNotReadyAddresses(new EndpointAddressBuilder().withHostname("three").build())
.build();
List<EndpointAddress> addresses = Fabric8KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties);
Assertions.assertEquals(addresses.size(), 2);
Assertions.assertThat(addresses.size()).isEqualTo(2);
List<String> hostNames = addresses.stream().map(EndpointAddress::getHostname).sorted().toList();
Assertions.assertEquals(hostNames, List.of("one", "two"));
Assertions.assertThat(hostNames).containsExactlyInAnyOrder("one", "two");
}
/**
@@ -108,9 +108,9 @@ class KubernetesDiscoveryClientUtilsTests {
.withNotReadyAddresses(new EndpointAddressBuilder().withHostname("three").build())
.build();
List<EndpointAddress> addresses = Fabric8KubernetesDiscoveryClientUtils.addresses(endpointSubset, properties);
Assertions.assertEquals(addresses.size(), 3);
Assertions.assertThat(addresses.size()).isEqualTo(3);
List<String> hostNames = addresses.stream().map(EndpointAddress::getHostname).sorted().toList();
Assertions.assertEquals(hostNames, List.of("one", "three", "two"));
Assertions.assertThat(hostNames).containsExactlyInAnyOrder("one", "three", "two");
}
}

88
spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceInstanceMapperTests.java
View File

@@ -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<String, String> 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,

6
spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServiceListSupplierTests.java
View File

@@ -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<Service> supplier = new Fabric8ServicesListSupplier(environment, client, mapper,
KubernetesDiscoveryProperties.DEFAULT);
List<ServiceInstance> instances = supplier.get().blockFirst();
Assertions.assertEquals(1, instances.size());
Assertions.assertThat(instances.size()).isEqualTo(1);
}
@Test
@@ -97,7 +97,7 @@ class Fabric8ServiceListSupplierTests {
KubernetesServicesListSupplier<Service> supplier = new Fabric8ServicesListSupplier(environment, client, mapper,
discoveryProperties);
List<ServiceInstance> instances = supplier.get().blockFirst();
Assertions.assertEquals(1, instances.size());
Assertions.assertThat(instances.size()).isEqualTo(1);
}
private Service buildService(String name, int port) {

50
spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplierMockClientTests.java
View File

@@ -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<List<ServiceInstance>> serviceInstances = supplier.get().collectList().block();
Assertions.assertEquals(serviceInstances.size(), 1);
Assertions.assertThat(serviceInstances.size()).isEqualTo(1);
List<ServiceInstance> 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<List<ServiceInstance>> serviceInstances = supplier.get().collectList().block();
Assertions.assertEquals(serviceInstances.size(), 1);
Assertions.assertThat(serviceInstances.size()).isEqualTo(1);
List<ServiceInstance> inner = serviceInstances.get(0);
List<ServiceInstance> 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<List<ServiceInstance>> serviceInstances = supplier.get().collectList().block();
Assertions.assertEquals(serviceInstances.size(), 1);
Assertions.assertThat(serviceInstances.size()).isEqualTo(1);
List<ServiceInstance> 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) {

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterIT.java
View File

@@ -51,16 +51,16 @@ class Fabric8DiscoveryFilterIT extends Fabric8DiscoveryBase {
util.createNamespace(NAMESPACE_A_UAT);
util.createNamespace(NAMESPACE_B_UAT);
util.wiremock(NAMESPACE_A_UAT, Phase.CREATE);
util.wiremock(NAMESPACE_B_UAT, Phase.CREATE);
util.wiremock(NAMESPACE_A_UAT, Phase.CREATE, false);
util.wiremock(NAMESPACE_B_UAT, Phase.CREATE, false);
}
@AfterEach
void afterEach() {
util.wiremock(NAMESPACE_A_UAT, Phase.DELETE);
util.wiremock(NAMESPACE_B_UAT, Phase.DELETE);
util.wiremock(NAMESPACE_A_UAT, Phase.DELETE, false);
util.wiremock(NAMESPACE_B_UAT, Phase.DELETE, false);
util.deleteNamespace(NAMESPACE_A_UAT);
util.deleteNamespace(NAMESPACE_B_UAT);

10
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java
View File

@@ -44,8 +44,6 @@ import static org.springframework.cloud.kubernetes.configuration.watcher.TestUti
*/
class ActuatorRefreshIT {
private static final String WIREMOCK_PATH = "/";
private static final String NAMESPACE = "default";
private static final K3sContainer K3S = Commons.container();
@@ -72,12 +70,12 @@ class ActuatorRefreshIT {
@BeforeEach
void setup() {
util.wiremock(NAMESPACE, WIREMOCK_PATH, Phase.CREATE);
util.wiremock(NAMESPACE, Phase.CREATE, true);
}
@AfterEach
void after() {
util.wiremock(NAMESPACE, WIREMOCK_PATH, Phase.DELETE);
util.wiremock(NAMESPACE, Phase.DELETE, true);
}
/*
@@ -114,10 +112,10 @@ class ActuatorRefreshIT {
deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, null, deployment, service, null, true);
util.createAndWait(NAMESPACE, null, deployment, service, true);
}
else {
util.deleteAndWait(NAMESPACE, deployment, service, null);
util.deleteAndWait(NAMESPACE, deployment, service);
}
}

8
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java
View File

@@ -60,7 +60,7 @@ class ActuatorRefreshMultipleNamespacesIT {
util = new Util(K3S);
util.createNamespace(LEFT_NAMESPACE);
util.createNamespace(RIGHT_NAMESPACE);
util.wiremock(DEFAULT_NAMESPACE, "/", Phase.CREATE);
util.wiremock(DEFAULT_NAMESPACE, Phase.CREATE, true);
util.setUpClusterWide(DEFAULT_NAMESPACE, Set.of(DEFAULT_NAMESPACE, LEFT_NAMESPACE, RIGHT_NAMESPACE));
configWatcher(Phase.CREATE);
}
@@ -68,7 +68,7 @@ class ActuatorRefreshMultipleNamespacesIT {
@AfterAll
static void afterAll() {
configWatcher(Phase.DELETE);
util.wiremock(DEFAULT_NAMESPACE, "/", Phase.DELETE);
util.wiremock(DEFAULT_NAMESPACE, Phase.DELETE, true);
util.deleteClusterWide(DEFAULT_NAMESPACE, Set.of(DEFAULT_NAMESPACE, LEFT_NAMESPACE, RIGHT_NAMESPACE));
util.deleteNamespace(LEFT_NAMESPACE);
util.deleteNamespace(RIGHT_NAMESPACE);
@@ -128,10 +128,10 @@ class ActuatorRefreshMultipleNamespacesIT {
.yaml("config-watcher/spring-cloud-kubernetes-configuration-watcher-service.yaml");
if (phase.equals(Phase.CREATE)) {
util.createAndWait(DEFAULT_NAMESPACE, null, deployment, service, null, true);
util.createAndWait(DEFAULT_NAMESPACE, null, deployment, service, true);
}
else {
util.deleteAndWait(DEFAULT_NAMESPACE, deployment, service, null);
util.deleteAndWait(DEFAULT_NAMESPACE, deployment, service);
}
}

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/TestUtil.java
View File

@@ -46,7 +46,7 @@ final class TestUtil {
private static final String WIREMOCK_HOST = "localhost";
private static final int WIREMOCK_PORT = 80;
private static final int WIREMOCK_PORT = 32321;
static final String SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME = "spring-cloud-kubernetes-configuration-watcher";
@@ -60,7 +60,7 @@ final class TestUtil {
// is ready to take a request via 'Wiremock::stubFor' (because sometimes it fails)
// As such, get the existing mappings and retrySpec() makes sure we retry until
// we get a response back.
WebClient client = builder().baseUrl("http://localhost:80/__admin/mappings").build();
WebClient client = builder().baseUrl("http://localhost:32321/__admin/mappings").build();
client.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec()).block();
StubMapping stubMapping = WireMock.stubFor(WireMock.post(WireMock.urlEqualTo("/actuator/refresh"))

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryServerClientBase.java
View File

@@ -93,10 +93,10 @@ abstract class DiscoveryServerClientBase {
V1Service service = (V1Service) util.yaml("manifests/discoveryserver-service.yaml");
if (phase.equals(Phase.CREATE)) {
util.createAndWait(NAMESPACE, null, deployment, service, null, true);
util.createAndWait(NAMESPACE, null, deployment, service, true);
}
else {
util.deleteAndWait(NAMESPACE, deployment, service, null);
util.deleteAndWait(NAMESPACE, deployment, service);
}
}

Some files were not shown because too many files have changed in this diff Show More