From ae0da3b79e9e4ffa3c4c4c36fcb61eb6e088ad04 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 5 Apr 2017 20:10:23 -0600 Subject: [PATCH] Update from NoopDiscoveryClient default to SimpleDiscoveryClient --- ...=> DefaultStandaloneClientApplicationTests.java} | 12 ++++++------ .../src/test/java/demo/NoWebApplicationTests.java | 10 +++++----- .../java/test/DiscoveryNotWebApplicationTests.java | 12 ++++++------ .../test/java/demo/ZuulProxyApplicationTests.java | 12 ++++++------ zuul/src/test/java/demo/ZuulApplicationTests.java | 13 ++++++------- 5 files changed, 29 insertions(+), 30 deletions(-) rename eureka-noweb/src/test/java/demo/{NoopStandaloneClientApplicationTests.java => DefaultStandaloneClientApplicationTests.java} (73%) diff --git a/eureka-noweb/src/test/java/demo/NoopStandaloneClientApplicationTests.java b/eureka-noweb/src/test/java/demo/DefaultStandaloneClientApplicationTests.java similarity index 73% rename from eureka-noweb/src/test/java/demo/NoopStandaloneClientApplicationTests.java rename to eureka-noweb/src/test/java/demo/DefaultStandaloneClientApplicationTests.java index 316db6b..795481d 100644 --- a/eureka-noweb/src/test/java/demo/NoopStandaloneClientApplicationTests.java +++ b/eureka-noweb/src/test/java/demo/DefaultStandaloneClientApplicationTests.java @@ -1,28 +1,28 @@ package demo; -import static org.junit.Assert.assertTrue; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient; +import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClient; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.junit.Assert.assertTrue; + @RunWith(SpringRunner.class) @SpringBootTest(properties = "eureka.client.enabled=false") @DirtiesContext -public class NoopStandaloneClientApplicationTests { +public class DefaultStandaloneClientApplicationTests { @Autowired private DiscoveryClient discoveryClient; @Test - public void testDiscoveryClientIsNoop() { + public void testDiscoveryClientIsSimple() { assertTrue("discoveryClient is wrong instance type", - discoveryClient instanceof NoopDiscoveryClient); + discoveryClient instanceof SimpleDiscoveryClient); } } diff --git a/feign-eureka/src/test/java/demo/NoWebApplicationTests.java b/feign-eureka/src/test/java/demo/NoWebApplicationTests.java index 619e4e8..3eadf6b 100644 --- a/feign-eureka/src/test/java/demo/NoWebApplicationTests.java +++ b/feign-eureka/src/test/java/demo/NoWebApplicationTests.java @@ -1,17 +1,17 @@ package demo; -import static org.junit.Assert.assertTrue; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient; +import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClient; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.junit.Assert.assertTrue; + @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "eureka.client.enabled=false") @DirtiesContext @@ -21,9 +21,9 @@ public class NoWebApplicationTests { private DiscoveryClient discoveryClient; @Test - public void testDiscoveryClientIsNoop() { + public void testDiscoveryClientIsSimple() { assertTrue("discoveryClient is wrong instance type", - discoveryClient instanceof NoopDiscoveryClient); + discoveryClient instanceof SimpleDiscoveryClient); } } diff --git a/noweb/src/test/java/test/DiscoveryNotWebApplicationTests.java b/noweb/src/test/java/test/DiscoveryNotWebApplicationTests.java index 515dd5b..3c84f38 100644 --- a/noweb/src/test/java/test/DiscoveryNotWebApplicationTests.java +++ b/noweb/src/test/java/test/DiscoveryNotWebApplicationTests.java @@ -1,7 +1,5 @@ package test; -import static org.junit.Assert.assertTrue; - import java.util.List; import org.apache.commons.logging.Log; @@ -13,9 +11,11 @@ import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient; +import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClient; import org.springframework.test.context.junit4.SpringRunner; +import static org.junit.Assert.assertTrue; + import demo.NotWebApplication; @RunWith(SpringRunner.class) @@ -26,13 +26,13 @@ public class DiscoveryNotWebApplicationTests { private DiscoveryClient discoveryClient; @Test - public void testDiscoveryClientIsNoop() { + public void testDiscoveryClientIsSimple() { assertTrue("discoveryClient is wrong instance type", - discoveryClient instanceof NoopDiscoveryClient); + discoveryClient instanceof SimpleDiscoveryClient); } /* - * This works because the NoopDiscoveryClient is installed if there is no @EnableDiscoveryClient + * This works because the SimpleDiscoveryClient is installed if there is no @EnableDiscoveryClient * *and* there is no implementation on the classpath */ @SpringBootApplication diff --git a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java index 75116cc..5b2f24a 100644 --- a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java +++ b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java @@ -1,8 +1,5 @@ package demo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -11,12 +8,15 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient; +import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClient; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT) @DirtiesContext @@ -51,7 +51,7 @@ public class ZuulProxyApplicationTests { } @Test - public void discoveryClientIsNoop() { - assertTrue("discoveryClient is wrong type", this.discoveryClient instanceof NoopDiscoveryClient); + public void discoveryClientIsSimple() { + assertTrue("discoveryClient is wrong type", this.discoveryClient instanceof SimpleDiscoveryClient); } } diff --git a/zuul/src/test/java/demo/ZuulApplicationTests.java b/zuul/src/test/java/demo/ZuulApplicationTests.java index 24fdfe5..d5040d8 100644 --- a/zuul/src/test/java/demo/ZuulApplicationTests.java +++ b/zuul/src/test/java/demo/ZuulApplicationTests.java @@ -1,21 +1,20 @@ package demo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient; +import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClient; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT) @DirtiesContext @@ -34,8 +33,8 @@ public class ZuulApplicationTests { } @Test - public void discoveryClientIsNoop() { + public void discoveryClientIsSimple() { assertTrue("discoveryClient is wrong type", - this.discoveryClient instanceof NoopDiscoveryClient); + this.discoveryClient instanceof SimpleDiscoveryClient); } }