From 4abc75b1d31615986ddc11a4274c6688aa513478 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 12 Apr 2019 17:41:10 -0700 Subject: [PATCH] Extend o.s.d.g.tests.integration.IntegrationTestsSupport. Resolves gh-31. --- ...efinedRegionTemplateAutoConfigurationIntegrationTests.java | 4 +++- ...claredRegionTemplateAutoConfigurationIntegrationTests.java | 4 +++- ...efinedRegionTemplateAutoConfigurationIntegrationTests.java | 4 +++- ...RegionTemplateByNameAutoConfigurationIntegrationTests.java | 4 +++- ...gionTemplateByRegionAutoConfigurationIntegrationTests.java | 4 +++- ...efinedRegionTemplateAutoConfigurationIntegrationTests.java | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) 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 a332f252..2e09380f 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 @@ -35,6 +35,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; 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; @@ -56,6 +57,7 @@ import example.library.service.LibraryService; * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.GemfireTemplate * @see org.springframework.data.gemfire.config.annotation.EnableCachingDefinedRegions + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects * @see org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner @@ -64,7 +66,7 @@ import example.library.service.LibraryService; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @SuppressWarnings("unused") -public class CachingDefinedRegionTemplateAutoConfigurationIntegrationTests { +public class CachingDefinedRegionTemplateAutoConfigurationIntegrationTests extends IntegrationTestsSupport { @Autowired private GemFireCache gemfireCache; 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 ca1fd6a7..01c16add 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 @@ -32,6 +32,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; 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; @@ -47,6 +48,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.boot.autoconfigure.SpringBootApplication * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.GemfireTemplate + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects * @see org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner @@ -55,7 +57,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @SuppressWarnings("unused") -public class DeclaredRegionTemplateAutoConfigurationIntegrationTests { +public class DeclaredRegionTemplateAutoConfigurationIntegrationTests extends IntegrationTestsSupport { @Autowired @Qualifier("exampleTemplate") 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 5be2285e..18e7a88c 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 @@ -29,6 +29,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; 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; @@ -49,6 +50,7 @@ import example.app.model.ISBN; * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.GemfireTemplate * @see org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects * @see org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner @@ -57,7 +59,7 @@ import example.app.model.ISBN; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @SuppressWarnings("unused") -public class EntityDefinedRegionTemplateAutoConfigurationIntegrationTests { +public class EntityDefinedRegionTemplateAutoConfigurationIntegrationTests extends IntegrationTestsSupport { @Autowired @Qualifier("authorsTemplate") 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 505d9402..c763914e 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 @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.DependsOn; 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; @@ -48,6 +49,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.boot.autoconfigure.SpringBootApplication * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.GemfireTemplate + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects * @see org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner @@ -56,7 +58,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @SuppressWarnings("unused") -public class ExistingRegionTemplateByNameAutoConfigurationIntegrationTests { +public class ExistingRegionTemplateByNameAutoConfigurationIntegrationTests extends IntegrationTestsSupport { @Autowired private GemfireTemplate exampleTemplate; 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 84e6aed6..32b17e98 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 @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.DependsOn; 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; @@ -48,6 +49,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.boot.autoconfigure.SpringBootApplication * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.GemfireTemplate + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects * @see org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner @@ -56,7 +58,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @SuppressWarnings("unused") -public class ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests { +public class ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests extends IntegrationTestsSupport { @Autowired private ApplicationContext applicationContext; 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 e1fdc472..a8bbab63 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 @@ -27,6 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest; 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; @@ -41,6 +42,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.boot.autoconfigure.SpringBootApplication * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.config.annotation.EnableGemFireProperties + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 @@ -48,7 +50,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @SuppressWarnings("unused") -public class NativeDefinedRegionTemplateAutoConfigurationIntegrationTests { +public class NativeDefinedRegionTemplateAutoConfigurationIntegrationTests extends IntegrationTestsSupport { @Autowired private ApplicationContext applicationContext;