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 5a8dd18e..7e6ab62e 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; @@ -62,7 +62,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @since 1.0.0 */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK) @SuppressWarnings("unused") public class ManuallyConfiguredSessionCachingIntegrationTests extends IntegrationTestsSupport { @@ -93,6 +93,7 @@ public class ManuallyConfiguredSessionCachingIntegrationTests extends Integratio assertThat(sessionRepository).isNotNull(); assertThat(sessionRepository).isNotInstanceOf(GemFireOperationsSessionRepository.class); + assertThat(sessionRepository.getClass().getName().toLowerCase()).doesNotContain("redis"); } @SpringBootApplication 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 98171989..d313787f 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; @@ -53,7 +53,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @since 1.0.0 */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = "spring.session.store-type=none") +@SpringBootTest(properties = "spring.session.store-type=none", webEnvironment = SpringBootTest.WebEnvironment.MOCK) @SuppressWarnings("unused") public class ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests extends IntegrationTestsSupport { @@ -68,10 +68,12 @@ public class ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests exte @Test(expected = NoSuchBeanDefinitionException.class) public void gemfireSessionRegionAndSessionRepositoryAreNotPresent() { + String sessionsRegionName = GemFireHttpSessionConfiguration.DEFAULT_SESSION_REGION_NAME; + assertThat(this.applicationContext.containsBean("gemfireCache")).isTrue(); assertThat(this.applicationContext.containsBean("sessionRepository")).isFalse(); - assertThat(this.applicationContext.containsBean(GemFireHttpSessionConfiguration.DEFAULT_SESSION_REGION_NAME)) - .isFalse(); + assertThat(this.applicationContext.containsBean(sessionsRegionName)).isFalse(); + assertThat(this.applicationContext.getBeansOfType(SessionRepository.class)).isEmpty(); GemFireCache gemfireCache = this.applicationContext.getBean(GemFireCache.class);