Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Gradle test fixture support for spring-beans and spring-context

Browse Source 
See gh-23550
This commit is contained in:
Sam Brannen
2019-12-28 17:13:39 +01:00
parent 5718bf424b
commit 61d4ee594d
585 changed files with 2270 additions and 1618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
View File

@@ -4,35 +4,35 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="requestScopedObject" class="org.springframework.tests.sample.beans.TestBean" scope="request">
<bean id="requestScopedObject" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<property name="name" value="#{request.contextPath}"/>
</bean>
<bean id="requestScopedDisposableObject" class="org.springframework.tests.sample.beans.DerivedTestBean" scope="request"/>
<bean id="requestScopedDisposableObject" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request"/>
<bean id="requestScopedFactoryBean" class="org.springframework.tests.sample.beans.factory.DummyFactory" scope="request"/>
<bean id="requestScopedFactoryBean" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory" scope="request"/>
<bean id="requestScopedObjectCircle1" class="org.springframework.tests.sample.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle1" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<property name="spouse" ref="requestScopedObjectCircle2"/>
</bean>
<bean id="requestScopedObjectCircle2" class="org.springframework.tests.sample.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle2" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<property name="spouse" ref="requestScopedObjectCircle1"/>
</bean>
<bean id="requestScopedOuterBean" class="org.springframework.tests.sample.beans.DerivedTestBean" scope="request">
<bean id="requestScopedOuterBean" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request">
<property name="name" value="outer"/>
<property name="spouse">
<bean class="org.springframework.tests.sample.beans.DerivedTestBean">
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean">
<property name="name" value="inner"/>
</bean>
</property>
</bean>
<bean id="singletonOuterBean" class="org.springframework.tests.sample.beans.DerivedTestBean" lazy-init="true">
<bean id="singletonOuterBean" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" lazy-init="true">
<property name="name" value="outer"/>
<property name="spouse">
<bean class="org.springframework.tests.sample.beans.DerivedTestBean" scope="request">
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request">
<property name="name" value="inner"/>
</bean>
</property>

20
spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
View File

@@ -5,47 +5,47 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
<bean id="requestScopedObject" class="org.springframework.tests.sample.beans.TestBean" scope="request">
<bean id="requestScopedObject" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="name" value="scoped"/>
</bean>
<bean id="requestScopedProxy" class="org.springframework.tests.sample.beans.TestBean" scope="request">
<bean id="requestScopedProxy" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<aop:scoped-proxy proxy-target-class="false"/>
<property name="name" value="scoped"/>
</bean>
<bean id="requestScopedDisposableObject" class="org.springframework.tests.sample.beans.DerivedTestBean" scope="request">
<bean id="requestScopedDisposableObject" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request">
<aop:scoped-proxy/>
<property name="name" value="scoped"/>
</bean>
<bean id="requestScopedFactoryBean" class="org.springframework.tests.sample.beans.factory.DummyFactory" scope="request">
<bean id="requestScopedFactoryBean" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory" scope="request">
<aop:scoped-proxy/>
</bean>
<bean id="requestScopedObjectCircle1" class="org.springframework.tests.sample.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle1" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="spouse" ref="requestScopedObjectCircle2"/>
</bean>
<bean id="requestScopedObjectCircle2" class="org.springframework.tests.sample.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle2" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="spouse" ref="requestScopedObjectCircle1"/>
</bean>
<bean id="outerBean" class="org.springframework.tests.sample.beans.TestBean">
<bean id="outerBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="spouse">
<bean id="scopedInnerBean" class="org.springframework.tests.sample.beans.TestBean" scope="request">
<bean id="scopedInnerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="name" value="scoped"/>
</bean>
</property>
</bean>
<bean id="outerBeanWithAnonymousInner" class="org.springframework.tests.sample.beans.TestBean">
<bean id="outerBeanWithAnonymousInner" class="org.springframework.beans.test.fixtures.beans.TestBean">
<constructor-arg>
<bean class="org.springframework.tests.sample.beans.TestBean" scope="request">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<aop:scoped-proxy/>
<property name="name" value="scoped"/>
</bean>

4
spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
View File

@@ -3,8 +3,8 @@
<beans>
<bean id="sessionScopedObject" class="org.springframework.tests.sample.beans.TestBean" scope="session"/>
<bean id="sessionScopedObject" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="session"/>
<bean id="sessionScopedDisposableObject" class="org.springframework.tests.sample.beans.DerivedTestBean" scope="session"/>
<bean id="sessionScopedDisposableObject" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="session"/>
</beans>