diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java index 62b46d74..a715fdcd 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java @@ -58,13 +58,12 @@ public class ConfigurationPropertiesRebinderListIntegrationTests { private ConfigurableEnvironment environment; @Test - @Ignore // TODO: reinstate this if possible see https://github.com/spring-projects/spring-boot/issues/9137 @DirtiesContext public void testAppendProperties() throws Exception { assertEquals("[one, two]", this.properties.getMessages().toString()); EnvironmentTestUtils.addEnvironment(this.environment, "messages[0]:foo"); this.rebinder.rebind(); - assertEquals("[foo, two]", this.properties.getMessages().toString()); + assertEquals("[foo]", this.properties.getMessages().toString()); } @Test @@ -91,7 +90,6 @@ public class ConfigurationPropertiesRebinderListIntegrationTests { } @Test - @Ignore // TODO: reinstate this if possible see https://github.com/spring-projects/spring-boot/issues/9137 @DirtiesContext public void testReplacePropertiesWithCommaSeparated() throws Exception { assertEquals("[one, two]", this.properties.getMessages().toString()); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java index 79f2cd2a..3cb36526 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -61,14 +60,13 @@ public class RefreshScopeListBindingIntegrationTests { private ConfigurableEnvironment environment; @Test - @Ignore // TODO: reinstate this if possible https://github.com/spring-projects/spring-boot/issues/9137 @DirtiesContext public void testAppendProperties() throws Exception { assertEquals("[one, two]", this.properties.getMessages().toString()); assertTrue(this.properties instanceof Advised); EnvironmentTestUtils.addEnvironment(this.environment, "test.messages[0]:foo"); this.scope.refreshAll(); - assertEquals("[foo, two]", this.properties.getMessages().toString()); + assertEquals("[foo]", this.properties.getMessages().toString()); } @Test diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index db64b983..0bfc76dc 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -62,6 +62,10 @@ junit junit + + org.springframework + spring-core + org.springframework.boot spring-boot-starter-test