From 170c4da2dfa0b6570d4391697bd4883da9fda2d5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 29 Aug 2018 10:46:43 -0700 Subject: [PATCH] Extend o.s.d.g.tests.integration.IntegrationTestSupport to clean up the test context. --- .../session/AutoConfiguredSessionCachingIntegrationTests.java | 4 +++- .../ManuallyConfiguredSessionCachingIntegrationTests.java | 4 +++- ...onfiguredWithPropertiesSessionCachingIntegrationTests.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) 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 375473ec..0d4d40c5 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 @@ -31,6 +31,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.GemfireAccessor; import org.springframework.data.gemfire.GemfireOperations; 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; @@ -54,6 +55,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.context.ApplicationContext * @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.session.Session * @see org.springframework.session.SessionRepository @@ -68,7 +70,7 @@ import org.springframework.test.context.junit4.SpringRunner; webEnvironment = SpringBootTest.WebEnvironment.NONE ) @SuppressWarnings("unused") -public class AutoConfiguredSessionCachingIntegrationTests { +public class AutoConfiguredSessionCachingIntegrationTests extends IntegrationTestsSupport { @Autowired private ApplicationContext applicationContext; 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 bf35e88f..3a42e38d 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 @@ -28,6 +28,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; 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; @@ -49,6 +50,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.context.ApplicationContext * @see org.springframework.context.annotation.Bean + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects * @see org.springframework.session.Session * @see org.springframework.session.SessionRepository @@ -62,7 +64,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @SuppressWarnings("unused") -public class ManuallyConfiguredSessionCachingIntegrationTests { +public class ManuallyConfiguredSessionCachingIntegrationTests extends IntegrationTestsSupport { @Autowired private ApplicationContext applicationContext; 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 461453b5..37ca283f 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 @@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; 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; @@ -44,6 +45,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.boot.autoconfigure.SpringBootApplication * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.context.ApplicationContext + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects * @see org.springframework.session.SessionRepository * @see org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration @@ -53,7 +55,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(properties = "spring.session.store-type=none") @SuppressWarnings("unused") -public class ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests { +public class ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests extends IntegrationTestsSupport { @Autowired private ApplicationContext applicationContext;