Finally a test case that fails

Author: Dave Syer

SPR-9498/pom.xml

@@ -157,6 +157,12 @@
 		-->
 
 		<!-- Test -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${org.springframework-version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

SPR-9498/src/main/java/org/springframework/issues/HomeController.java

@@ -12,7 +12,7 @@ public class HomeController {
 
 	private Foo context;
 
-	public void setClientContext(Foo context) {
+	public void setFoo(Foo context) {
 		this.context = context;
 	}
 

SPR-9498/src/main/resources/log4j.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<!-- Appenders -->
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
+		</layout>
+	</appender>
+	
+	<!-- Application Loggers -->
+	<logger name="org.test.mvc">
+		<level value="info" />
+	</logger>
+	
+	<!-- 3rdparty Loggers -->
+	<logger name="org.springframework.core">
+		<level value="info" />
+	</logger>
+	
+	<logger name="org.springframework.beans">
+		<level value="info" />
+	</logger>
+	
+	<logger name="org.springframework.context">
+		<level value="info" />
+	</logger>
+
+	<logger name="org.springframework.web">
+		<level value="info" />
+	</logger>
+
+	<!-- Root Logger -->
+	<root>
+		<priority value="warn" />
+		<appender-ref ref="console" />
+	</root>
+	
+</log4j:configuration>

SPR-9498/src/main/webapp/WEB-INF/spring-servlet.xml

@@ -18,7 +18,7 @@
 	</bean>
 
 	<bean class="org.springframework.issues.HomeController">
-		<property name="clientContext" ref="foo" />
+		<property name="foo" ref="foo" />
 	</bean>
 
 	<bean id="foo" class="org.springframework.issues.DefaultFoo" scope="request">

SPR-9498/src/test/java/org/springframework/issues/ContextTests.java

@@ -0,0 +1,60 @@
+/*
+ * Cloud Foundry 2012.02.03 Beta
+ * Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+ *
+ * This product is licensed to you under the Apache License, Version 2.0 (the "License").
+ * You may not use this product except in compliance with the License.
+ *
+ * This product includes a number of subcomponents with
+ * separate copyright notices and license terms. Your use of these
+ * subcomponents is subject to the terms and conditions of the
+ * subcomponent's license, as noted in the LICENSE file.
+ */
+
+package org.springframework.issues;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.context.support.GenericXmlApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class ContextTests {
+
+	private MockHttpServletRequest request = new MockHttpServletRequest();
+
+	@Before
+	public void initScopes() {
+		ServletRequestAttributes attributes = new ServletRequestAttributes(request);
+		LocaleContextHolder.setLocale(request.getLocale(), true);
+		RequestContextHolder.setRequestAttributes(attributes, true);
+	}
+
+	@After
+	public void clearScopes() {
+		LocaleContextHolder.resetLocaleContext();
+		RequestContextHolder.resetRequestAttributes();
+	}
+
+	@Test
+	public void test() {
+		request.setParameter("foo", "bar");
+		GenericXmlApplicationContext context = new GenericXmlApplicationContext("classpath:/test-context.xml");
+		HomeController controller = context.getBean(HomeController.class);
+		Foo foo = (Foo) ReflectionTestUtils.getField(controller, "context");
+		assertNotNull(foo);
+		assertEquals("bar", foo.getAccessTokenRequest().getFirst("foo"));
+	}
+
+}

SPR-9498/src/test/resources/test-context.xml

@@ -0,0 +1,17 @@
+<?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">
+
+	<import resource="file:./src/main/webapp/WEB-INF/spring-servlet.xml"/>
+	
+	<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
+		<property name="scopes">
+			<map>
+				<entry key="request"><bean class="org.springframework.web.context.request.RequestScope"/></entry>
+				<entry key="session"><bean class="org.springframework.web.context.request.SessionScope"/></entry>
+			</map>
+		</property>
+	</bean>
+
+</beans>