From 5dccd03d7304dd0ff30b5b061b17ed760a6fb30e Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 25 Sep 2015 13:04:50 +0100
Subject: [PATCH] Fix broken test

This test made wrong assumptions about the content of the child
context when trying to simulate autoconfiguration. It needed
an extra EurekaClientAutoConfiguration.
---
 ...iscoveryClientConfigServiceAutoConfiguration.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfiguration.java
index 187b0a794..0c91bd3e4 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfiguration.java
@@ -32,15 +32,16 @@ import com.netflix.discovery.DiscoveryManager;
 import com.netflix.discovery.EurekaClientConfig;
 
 /**
- * Bootstrap configuration for a config client that wants to lookup the config
- * server via discovery.
+ * Bootstrap configuration for a config client that wants to lookup the config server via
+ * discovery.
  *
  * @author Dave Syer
  */
 @ConditionalOnBean({ EurekaDiscoveryClientConfiguration.class })
 @ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false)
 @Configuration
-public class DiscoveryClientConfigServiceAutoConfiguration implements ApplicationListener<RefreshScopeRefreshedEvent> {
+public class DiscoveryClientConfigServiceAutoConfiguration
+		implements ApplicationListener<RefreshScopeRefreshedEvent> {
 
 	@Autowired
 	private EurekaClientConfig clientConfig;
@@ -58,10 +59,11 @@ public class DiscoveryClientConfigServiceAutoConfiguration implements Applicatio
 			DiscoveryManager.getInstance().getDiscoveryClient().shutdown();
 		}
 		ApplicationInfoManager.getInstance().initComponent(this.instanceConfig);
-		DiscoveryManager.getInstance().initComponent(this.instanceConfig, this.clientConfig);
+		DiscoveryManager.getInstance().initComponent(this.instanceConfig,
+				this.clientConfig);
 		this.lifecycle.start();
 	}
-	
+
 	@Override
 	public void onApplicationEvent(RefreshScopeRefreshedEvent arg0) {
 		init();