Improve assertions

When the isEqualTo assertion is not met, the error message only states
that the value was something other than 2. When the hasSize assertion
is not met, the error message includes the contents of the map. This
makes it easier to determine what's missing.

Signed-off-by: Andy Wilkinson <[email protected]>

Author: wilkinsona

spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientAutoConfigurationApplicationContextTests.java

@@ -74,7 +74,7 @@ void discoveryEnabledDefault() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");
 
@@ -93,7 +93,7 @@ void discoveryEnabledDefaultWithSelectiveNamespaces() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");
 
@@ -112,7 +112,7 @@ void discoveryEnabled() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");
 
@@ -131,7 +131,7 @@ void discoveryEnabledWithSelectiveNamespaces() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");
 
@@ -182,7 +182,7 @@ void kubernetesDiscoveryEnabled() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");
 
@@ -201,7 +201,7 @@ void kubernetesDiscoveryEnabledWithSelectiveNamespaces() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");
 
@@ -254,7 +254,7 @@ void kubernetesReactiveDiscoveryEnabled() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");
 
@@ -273,7 +273,7 @@ void kubernetesReactiveDiscoveryEnabledWithSelectiveNamespaces() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");
 
@@ -327,7 +327,7 @@ void blockingDisabled() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");
 
@@ -349,7 +349,7 @@ void blockingDisabledWithSelectiveNamespaces() {
 			assertThat(context).hasSingleBean(KubernetesInformerReactiveDiscoveryClient.class);
 
 			// simple from commons and ours
-			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).size().isEqualTo(2);
+			assertThat(context).getBeans(ReactiveDiscoveryClientHealthIndicator.class).hasSize(2);
 			assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
 			assertThat(context).hasBean("reactiveIndicatorInitializer");