diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java index 7cc51045..a845488e 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java @@ -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(); } } diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java index 1293c7f5..5f3c6f87 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledFailFastExceptionTest.java @@ -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); } diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java index 37d8117a..4645da2a 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java @@ -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(); + } } diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java index 57c6db17..cf5df2c9 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledNoFailFastExceptionTest.java @@ -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); }