more

Signed-off-by: wind57 <eugen.rabii@gmail.com>

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

@@ -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,8 @@ 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 +197,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 +251,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 +268,8 @@ 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 +292,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 +314,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 +363,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 +396,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 +451,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 +471,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");
 
 	}
 

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

@@ -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,8 @@ 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 +175,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"));
 	}
 
 }

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

@@ -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,7 @@ 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 +153,7 @@ 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"));
 	}
 
 }

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

@@ -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;
@@ -143,11 +143,11 @@ class ConfigReloadUtilTests {
 
 		List<? extends PropertySource> result = ConfigReloadUtil.findPropertySources(PlainPropertySource.class,
 				environment);
-		Assertions.assertEquals(4, result.size());
-		Assertions.assertEquals("b", result.get(0).getProperty("a"));
-		Assertions.assertEquals("plain", result.get(1).getProperty(""));
-		Assertions.assertEquals("from-bootstrap", result.get(2).getProperty(""));
-		Assertions.assertEquals("from-inner-two-composite", result.get(3).getProperty(""));
+		Assertions.assertThat(result.size()).isEqualTo(4);
+		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-bootstrap");
+		Assertions.assertThat(result.get(3).getProperty("")).isEqualTo("from-inner-two-composite");
 	}
 
 	private static final class OneComposite extends CompositePropertySource {

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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,8 +72,8 @@ 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(),
+		Assertions.assertThat(serviceInstances.size()).isEqualTo(1);
+		Assertions.assertThat(serviceInstances.get(0).getMetadata()).containsExactlyInAnyOrderEntriesOf(
 				Map.of("port.<unset>", "8080", "k8s_namespace", "spring-k8s", "type", "ClusterIP"));
 	}
 

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

@@ -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(),
+		Assertions.assertThat(result.size()).isEqualTo(2);
+		Assertions.assertThat(
+				result.stream().map(Endpoints::getMetadata).map(ObjectMeta::getNamespace).sorted().toList()).isEqualTo(
 				List.of("a", "b"));
-		Assertions.assertTrue(output.getOut().contains("discovering endpoints in all namespaces"));
+		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,19 @@ 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(),
+		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.assertEquals(serviceInstance.podMetadata().get("labels"), Map.of("a", "b"));
-		Assertions.assertEquals(serviceInstance.podMetadata().get("annotations"), Map.of("c", "d"));
+		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) {

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

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

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

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

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

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

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

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

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java

@@ -36,7 +36,7 @@ import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.model.Image;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.junit.jupiter.api.Assertions;
+import org.assertj.core.api.Assertions;
 import org.testcontainers.containers.Container;
 import org.testcontainers.k3s.K3sContainer;
 import reactor.netty.http.client.HttpClient;
@@ -111,7 +111,8 @@ public final class Commons {
 								.execInContainer("sh", "-c",
 										"kubectl logs " + appPodName.trim() + "| grep " + "'" + right + "'")
 								.getStdout();
-							Assertions.assertTrue(notPresent == null || notPresent.isBlank());
+
+							Assertions.assertThat(notPresent).isNullOrEmpty();
 						}
 
 						return true;