Skip to content

Replace junit assertions #1901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 3, 2025
Merged

Replace junit assertions #1901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
437ab13
1
wind57 Mar 27, 2025
3fb3400
2
wind57 Mar 27, 2025
deba198
checkstyle
wind57 Mar 27, 2025
cb44d15
Merge branch '3.1.x' into replace_junit_assertions
wind57 Mar 28, 2025
4019f97
more
wind57 Mar 28, 2025
7ab4e0a
fix test
wind57 Mar 28, 2025
e912698
,ore
wind57 Mar 28, 2025
09e7947
more
wind57 Mar 28, 2025
d92778a
Merge branch '3.1.x' into replace_junit_assertions
wind57 Mar 29, 2025
65540a2
more
wind57 Mar 29, 2025
21d2c61
more
wind57 Mar 29, 2025
c828d29
more
wind57 Mar 30, 2025
5f9c82f
more
wind57 Mar 30, 2025
0f96c04
fix
wind57 Apr 1, 2025
990eac5
fix test
wind57 Apr 2, 2025
4303608
Merge branch '3.1.x' into replace_junit_assertions
wind57 Apr 2, 2025
38564a0
Merge branch '3.1.x' into replace_junit_assertions
wind57 Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -57,8 +57,7 @@ void healthEndpointShouldNotContainKubernetes() {
.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 changes: 2 additions & 2 deletions ...ava/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
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;
Expand Down Expand Up @@ -68,7 +68,7 @@ void afterEach() {
@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);
}

Expand Down
6 changes: 3 additions & 3 deletions .../src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -54,8 +54,8 @@ void healthEndpointShouldContainKubernetes() {
.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 changes: 2 additions & 2 deletions ...a/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
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;
Expand Down Expand Up @@ -71,7 +71,7 @@ void afterEach() {
@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);
}

Expand Down
82 changes: 41 additions & 41 deletions ...ework/cloud/kubernetes/client/config/KubernetesClientConfigDataLocationResolverTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

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;
Expand Down Expand Up @@ -78,15 +78,15 @@ void testBothMissing() {
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();
}

/*
Expand Down Expand Up @@ -114,24 +114,24 @@ void testBothPresent() {
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);

}

Expand Down Expand Up @@ -161,25 +161,25 @@ void testBothPresentExplicitly(CapturedOutput capturedOutput) {
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.");
}

/*
Expand Down Expand Up @@ -211,24 +211,24 @@ void testBothPresentAndRetryEnabled() {
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);

}

Expand Down
Loading
Loading