diff --git a/pom.xml b/pom.xml index 861c6a18..b120ddfa 100644 --- a/pom.xml +++ b/pom.xml @@ -74,8 +74,15 @@ false - **/*Spec.java + **/*Spec.* + **/*Tests.* + **/*Test.* + + **/Abstract*Spec.* + **/Abstract*Tests.* + **/Abstract*Test.* + diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 1685b022..684cdd12 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -60,7 +60,6 @@ curator-test test - diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 4d39857f..f0016ab7 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -49,6 +49,11 @@ spring-boot-starter-test test + + org.apache.curator + curator-test + test + diff --git a/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java b/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java index 437e4fb5..42a32405 100644 --- a/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java +++ b/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java @@ -24,9 +24,11 @@ import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.RequestMapping; @@ -96,4 +98,11 @@ public class SampleZookeeperApplication { public static void main(String[] args) { SpringApplication.run(SampleZookeeperApplication.class, args); } + + @Bean + @LoadBalanced + RestTemplate loadBalancedRestTemplate() { + return new RestTemplate(); + } + } diff --git a/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java b/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java index d674e813..b712c185 100644 --- a/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java +++ b/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java @@ -16,6 +16,11 @@ package org.springframework.cloud.zookeeper.sample; +import java.io.IOException; + +import org.apache.curator.test.TestingServer; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.SpringApplicationConfiguration; @@ -25,6 +30,18 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SpringApplicationConfiguration(classes = SampleZookeeperApplication.class) public class SampleApplicationTests { + static TestingServer testingServer; + + @BeforeClass + public static void before() throws Exception { + testingServer = new TestingServer(2181); + } + + @AfterClass + public static void clean() throws IOException { + testingServer.close(); + } + @Test public void contextLoads() { } } \ No newline at end of file