SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed test broken during rebase

Browse Source
This commit is contained in:
Spencer Gibb
2015-06-08 14:02:17 -06:00
parent b746ad5504
commit 0f2fbf8e1c
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTests.java
View File

@@ -23,12 +23,10 @@ import static org.junit.Assert.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
import org.springframework.cloud.netflix.ribbon.test.RibbonClientDefaultConfigurationTestsConfig.BazServiceList;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -43,7 +41,7 @@ import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
* @author Spencer Gibb
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = RibbonClientDefaultConfigurationTests.TestConfig.class)
@SpringApplicationConfiguration(classes = RibbonClientDefaultConfigurationTestsConfig.class)
@IntegrationTest("ribbon.eureka.enabled=true")
@DirtiesContext
public class RibbonClientDefaultConfigurationTests {
@@ -80,10 +78,4 @@ public class RibbonClientDefaultConfigurationTests {
is(instanceOf(ServerListSubsetFilter.class)));
}
@EnableAutoConfiguration
@Configuration
public static class TestConfig {
}
}