From 5e2859bf6be343bb747e60177fd6a339ebd671a1 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 7 Dec 2018 12:29:28 -0500 Subject: [PATCH] Updates test for new state of application context --- ...ryClientAutoConfigurationPropertiesTests.java} | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) rename spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/{KubernetesDiscoveryConfigurationTest.java => KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java} (80%) diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryConfigurationTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java similarity index 80% rename from spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryConfigurationTest.java rename to spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java index 69790f62..e2611729 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryConfigurationTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java @@ -3,20 +3,20 @@ package org.springframework.cloud.kubernetes.discovery; import io.fabric8.kubernetes.client.KubernetesClient; import org.junit.After; import org.junit.Test; + import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; /** * @author Ryan Dawson */ -public class KubernetesDiscoveryConfigurationTest { +public class KubernetesDiscoveryClientAutoConfigurationPropertiesTests { private ConfigurableApplicationContext context; @@ -30,20 +30,23 @@ public class KubernetesDiscoveryConfigurationTest { @Test public void kubernetesDiscoveryDisabled() throws Exception { setup("spring.cloud.kubernetes.discovery.enabled=false","spring.cloud.kubernetes.discovery.catalog-services-watch.enabled=false"); - assertFalse(context.containsBean("discoveryClient")); + assertThat(context.getBeanNamesForType(KubernetesDiscoveryClient.class)) + .isEmpty(); } @Test public void kubernetesDiscoveryWhenKubernetesDisabled() throws Exception { setup("spring.cloud.kubernetes.enabled=false"); - assertFalse(context.containsBean("discoveryClient")); + assertThat(context.getBeanNamesForType(KubernetesDiscoveryClient.class)) + .isEmpty(); } @Test public void kubernetesDiscoveryDefaultEnabled() throws Exception { setup("spring.cloud.kubernetes.enabled=true"); - assertTrue(context.containsBean("discoveryClient")); + assertThat(context.getBeanNamesForType(KubernetesDiscoveryClient.class)) + .hasSize(1); } private void setup(String... env) {