From 21ebbb9c028c5ac05f9d541d87b53b08bb021818 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 13 Oct 2012 19:50:31 +0200 Subject: [PATCH] Support session & request scoped beans in the TCF This commit introduces RequestAndSessionScopedBeansWacTests which verifies support for request and session scoped beans in the Spring TestContext Framework (TCF). This support was actually introduced as an intentional side effect of the work performed for SPR-5243 through the addition of the new WebTestExecutionListener. Issue: SPR-4588 --- spring-test/.springBeans | 4 +- .../context/web/AbstractBasicWacTests.java | 5 ++ .../RequestAndSessionScopedBeansWacTests.java | 80 +++++++++++++++++++ .../web/WebContextLoaderTestSuite.java | 5 +- ...tAndSessionScopedBeansWacTests-context.xml | 11 +++ 5 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 spring-test/src/test/java/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests.java create mode 100644 spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml diff --git a/spring-test/.springBeans b/spring-test/.springBeans index a4a7e241718..656622651c9 100644 --- a/spring-test/.springBeans +++ b/spring-test/.springBeans @@ -1,7 +1,7 @@ 1 - + @@ -9,7 +9,7 @@ src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml src/test/java/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml - src/test/resources/org/springframework/test/context/web/BasicXmlWacTests-config.xml + src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java index 428791fbcff..5a1a8421dda 100644 --- a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java @@ -27,6 +27,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockServletContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.context.ServletContextAware; @@ -55,6 +56,9 @@ public abstract class AbstractBasicWacTests implements ServletContextAware { @Autowired protected MockHttpServletResponse response; + @Autowired + protected MockHttpSession session; + @Autowired protected ServletWebRequest webRequest; @@ -75,6 +79,7 @@ public abstract class AbstractBasicWacTests implements ServletContextAware { assertNotNull("ServletContext should have been autowired from the WAC.", mockServletContext); assertNotNull("MockHttpServletRequest should have been autowired from the WAC.", request); assertNotNull("MockHttpServletResponse should have been autowired from the WAC.", response); + assertNotNull("MockHttpSession should have been autowired from the WAC.", session); assertNotNull("ServletWebRequest should have been autowired from the WAC.", webRequest); Object rootWac = mockServletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE); diff --git a/spring-test/src/test/java/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests.java b/spring-test/src/test/java/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests.java new file mode 100644 index 00000000000..c07b25a9273 --- /dev/null +++ b/spring-test/src/test/java/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests.java @@ -0,0 +1,80 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.test.context.web; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.TestBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpSession; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.web.context.WebApplicationContext; + +/** + * Integration tests that verify support for request and session scoped beans + * in conjunction with the TestContext Framework. + * + * @author Sam Brannen + * @since 3.2 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration +@WebAppConfiguration +public class RequestAndSessionScopedBeansWacTests { + + @Autowired + private WebApplicationContext wac; + + @Autowired + private MockHttpServletRequest request; + + @Autowired + private MockHttpSession session; + + + @Test + public void requestScope() throws Exception { + final String beanName = "requestScopedTestBean"; + final String contextPath = "/path"; + + assertNull(request.getAttribute(beanName)); + + request.setContextPath(contextPath); + TestBean testBean = wac.getBean(beanName, TestBean.class); + + assertEquals(contextPath, testBean.getName()); + assertSame(testBean, request.getAttribute(beanName)); + assertSame(testBean, wac.getBean(beanName, TestBean.class)); + } + + @Test + public void sessionScope() throws Exception { + final String beanName = "sessionScopedTestBean"; + + assertNull(session.getAttribute(beanName)); + + TestBean testBean = wac.getBean(beanName, TestBean.class); + + assertSame(testBean, session.getAttribute(beanName)); + assertSame(testBean, wac.getBean(beanName, TestBean.class)); + } + +} diff --git a/spring-test/src/test/java/org/springframework/test/context/web/WebContextLoaderTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/web/WebContextLoaderTestSuite.java index e20866222c1..06a83a29233 100644 --- a/spring-test/src/test/java/org/springframework/test/context/web/WebContextLoaderTestSuite.java +++ b/spring-test/src/test/java/org/springframework/test/context/web/WebContextLoaderTestSuite.java @@ -33,8 +33,9 @@ import org.springframework.web.context.WebApplicationContext; @RunWith(Suite.class) // Note: the following 'multi-line' layout is for enhanced code readability. @SuiteClasses({// - BasicXmlWacTests.class,// - BasicAnnotationConfigWacTests.class // +BasicXmlWacTests.class,// + BasicAnnotationConfigWacTests.class,// + RequestAndSessionScopedBeansWacTests.class // }) public class WebContextLoaderTestSuite { } diff --git a/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml new file mode 100644 index 00000000000..0930460eeaa --- /dev/null +++ b/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml @@ -0,0 +1,11 @@ + + + + + + + + + +