From c0dfd1ac2aba404268392c07dcca295e1cf7d2a6 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 17 Nov 2017 14:01:15 +0100 Subject: [PATCH] Improve Spring Session auto-configuration tests --- .../session/AbstractSessionAutoConfigurationTests.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java index ea75880d42ac..ed86e70e81b3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java @@ -21,11 +21,13 @@ import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext; import org.springframework.session.ReactiveSessionRepository; import org.springframework.session.SessionRepository; +import org.springframework.session.web.http.SessionRepositoryFilter; +import org.springframework.web.server.session.WebSessionManager; import static org.assertj.core.api.Assertions.assertThat; /** - * Share test utilities for {@link SessionAutoConfiguration} tests. + * Shared test utilities for {@link SessionAutoConfiguration} tests. * * @author Stephane Nicoll */ @@ -33,6 +35,7 @@ public abstract class AbstractSessionAutoConfigurationTests { protected > T validateSessionRepository( AssertableWebApplicationContext context, Class type) { + assertThat(context).hasSingleBean(SessionRepositoryFilter.class); assertThat(context).hasSingleBean(SessionRepository.class); SessionRepository repository = context.getBean(SessionRepository.class); assertThat(repository).as("Wrong session repository type").isInstanceOf(type); @@ -46,6 +49,7 @@ protected Integer getSessionTimeout(SessionRepository sessionRepository) { protected > T validateSessionRepository( AssertableReactiveWebApplicationContext context, Class type) { + assertThat(context).hasSingleBean(WebSessionManager.class); assertThat(context).hasSingleBean(ReactiveSessionRepository.class); ReactiveSessionRepository repository = context .getBean(ReactiveSessionRepository.class);