From 6185541badf8b445bd19d5f37319bccf811fc400 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 20 Sep 2019 14:36:30 -0700 Subject: [PATCH] Avoid test interference by using Spring Profiles. --- ...igurationWithAuthenticationIntegrationTests.java | 13 +++++++------ ...enNonSecureClusterAvailableIntegrationTests.java | 4 ++++ ...eWhenSecureClusterAvailableIntegrationTests.java | 4 ++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java index 4891979c..d26c4bed 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java @@ -39,8 +39,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.FilterType; +import org.springframework.context.annotation.Profile; import org.springframework.core.io.ClassPathResource; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.GemfireUtils; @@ -51,6 +50,7 @@ import org.springframework.data.gemfire.config.annotation.EnableLogging; import org.springframework.data.gemfire.config.annotation.EnableManager; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; import org.springframework.geode.security.TestSecurityManager; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; import example.app.books.model.Book; @@ -68,6 +68,7 @@ import example.app.books.model.ISBN; * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ +@ActiveProfiles("cluster-configuration-with-auth-client") @RunWith(SpringRunner.class) @SpringBootTest( classes = ClusterConfigurationWithAuthenticationIntegrationTests.GeodeClientConfiguration.class, @@ -85,7 +86,8 @@ public class ClusterConfigurationWithAuthenticationIntegrationTests extends Fork @BeforeClass public static void startGemFireServer() throws IOException { - startGemFireServer(GeodeServerConfiguration.class); + startGemFireServer(GeodeServerConfiguration.class, + "-Dspring.profiles.active=cluster-configuration-with-auth-server"); } @Autowired @@ -114,15 +116,14 @@ public class ClusterConfigurationWithAuthenticationIntegrationTests extends Fork } @SpringBootApplication + @Profile("cluster-configuration-with-auth-client") @EnableClusterConfiguration(useHttp = true) @EnableLogging(logLevel = GEMFIRE_LOG_LEVEL) @EnableEntityDefinedRegions(basePackageClasses = Book.class) static class GeodeClientConfiguration { } @SpringBootApplication - @ComponentScan(excludeFilters = - @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = GeodeClientConfiguration.class) - ) + @Profile("cluster-configuration-with-auth-server") @CacheServerApplication(name = "ClusterConfigurationWithAuthenticationIntegrationTests", logLevel = GEMFIRE_LOG_LEVEL) @EnableManager(start = true) static class GeodeServerConfiguration { diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java index 1b7848a2..82785c04 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java @@ -23,12 +23,14 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; import org.springframework.data.gemfire.config.annotation.ClusterConfigurationConfiguration; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; import org.springframework.geode.config.annotation.EnableClusterAware; import org.springframework.geode.core.util.ObjectUtils; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; /** @@ -47,6 +49,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.test.context.junit4.SpringRunner * @since 1.2.0 */ +@ActiveProfiles("cluster-configuration-with-non-secure-cluster") @RunWith(SpringRunner.class) @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.NONE, @@ -79,6 +82,7 @@ public class ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIn @SpringBootApplication @EnableClusterAware @EnableGemFireMockObjects + @Profile("cluster-configuration-with-non-secure-cluster") static class TestConfiguration { } } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java index 3c8e63cd..ceff4a7c 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java @@ -23,12 +23,14 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; import org.springframework.data.gemfire.config.annotation.ClusterConfigurationConfiguration; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; import org.springframework.geode.config.annotation.EnableClusterAware; import org.springframework.geode.core.util.ObjectUtils; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; /** @@ -47,6 +49,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.test.context.junit4.SpringRunner * @since 1.2.0 */ +@ActiveProfiles("cluster-configuration-with-secure-cluster") @RunWith(SpringRunner.class) @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.NONE, @@ -84,6 +87,7 @@ public class ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableInteg @SpringBootApplication @EnableClusterAware @EnableGemFireMockObjects + @Profile("cluster-configuration-with-secure-cluster") static class TestConfiguration { } }