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

polish tests

Browse Source
This commit is contained in:
Spencer Gibb
2016-12-08 11:01:25 -07:00
parent ade148bd16
commit 91a26f6161
19 changed files with 36 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java
View File

@@ -33,13 +33,12 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit4.SpringRunner;
import com.ecwid.consul.v1.ConsulClient;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.put;
import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
@@ -52,7 +51,7 @@ import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER
/**
* @author Spencer Gibb
*/
@RunWith(SpringJUnit4ClassRunner.class)
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ConsulBinderApplicationTests.Application.class)
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
public class ConsulBinderApplicationTests {

16
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java
View File

@@ -19,21 +19,23 @@ package org.springframework.cloud.consul.config;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.WebIntegrationTest;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit4.SpringRunner;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
/**
* @author Spencer Gibb
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = ConsulPropertySourceLocatorFailFastTests.Config.class)
@WebIntegrationTest(value = {"spring.application.name=testConsulPropertySourceLocatorFailFast",
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ConsulPropertySourceLocatorFailFastTests.Config.class,
properties = {"spring.application.name=testConsulPropertySourceLocatorFailFast",
"spring.cloud.consul.host=53210a7c-4809-42cb-8b30-057d2db85fcc",
"spring.cloud.consul.port=65530",
"spring.cloud.consul.retry.maxAttempts=0",
"spring.cloud.consul.config.failFast=false"}, randomPort = true)
"spring.cloud.consul.config.failFast=false"},
webEnvironment = RANDOM_PORT)
public class ConsulPropertySourceLocatorFailFastTests {
@Configuration

12
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedAgentAddressTests.java
View File

@@ -22,7 +22,6 @@ 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.context.ApplicationContext;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.StringUtils;
@@ -51,17 +50,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class ConsulLifecycleCustomizedAgentAddressTests {
@Autowired
ConsulLifecycle lifecycle;
@Autowired
ConsulClient consul;
private ConsulClient consul;
@Autowired
ConsulDiscoveryProperties discoveryProperties;
@Autowired
ApplicationContext context;
@Test
public void contextLoads() {
Response<Map<String, Service>> response = consul.getAgentServices();

4
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedInstanceGroupTests.java
View File

@@ -23,7 +23,6 @@ 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.context.ApplicationContext;
import org.springframework.test.context.junit4.SpringRunner;
import com.ecwid.consul.v1.ConsulClient;
@@ -52,9 +51,6 @@ public class ConsulLifecycleCustomizedInstanceGroupTests {
@Autowired
private ConsulClient consul;
@Autowired
private ApplicationContext context;
@Autowired
private ConsulDiscoveryProperties properties;

4
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedInstanceZoneTests.java
View File

@@ -22,7 +22,6 @@ 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.context.ApplicationContext;
import org.springframework.test.context.junit4.SpringRunner;
import com.ecwid.consul.v1.ConsulClient;
@@ -51,9 +50,6 @@ public class ConsulLifecycleCustomizedInstanceZoneTests {
@Autowired
private ConsulClient consul;
@Autowired
private ApplicationContext context;
@Test
public void contextLoads() {
Response<Map<String, Service>> response = consul.getAgentServices();

8
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedManagementServicePortTests.java
View File

@@ -33,17 +33,15 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
"spring.cloud.consul.discovery.managementPort=4452", "management.port=0"},
webEnvironment = RANDOM_PORT)
public class ConsulLifecycleCustomizedManagementServicePortTests {
@Autowired
ConsulLifecycle lifecycle;
@Autowired
ConsulClient consul;
private ConsulClient consul;
@Autowired
ConsulDiscoveryProperties discoveryProperties;
private ConsulDiscoveryProperties discoveryProperties;
@Autowired
ManagementServerProperties managementServerProperties;
private ManagementServerProperties managementServerProperties;
@Test
public void contextLoads() {

11
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedPropsTests.java
View File

@@ -26,7 +26,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.consul.ConsulAutoConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -63,16 +62,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class ConsulLifecycleCustomizedPropsTests {
@Autowired
ConsulLifecycle lifecycle;
private ConsulClient consul;
@Autowired
ConsulClient consul;
@Autowired
ApplicationContext context;
@Autowired
ConsulDiscoveryProperties properties;
private ConsulDiscoveryProperties properties;
@Test
public void contextLoads() {

9
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedServiceNameTests.java
View File

@@ -22,7 +22,6 @@ 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.context.ApplicationContext;
import org.springframework.test.context.junit4.SpringRunner;
import com.ecwid.consul.v1.ConsulClient;
@@ -48,13 +47,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class ConsulLifecycleCustomizedServiceNameTests {
@Autowired
ConsulLifecycle lifecycle;
@Autowired
ConsulClient consul;
@Autowired
ApplicationContext context;
private ConsulClient consul;
@Test
public void contextLoads() {

9
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleDefaultPortTests.java
View File

@@ -22,7 +22,6 @@ 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.context.ApplicationContext;
import org.springframework.test.context.junit4.SpringRunner;
import com.ecwid.consul.v1.ConsulClient;
@@ -46,13 +45,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class ConsulLifecycleDefaultPortTests {
@Autowired
ConsulLifecycle lifecycle;
@Autowired
ConsulClient consul;
@Autowired
ApplicationContext context;
private ConsulClient consul;
@Test
public void contextLoads() {

6
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleManagementServiceTests.java
View File

@@ -31,14 +31,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
"management.port=0"},
webEnvironment = RANDOM_PORT)
public class ConsulLifecycleManagementServiceTests {
@Autowired
ConsulLifecycle lifecycle;
@Autowired
ConsulClient consul;
private ConsulClient consul;
@Autowired
ConsulDiscoveryProperties discoveryProperties;
private ConsulDiscoveryProperties discoveryProperties;
@Test
public void contextLoads() {

4
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleTests.java
View File

@@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.consul.ConsulAutoConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.junit4.SpringRunner;
@@ -67,9 +66,6 @@ public class ConsulLifecycleTests {
@Autowired
private ConsulDiscoveryProperties discoveryProperties;
@Autowired
private ApplicationContext context;
@Test
public void contextLoads() {
Response<Map<String, Service>> response = consul.getAgentServices();

10
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java
View File

@@ -26,8 +26,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.consul.ConsulAutoConfiguration;
import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.StringUtils;
@@ -55,14 +53,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class ConsulAutoServiceRegistrationCustomizedAgentAddressTests {
@Autowired
ConsulClient consul;
private ConsulClient consul;
@Autowired
ConsulDiscoveryProperties discoveryProperties;
@Autowired
ApplicationContext context;
@Test
public void contextLoads() {
Response<Map<String, Service>> response = consul.getAgentServices();

9
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java
View File

@@ -53,14 +53,15 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
"spring.cloud.consul.discovery.managementPort=4452", "management.port=0"},
webEnvironment = RANDOM_PORT)
public class ConsulAutoServiceRegistrationCustomizedManagementServicePortTests {
@Autowired
ConsulClient consul;
@Autowired
ConsulDiscoveryProperties discoveryProperties;
private ConsulClient consul;
@Autowired
ManagementServerProperties managementServerProperties;
private ConsulDiscoveryProperties discoveryProperties;
@Autowired
private ManagementServerProperties managementServerProperties;
@Test
public void contextLoads() {

8
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java
View File

@@ -28,7 +28,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.consul.ConsulAutoConfiguration;
import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -63,13 +62,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class ConsulAutoServiceRegistrationCustomizedPropsTests {
@Autowired
ConsulClient consul;
private ConsulClient consul;
@Autowired
ApplicationContext context;
@Autowired
ConsulDiscoveryProperties properties;
private ConsulDiscoveryProperties properties;
@Test
public void contextLoads() {

5
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java
View File

@@ -26,7 +26,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.consul.ConsulAutoConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -49,11 +48,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
"spring.cloud.consul.discovery.serviceName=myprefix-${spring.application.name}"},
webEnvironment = RANDOM_PORT)
public class ConsulAutoServiceRegistrationCustomizedServiceNameTests {
@Autowired
ConsulClient consul;
@Autowired
ApplicationContext context;
private ConsulClient consul;
@Test
public void contextLoads() {

6
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java
View File

@@ -26,7 +26,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.consul.ConsulAutoConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -49,10 +48,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
public class ConsulAutoServiceRegistrationDefaultPortTests {
@Autowired
ConsulClient consul;
@Autowired
ApplicationContext context;
private ConsulClient consul;
@Test
public void contextLoads() {

3
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java
View File

@@ -45,13 +45,13 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
"spring.cloud.service-registry.auto-registration.enabled=false"},
webEnvironment = RANDOM_PORT)
public class ConsulAutoServiceRegistrationDisabledTests {
@Autowired
private ConsulClient consul;
@Autowired(required = false)
private ConsulAutoServiceRegistration autoServiceRegistration;
@Test
public void contextLoads() {
assertNull("ConsulAutoServiceRegistration was created", autoServiceRegistration);
@@ -62,7 +62,6 @@ public class ConsulAutoServiceRegistrationDisabledTests {
assertNull("service was registered", service);
}
@Configuration
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class,

7
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java
View File

@@ -51,11 +51,12 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
"management.port=0"},
webEnvironment = RANDOM_PORT)
public class ConsulAutoServiceRegistrationManagementServiceTests {
@Autowired
ConsulClient consul;
@Autowired
ConsulDiscoveryProperties discoveryProperties;
private ConsulClient consul;
@Autowired
private ConsulDiscoveryProperties discoveryProperties;
@Test
public void contextLoads() {

3
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTests.java
View File

@@ -51,9 +51,6 @@ import static org.springframework.cloud.consul.serviceregistry.ConsulRegistratio
webEnvironment = RANDOM_PORT)
public class ConsulAutoServiceRegistrationTests {
@Autowired
private ConsulAutoServiceRegistration autoRegistration;
@Autowired
private ConsulRegistration registration;