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

Updates tests to use use-legacy-processing property

Browse Source
This commit is contained in:
spencergibb
2020-08-07 17:09:03 -04:00
parent 7cf89293cf
commit 54c121ab1e
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java
View File

@@ -78,6 +78,7 @@ public class ConsulPropertySourceLocatorAppNameCustomizedTests {
this.context = new SpringApplicationBuilder(Config.class)
.web(WebApplicationType.NONE)
.run("--spring.application.name=testConsulPropertySourceLocatorAppNameCustomized",
"--spring.config.use-legacy-processing=true",
"--spring.cloud.consul.config.name=" + CONFIG_NAME,
"--spring.cloud.consul.config.prefix=" + ROOT);
@@ -89,7 +90,9 @@ public class ConsulPropertySourceLocatorAppNameCustomizedTests {
@After
public void teardown() {
this.client.deleteKVValues(PREFIX);
this.context.close();
if (context != null) {
this.context.close();
}
}
@Test

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

@@ -32,6 +32,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ConsulPropertySourceLocatorFailFastTests.Config.class,
properties = { "spring.application.name=testConsulPropertySourceLocatorFailFast",
"spring.config.use-legacy-processing=true",
"spring.cloud.consul.host=53210a7c-4809-42cb-8b30-057d2db85fcc",
"spring.cloud.consul.port=65530",
"spring.cloud.consul.retry.enabled=false",

1
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java
View File

@@ -78,6 +78,7 @@ public class ConsulPropertySourceLocatorFilesTests {
this.context = new SpringApplicationBuilder(Config.class)
.web(WebApplicationType.NONE).run("--spring.application.name=" + APP_NAME,
"--spring.config.use-legacy-processing=true",
"--spring.cloud.consul.config.prefix=" + ROOT,
"--spring.cloud.consul.config.format=FILES",
"--spring.profiles.active=dev",

1
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorRetryTests.java
View File

@@ -41,6 +41,7 @@ public class ConsulPropertySourceLocatorRetryTests {
Assert.assertThrows(TransportException.class, () -> {
new SpringApplicationBuilder(Config.class).properties(
"spring.application.name=testConsulPropertySourceLocatorRetry",
"spring.config.use-legacy-processing=true",
"spring.cloud.consul.host=53210a7c-4809-42cb-8b30-057d2db85fcc",
"logging.level.org.springframework.retry=TRACE", "server.port=0",
"spring.cloud.consul.port=65530",

9
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java
View File

@@ -93,6 +93,7 @@ public class ConsulPropertySourceLocatorTests {
this.context = new SpringApplicationBuilder(Config.class)
.web(WebApplicationType.NONE).run("--SPRING_APPLICATION_NAME=" + APP_NAME,
"--spring.config.use-legacy-processing=true",
"--spring.cloud.consul.config.prefix=" + ROOT,
"spring.cloud.consul.config.watch.delay=10");
@@ -104,7 +105,9 @@ public class ConsulPropertySourceLocatorTests {
@After
public void teardown() {
this.client.deleteKVValues(PREFIX);
this.context.close();
if (context != null) {
this.context.close();
}
}
@Test
@@ -114,7 +117,7 @@ public class ConsulPropertySourceLocatorTests {
}
@Test
@Ignore // FIXME broken tests with boot 2.0.0
@Ignore // FIXME: broken tests with boot 2.0.0
public void propertyLoadedAndUpdated() throws Exception {
String testProp = this.environment.getProperty(TEST_PROP_CANONICAL);
assertThat(testProp).as("testProp was wrong").isEqualTo(VALUE1);
@@ -132,7 +135,7 @@ public class ConsulPropertySourceLocatorTests {
}
@Test
@Ignore // FIXME broken tests with boot 2.0.0
@Ignore // FIXME: broken tests with boot 2.0.0
public void contextDoesNotExistThenExists() throws Exception {
String testProp = this.environment.getProperty(TEST_PROP3_CANONICAL);
assertThat(testProp).as("testProp was wrong").isNull();