fix

Signed-off-by: wind57 <[email protected]>

Author: wind57

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

@@ -68,7 +68,7 @@ void podNamespaceMissing() {
 		MockedStatic<EnvReader> envReaderMockedStatic = Mockito.mockStatic(EnvReader.class);
 		// envReaderMockedStatic.when(() -> EnvReader.getEnv("")).thenReturn("");
 		Optional<String> podNamespace = LeaderUtils.podNamespace();
-		Assertions.assertTrue(podNamespace.isEmpty());
+		Assertions.assertThat(podNamespace.isEmpty()).isTrue();
 		envReaderMockedStatic.close();
 	}
 
@@ -77,8 +77,8 @@ void podNamespacePresent() {
 		MockedStatic<EnvReader> envReaderMockedStatic = Mockito.mockStatic(EnvReader.class);
 		envReaderMockedStatic.when(() -> EnvReader.getEnv("POD_NAMESPACE")).thenReturn("podNamespace");
 		Optional<String> podNamespace = LeaderUtils.podNamespace();
-		Assertions.assertTrue(podNamespace.isPresent());
-		Assertions.assertEquals(podNamespace.get(), "podNamespace");
+		Assertions.assertThat(podNamespace.isPresent()).isTrue();
+		Assertions.assertThat(podNamespace.get()).isEqualTo("podNamespace");
 		envReaderMockedStatic.close();
 	}
 

spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/leader/election/LeaderElectionPropertiesTests.java

@@ -18,7 +18,7 @@
 
 import java.time.Duration;
 
-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;
@@ -34,16 +34,16 @@ class LeaderElectionPropertiesTests {
 	void testDefaults() {
 		new ApplicationContextRunner().withUserConfiguration(Config.class).run(context -> {
 			LeaderElectionProperties properties = context.getBean(LeaderElectionProperties.class);
-			Assertions.assertNotNull(properties);
-			Assertions.assertTrue(properties.publishEvents());
-			Assertions.assertTrue(properties.waitForPodReady());
-			Assertions.assertEquals(Duration.ofSeconds(15), properties.leaseDuration());
-			Assertions.assertEquals("default", properties.lockNamespace());
-			Assertions.assertEquals("spring-k8s-leader-election-lock", properties.lockName());
-			Assertions.assertEquals(Duration.ofSeconds(10), properties.renewDeadline());
-			Assertions.assertEquals(Duration.ofSeconds(2), properties.retryPeriod());
-			Assertions.assertEquals(Duration.ofSeconds(0), properties.waitAfterRenewalFailure());
-			Assertions.assertFalse(properties.useConfigMapAsLock());
+			Assertions.assertThat(properties).isNotNull();
+			Assertions.assertThat(properties.publishEvents()).isTrue();
+			Assertions.assertThat(properties.waitForPodReady()).isTrue();
+			Assertions.assertThat(properties.leaseDuration()).isEqualTo(Duration.ofSeconds(15));
+			Assertions.assertThat(properties.lockNamespace()).isEqualTo("default");
+			Assertions.assertThat(properties.lockName()).isEqualTo("spring-k8s-leader-election-lock");
+			Assertions.assertThat(properties.renewDeadline()).isEqualTo(Duration.ofSeconds(10));
+			Assertions.assertThat(properties.retryPeriod()).isEqualTo(Duration.ofSeconds(2));
+			Assertions.assertThat(properties.waitAfterRenewalFailure()).isEqualTo(Duration.ofSeconds(0));
+			Assertions.assertThat(properties.useConfigMapAsLock()).isFalse();
 		});
 	}
 
@@ -61,16 +61,16 @@ void testNonDefaults() {
 					"spring.cloud.kubernetes.leader.election.use-config-map-as-lock=true")
 			.run(context -> {
 				LeaderElectionProperties properties = context.getBean(LeaderElectionProperties.class);
-				Assertions.assertNotNull(properties);
-				Assertions.assertFalse(properties.waitForPodReady());
-				Assertions.assertFalse(properties.publishEvents());
-				Assertions.assertEquals(Duration.ofSeconds(10), properties.leaseDuration());
-				Assertions.assertEquals("lock-namespace", properties.lockNamespace());
-				Assertions.assertEquals("lock-name", properties.lockName());
-				Assertions.assertEquals(Duration.ofDays(2), properties.renewDeadline());
-				Assertions.assertEquals(Duration.ofMinutes(3), properties.retryPeriod());
-				Assertions.assertEquals(Duration.ofMinutes(13), properties.waitAfterRenewalFailure());
-				Assertions.assertTrue(properties.useConfigMapAsLock());
+				Assertions.assertThat(properties).isNotNull();
+				Assertions.assertThat(properties.waitForPodReady()).isFalse();
+				Assertions.assertThat(properties.publishEvents()).isFalse();
+				Assertions.assertThat(properties.leaseDuration()).isEqualTo(Duration.ofSeconds(10));
+				Assertions.assertThat(properties.lockNamespace()).isEqualTo("lock-namespace");
+				Assertions.assertThat(properties.lockName()).isEqualTo("lock-name");
+				Assertions.assertThat(properties.renewDeadline()).isEqualTo(Duration.ofDays(2));
+				Assertions.assertThat(properties.retryPeriod()).isEqualTo(Duration.ofMinutes(3));
+				Assertions.assertThat(properties.waitAfterRenewalFailure()).isEqualTo(Duration.ofMinutes(13));
+				Assertions.assertThat(properties.useConfigMapAsLock()).isTrue();
 			});
 	}
 

spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionSimpleITTest.java

@@ -23,9 +23,9 @@
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import org.assertj.core.api.Assertions;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterAll;
-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;
@@ -75,22 +75,22 @@ void test(CapturedOutput output) {
 			.until(() -> output.getOut().contains("Attempting to renew leader lease"));
 
 		// all these logs happen before a renewal
-		Assertions.assertTrue(output.getOut().contains("will use lease as the lock for leader election"));
-		Assertions.assertTrue(output.getOut().contains("starting leader initiator"));
-		Assertions.assertTrue(output.getOut().contains("Leader election started"));
-		Assertions.assertTrue(output.getOut().contains("Successfully Acquired leader lease"));
+		Assertions.assertThat(output.getOut()).contains("will use lease as the lock for leader election");
+		Assertions.assertThat(output.getOut()).contains("starting leader initiator");
+		Assertions.assertThat(output.getOut()).contains("Leader election started");
+		Assertions.assertThat(output.getOut()).contains("Successfully Acquired leader lease");
 
 		Lease lockLease = kubernetesClient.leases()
 			.inNamespace("default")
 			.withName("spring-k8s-leader-election-lock")
 			.get();
 		ZonedDateTime currentAcquiredTime = lockLease.getSpec().getAcquireTime();
-		Assertions.assertNotNull(currentAcquiredTime);
-		Assertions.assertEquals(15, lockLease.getSpec().getLeaseDurationSeconds());
-		Assertions.assertEquals(0, lockLease.getSpec().getLeaseTransitions());
+		Assertions.assertThat(currentAcquiredTime).isNotNull();
+		Assertions.assertThat(lockLease.getSpec().getLeaseDurationSeconds()).isEqualTo(15);
+		Assertions.assertThat(lockLease.getSpec().getLeaseTransitions()).isEqualTo(0);
 
 		ZonedDateTime currentRenewalTime = lockLease.getSpec().getRenewTime();
-		Assertions.assertNotNull(currentRenewalTime);
+		Assertions.assertThat(currentRenewalTime).isNotNull();
 
 		// renew happened, we renew by default on every two seconds
 		Awaitility.await()