From 3697ce7fd9b8f32517e1a025cdf261378193d57f Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 25 Sep 2015 13:29:44 +0100 Subject: [PATCH] Fix broken test (assumptions about eureka-first) --- ...DiscoveryClientConfigServiceAutoConfigurationTests.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfigurationTests.java index 5895383c..163c07ba 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfigurationTests.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.cloud.config.client.ConfigClientProperties; +import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration; import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; @@ -69,7 +70,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { DiscoveryClientConfigServiceAutoConfiguration.class).length); Mockito.verify(this.client, times(2)).getNextServerFromEureka("CONFIGSERVER", false); - Mockito.verify(this.client, times(0)).shutdown(); + Mockito.verify(this.client, times(1)).shutdown(); ConfigClientProperties locator = this.context .getBean(ConfigClientProperties.class); assertEquals("http://foo:7001/", locator.getRawUri()); @@ -89,7 +90,9 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { parent.refresh(); this.context = new AnnotationConfigApplicationContext(); this.context.setParent(parent); - this.context.register(DiscoveryClientConfigServiceAutoConfiguration.class, + this.context.register(PropertyPlaceholderAutoConfiguration.class, + DiscoveryClientConfigServiceAutoConfiguration.class, + EurekaClientAutoConfiguration.class, EurekaDiscoveryClientConfiguration.class); this.context.refresh(); }