Add passing test

Author: Dave Syer

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

@@ -20,14 +20,14 @@
  */
 public class DefaultFoo implements Foo {
 
-	private Bar accessTokenRequest;
+	private Bar bar;
 
-	public DefaultFoo(Bar accessTokenRequest) {
-		this.accessTokenRequest = accessTokenRequest;
+	public DefaultFoo(Bar bar) {
+		this.bar = bar;
 	}
 
-	public Bar getAccessTokenRequest() {
-		return accessTokenRequest;
+	public Bar getBar() {
+		return bar;
 	}
 
 }

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

@@ -20,5 +20,5 @@
  */
 public interface Foo {
 
-	Bar getAccessTokenRequest();
+	Bar getBar();
 }

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

@@ -22,7 +22,6 @@
 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;
 
@@ -48,13 +47,21 @@ public void clearScopes() {
 	}
 
 	@Test
-	public void test() {
+	public void testOK() {
+		request.setParameter("foo", "bar");
+		GenericXmlApplicationContext context = new GenericXmlApplicationContext("classpath:/ok-context.xml");
+		Foo foo = context.getBean(Foo.class);
+		assertNotNull(foo);
+		assertEquals("bar", foo.getBar().getFirst("foo"));
+	}
+
+	@Test
+	public void testFails() {
 		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");
+		Foo foo = context.getBean(Foo.class);
 		assertNotNull(foo);
-		assertEquals("bar", foo.getAccessTokenRequest().getFirst("foo"));
+		assertEquals("bar", foo.getBar().getFirst("foo"));
 	}
 
 }

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<!--Basic application beans. -->
+	<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/WEB-INF/jsp/" />
+		<property name="suffix" value=".jsp" />
+	</bean>
+
+	<bean id="foo" class="org.springframework.issues.DefaultFoo" scope="request">
+		<aop:scoped-proxy proxy-target-class="false" />
+		<constructor-arg ref="bar" />
+	</bean>
+
+	<bean id="bar" class="org.springframework.issues.DefaultBar" scope="request">
+		<aop:scoped-proxy proxy-target-class="false" />
+		<constructor-arg value="#{request.parameterMap}" />
+	</bean>
+
+	<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>

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

@@ -6,33 +6,6 @@
 
 	<bean id="conversionService" class="org.springframework.core.convert.support.DefaultConversionService" />
 
-	<!--Basic application beans. -->
-	<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/WEB-INF/jsp/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
-
-	<bean class="org.springframework.issues.HomeController">
-		<property name="foo" ref="foo" />
-	</bean>
-
-	<bean id="foo" class="org.springframework.issues.DefaultFoo" scope="request">
-		<aop:scoped-proxy proxy-target-class="false" />
-		<constructor-arg ref="tokenRequest" />
-	</bean>
-
-	<bean id="tokenRequest" class="org.springframework.issues.DefaultBar" scope="request">
-		<aop:scoped-proxy proxy-target-class="false" />
-		<constructor-arg value="#{request.parameterMap}" />
-	</bean>
-
-	<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>
-
+	<import resource="ok-context.xml"/>
+	
 </beans>