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

Fix tests broken by changes in dependencies

Browse Source
This commit is contained in:
Dave Syer
2015-02-16 09:30:52 +00:00
parent 7d0f815404
commit 403e61b016
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eureka-noweb/src/main/java/demo/StandaloneClientApplication.java
View File

@@ -1,6 +1,5 @@
package demo;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
@@ -9,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -28,10 +26,7 @@ public class StandaloneClientApplication implements CommandLineRunner {
@Override
public void run(String... args) throws Exception {
List<String> services = new ArrayList<String>();
for(ServiceInstance instance : client.getAllInstances()) {
services.add(instance.getServiceId());
}
List<String> services = client.getServices();
logger.info("Services: " + services );
}

7
noweb/src/test/java/demo/DiscoveryNotWebApplicationTests.java
View File

@@ -2,7 +2,6 @@ package demo;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
@@ -13,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -47,10 +45,7 @@ public class DiscoveryNotWebApplicationTests {
@Override
public void run(String... args) throws Exception {
List<String> services = new ArrayList<String>();
for (ServiceInstance instance : client.getAllInstances()) {
services.add(instance.getServiceId());
}
List<String> services = client.getServices();
logger.info("Services: " + services);
}
}

1
zuul-proxy-eureka/src/main/resources/application.properties
View File

@@ -1,2 +1,3 @@
debug:
spring.application.name: zuulproxy
server.port: 9900

2
zuul-proxy-eureka/src/test/java/demo/ZuulProxyEurekaApplicationTests.java
View File

@@ -8,11 +8,13 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import static org.junit.Assert.*;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = ZuulProxyEurekaApplication.class)
@WebAppConfiguration
@DirtiesContext
public class ZuulProxyEurekaApplicationTests {