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

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[3.0.0.201208090952-RELEASE]]></pluginVersion>
+	<pluginVersion><![CDATA[3.1.0.201210040510-RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
 		<config>src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml</config>
 		<config>src/test/java/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml</config>
-		<config>src/test/resources/org/springframework/test/context/web/BasicXmlWacTests-config.xml</config>
+		<config>src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml</config>
 	</configs>
 	<configSets>
 	</configSets>

spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java

@@ -27,6 +27,7 @@
 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 void basicWacFeatures() throws Exception {
 		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);

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));
+	}
+
+}

spring-test/src/test/java/org/springframework/test/context/web/WebContextLoaderTestSuite.java

@@ -33,8 +33,9 @@
 @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 {
 }

spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<bean id="requestScopedTestBean" class="org.springframework.beans.TestBean" scope="request">
+		<property name="name" value="#{request.contextPath}" />
+	</bean>
+
+	<bean id="sessionScopedTestBean" class="org.springframework.beans.TestBean" scope="session" />
+
+</beans>