From fcc21974dc4150778ae2f3fd605b2fe27a5de435 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 7 Aug 2020 17:34:46 -0400 Subject: [PATCH] Updates tests to use use-legacy-processing flag --- .../zookeeper/config/ZookeeperConfigAutoConfigurationTests.java | 2 ++ .../config/ZookeeperPropertySourceLocatorFailFastTests.java | 2 ++ .../zookeeper/config/ZookeeperPropertySourceLocatorTests.java | 1 + .../cloud/zookeeper/sample/SampleApplicationTests.java | 1 + 4 files changed, 6 insertions(+) diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfigurationTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfigurationTests.java index 5e458f19..52cfba8e 100644 --- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfigurationTests.java +++ b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfigurationTests.java @@ -56,6 +56,7 @@ public class ZookeeperConfigAutoConfigurationTests { ConfigurableApplicationContext context = new SpringApplicationBuilder() .sources(Config.class).web(WebApplicationType.NONE) .run("--spring.application.name=testZookeeperConfigEnabledSetToFalse", + "--spring.config.use-legacy-processing=true", "--spring.jmx.default-domain=testZookeeperConfigEnabledSetToFalse", "--spring.cloud.zookeeper.config.connectString=localhost:2188", "--spring.cloud.zookeeper.baseSleepTimeMs=0", @@ -75,6 +76,7 @@ public class ZookeeperConfigAutoConfigurationTests { new SpringApplicationBuilder().sources(Config.class).web(WebApplicationType.NONE) .run("--spring.application.name=testZookeeperConfigEnabledSetToTrue", + "--spring.config.use-legacy-processing=true", "--spring.jmx.default-domain=testZookeeperConfigEnabledSetToTrue", "--spring.cloud.zookeeper.config.connectString=localhost:2188", "--spring.cloud.zookeeper.baseSleepTimeMs=0", diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorFailFastTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorFailFastTests.java index c2d03154..ad494911 100644 --- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorFailFastTests.java +++ b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorFailFastTests.java @@ -51,6 +51,7 @@ public class ZookeeperPropertySourceLocatorFailFastTests { new SpringApplicationBuilder().sources(Config.class) .web(WebApplicationType.NONE) .run("--spring.application.name=testZookeeperPropertySourceLocatorFailFast", + "--spring.config.use-legacy-processing=true", "--spring.cloud.zookeeper.config.connectString=localhost:2188", "--spring.cloud.zookeeper.baseSleepTimeMs=0", "--spring.cloud.zookeeper.maxRetries=0", @@ -66,6 +67,7 @@ public class ZookeeperPropertySourceLocatorFailFastTests { new SpringApplicationBuilder().sources(Config.class) .web(WebApplicationType.NONE) .run("--spring.application.name=testZookeeperPropertySourceLocatorFailFast", + "--spring.config.use-legacy-processing=true", "--spring.cloud.zookeeper.config.connectString=localhost:2188", "--spring.cloud.zookeeper.baseSleepTimeMs=0", "--spring.cloud.zookeeper.maxRetries=0", diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorTests.java index 740853c7..c68862d1 100644 --- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorTests.java +++ b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorTests.java @@ -125,6 +125,7 @@ public class ZookeeperPropertySourceLocatorTests { this.context = new SpringApplicationBuilder(Config.class) .web(WebApplicationType.NONE) .run("--spring.cloud.zookeeper.connectString=" + connectString, + "--spring.config.use-legacy-processing=true", "--spring.application.name=testZkPropertySource", "--logging.level.org.springframework.cloud.zookeeper=DEBUG", "--spring.cloud.zookeeper.config.root=" + ROOT); 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 8f1bd9dd..0fef1aa5 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 @@ -39,6 +39,7 @@ public class SampleApplicationTests { ConfigurableApplicationContext context = new SpringApplicationBuilder( SampleZookeeperApplication.class).run("--server.port=" + port, + "--spring.config.use-legacy-processing=true", "--management.endpoints.web.exposure.include=*", "--spring.cloud.zookeeper.connect-string=localhost:" + zkPort);