diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java index aac17993..c20beb34 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java @@ -31,7 +31,6 @@ import org.springframework.data.gemfire.cache.GemfireCacheManager; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; import org.springframework.geode.boot.autoconfigure.CachingProviderAutoConfiguration; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; @@ -76,8 +75,8 @@ public class ManuallyConfiguredCachingIntegrationTests extends IntegrationTestsS assertThat(mockCacheManager).isNotInstanceOf(GemfireCacheManager.class); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { @Bean diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredWithPropertiesCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredWithPropertiesCachingIntegrationTests.java index 0e1904e4..9e834812 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredWithPropertiesCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredWithPropertiesCachingIntegrationTests.java @@ -27,7 +27,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; import org.springframework.geode.boot.autoconfigure.CachingProviderAutoConfiguration; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.test.context.junit4.SpringRunner; /** @@ -64,8 +63,8 @@ public class ManuallyConfiguredWithPropertiesCachingIntegrationTests extends Int assertThat(this.applicationContext.containsBean("cacheManager")).isFalse(); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { } } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java index a33636f1..0126612b 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java @@ -17,11 +17,11 @@ package org.springframework.geode.boot.autoconfigure.configuration; import static org.assertj.core.api.Assertions.assertThat; +import org.apache.geode.cache.RegionShortcut; + import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.RegionShortcut; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; @@ -30,7 +30,6 @@ import org.springframework.data.gemfire.config.annotation.EnableSsl; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.boot.autoconfigure.configuration.support.CacheProperties; import org.springframework.geode.boot.autoconfigure.configuration.support.CacheServerProperties; import org.springframework.geode.boot.autoconfigure.configuration.support.ClientCacheProperties; @@ -489,8 +488,8 @@ public class GemFirePropertiesIntegrationTests extends IntegrationTestsSupport { assertThat(redisProperties.getPort()).isEqualTo(3697); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { } } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/locator/SpringBootLocatorApplicationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/locator/SpringBootLocatorApplicationIntegrationTests.java index 102c572e..e596834b 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/locator/SpringBootLocatorApplicationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/locator/SpringBootLocatorApplicationIntegrationTests.java @@ -18,18 +18,17 @@ package org.springframework.geode.boot.autoconfigure.locator; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.distributed.Locator; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -66,8 +65,8 @@ public class SpringBootLocatorApplicationIntegrationTests { assertThat(this.mockLocator).isNotNull(); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { @Bean diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java index d7f91185..712673fd 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java @@ -19,18 +19,17 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Properties; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.GemFireCache; import org.apache.geode.distributed.internal.DistributionConfig; +import org.junit.Test; +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.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.test.context.junit4.SpringRunner; /** @@ -78,8 +77,8 @@ public class LoggingAutoConfigurationIntegrationTests extends IntegrationTestsSu assertThat(distributedSystemProperties.getProperty(DistributionConfig.LOG_LEVEL_NAME)).isEqualTo("fine"); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { } } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java index 7572dfbb..3f9dbf89 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java @@ -17,14 +17,14 @@ package org.springframework.geode.boot.autoconfigure.session; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; +import org.junit.Before; +import org.junit.Test; +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; @@ -35,7 +35,6 @@ import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; import org.springframework.data.gemfire.util.RegionUtils; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.session.Session; import org.springframework.session.SessionRepository; import org.springframework.session.data.gemfire.GemFireOperationsSessionRepository; @@ -130,8 +129,8 @@ public class AutoConfiguredSessionCachingIntegrationTests extends IntegrationTes assertThat(((GemfireAccessor) gemfireOperations).getRegion()).isEqualTo(sessionRegion); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { } } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java index 95be9787..9ba13398 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java @@ -23,12 +23,12 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; import java.util.function.Function; -import org.junit.Before; -import org.junit.Test; - import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientRegionShortcut; +import org.junit.Before; +import org.junit.Test; + import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -40,7 +40,6 @@ import org.springframework.data.gemfire.client.PoolFactoryBean; import org.springframework.data.gemfire.tests.integration.SpringBootApplicationIntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.core.util.ObjectUtils; import org.springframework.mock.env.MockPropertySource; import org.springframework.mock.web.MockServletContext; @@ -261,8 +260,8 @@ public class CustomConfiguredSessionCachingIntegrationTests extends SpringBootAp @SpringBootConfiguration @EnableGemFireMockObjects - @EnableAutoConfiguration(exclude = ContinuousQueryAutoConfiguration.class) - //@SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) + @EnableAutoConfiguration + //@SpringBootApplication static class TestConfiguration { @Bean("MockSessionSerializer") diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java index a605f59c..5a8dd18e 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java @@ -18,12 +18,12 @@ package org.springframework.geode.boot.autoconfigure.session; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; +import org.apache.geode.cache.GemFireCache; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.GemFireCache; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; @@ -31,7 +31,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.session.Session; import org.springframework.session.SessionRepository; import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession; @@ -96,9 +95,9 @@ public class ManuallyConfiguredSessionCachingIntegrationTests extends Integratio assertThat(sessionRepository).isNotInstanceOf(GemFireOperationsSessionRepository.class); } - @EnableGemFireMockObjects + @SpringBootApplication @EnableSpringHttpSession - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) + @EnableGemFireMockObjects static class TestConfiguration { @Bean diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java index bede0e02..98171989 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java @@ -17,12 +17,12 @@ package org.springframework.geode.boot.autoconfigure.session; import static org.assertj.core.api.Assertions.assertThat; +import org.apache.geode.cache.GemFireCache; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.GemFireCache; - import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -30,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.session.SessionRepository; import org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -82,8 +81,8 @@ public class ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests exte this.applicationContext.getBean(SessionRepository.class); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { } } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java index f614681c..803e8dbf 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java @@ -26,7 +26,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.boot.autoconfigure.SpringSessionAutoConfiguration; import org.springframework.session.SessionRepository; import org.springframework.test.context.junit4.SpringRunner; @@ -66,8 +65,8 @@ public class NoAutoConfigurationOfSessionCachingIntegrationTests extends Integra assertThat(this.applicationContext.getBeansOfType(SessionRepository.class)).isEmpty(); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { } } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java index 001fe9c0..bb7c5045 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java @@ -21,12 +21,12 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Resource; +import org.apache.geode.cache.Region; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.Region; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; @@ -34,7 +34,6 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.config.annotation.EnableLogging; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.session.Session; import org.springframework.session.SessionRepository; import org.springframework.session.data.gemfire.GemFireOperationsSessionRepository; @@ -142,7 +141,7 @@ public class SessionExpirationIntegrationTests extends IntegrationTestsSupport { } } - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) + @SpringBootApplication @EnableLogging(logLevel = GEMFIRE_LOG_LEVEL) static class TestConfiguration { diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java index 9fb96df5..b4af6661 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -22,14 +22,14 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -39,7 +39,6 @@ import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.config.annotation.EnableCachingDefinedRegions; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -128,8 +127,7 @@ public class CachingDefinedRegionTemplateAutoConfigurationIntegrationTests exten @EnableGemFireMockObjects @EnableCachingDefinedRegions(clientRegionShortcut = ClientRegionShortcut.LOCAL) - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class, - scanBasePackageClasses = { NonBeanType.class, LibraryService.class }) + @SpringBootApplication(scanBasePackageClasses = { NonBeanType.class, LibraryService.class }) static class TestApplicationConfiguration { @Bean diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java index 0024494f..594ea1d5 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java @@ -19,13 +19,13 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -36,7 +36,6 @@ import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -75,8 +74,8 @@ public class DeclaredRegionTemplateAutoConfigurationIntegrationTests extends Int assertThat(this.exampleTemplate.getRegion()).isEqualTo(this.exampleRegion); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestGemFireConfiguration { @Bean("Example") diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java index 3c15c945..0aa86e30 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -19,12 +19,12 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -33,7 +33,6 @@ import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -91,8 +90,8 @@ public class EntityDefinedRegionTemplateAutoConfigurationIntegrationTests extend assertThat(this.booksTemplate.getRegion()).isEqualTo(this.books); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) @EnableEntityDefinedRegions(basePackageClasses = Book.class, clientRegionShortcut = ClientRegionShortcut.LOCAL) static class TestApplicationConfiguration { } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java index 6df40afc..4794cf34 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java @@ -19,13 +19,13 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; +import org.junit.Test; +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; @@ -36,7 +36,6 @@ import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -74,8 +73,8 @@ public class ExistingRegionTemplateByNameAutoConfigurationIntegrationTests exten assertThat(this.exampleTemplate.getRegion()).isEqualTo(this.example); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { @Bean("Example") diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java index f6e7a816..dae9f562 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java @@ -19,13 +19,13 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; +import org.junit.Test; +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; @@ -36,7 +36,6 @@ import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -83,8 +82,8 @@ public class ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests ext assertThat(this.testTemplate.getRegion()).isEqualTo(this.example); } + @SpringBootApplication @EnableGemFireMockObjects - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { @Bean("Example") diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java index dad02c5c..0270f235 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -17,11 +17,11 @@ package org.springframework.geode.boot.autoconfigure.template; import static org.assertj.core.api.Assertions.assertThat; +import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.Region; - import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -30,7 +30,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.config.annotation.EnableGemFireProperties; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -73,8 +72,8 @@ public class NativeDefinedRegionTemplateAutoConfigurationIntegrationTests extend assertThat(this.exampleTemplate.getRegion().getName()).isEqualTo("Example"); } + @SpringBootApplication @EnableGemFireProperties(cacheXmlFile = "template-cache.xml") - @SpringBootApplication(exclude = ContinuousQueryAutoConfiguration.class) static class TestConfiguration { } }