|
|
|
@ -23,12 +23,10 @@ import static org.junit.Assert.assertThat;
@@ -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;
@@ -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 {
@@ -80,10 +78,4 @@ public class RibbonClientDefaultConfigurationTests {
|
|
|
|
|
is(instanceOf(ServerListSubsetFilter.class))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@EnableAutoConfiguration |
|
|
|
|
@Configuration |
|
|
|
|
public static class TestConfig { |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|