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

Rename test fixture package in spring-beans

Browse Source 
See gh-23550
This commit is contained in:
Sam Brannen
2019-12-29 17:37:19 +01:00
parent 4260c34b47
commit 7cd4ddf5fc
503 changed files with 1148 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context/src/test/resources/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
View File

@@ -19,6 +19,6 @@
<bean id="testAspect" class="org.springframework.aop.aspectj.AdviceBindingTestAspect"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

4
spring-context/src/test/resources/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
View File

@@ -18,7 +18,7 @@
<aop:after-returning method="oneObjectArg" returning="bean" pointcut="execution(* returnsThis())"/>
<aop:after-returning method="oneTestBeanArg" returning="bean" pointcut="execution(* returnsThis())"/>
<aop:after-returning method="testBeanArrayArg" returning="beans"
pointcut="execution(org.springframework.beans.test.fixtures.beans.ITestBean[] *(..))"/>
pointcut="execution(org.springframework.beans.testfixture.beans.ITestBean[] *(..))"/>
<aop:after-returning method="oneString" returning="name" pointcut="execution(* getSpouse())"/>
<aop:after-returning method="objectMatchNoArgs" returning="java.lang.Object"
pointcut="execution(* returnsThis())"/>
@@ -30,6 +30,6 @@
<bean id="testAspect" class="org.springframework.aop.aspectj.AfterReturningAdviceBindingTestAspect"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
View File

@@ -37,6 +37,6 @@
<bean id="testAspect" class="org.springframework.aop.aspectj.AfterThrowingAdviceBindingTestAspect"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
View File

@@ -17,6 +17,6 @@
<bean id="testAspect" class="org.springframework.aop.aspectj.AroundAdviceBindingTestAspect"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

4
spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
View File

@@ -17,11 +17,11 @@
<bean id="testAspect" class="org.springframework.aop.aspectj.AroundAdviceBindingTestAspect"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="spouse" ref="testBean2"/>
</bean>
<bean id="testBean2" class="org.springframework.beans.test.fixtures.beans.TestBean" autowire-candidate="false">
<bean id="testBean2" class="org.springframework.beans.testfixture.beans.TestBean" autowire-candidate="false">
<property name="spouse" ref="testBean"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
View File

@@ -85,6 +85,6 @@
<bean id="lowPrecedenceAspect" class="org.springframework.aop.aspectj.PrecedenceTestAspect"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

4
spring-context/src/test/resources/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
View File

@@ -5,11 +5,11 @@
<bean id="proxyCreator" class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="advisor" class="org.springframework.aop.aspectj.AspectJExpressionPointcutAdvisor">
<property name="expression"
value="execution(org.springframework.beans.test.fixtures.beans.ITestBean[] org.springframework.beans.test.fixtures.beans.ITestBean.*(..))"/>
value="execution(org.springframework.beans.testfixture.beans.ITestBean[] org.springframework.beans.testfixture.beans.ITestBean.*(..))"/>
<property name="advice" ref="interceptor"/>
</bean>

6
spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
View File

@@ -7,9 +7,9 @@
<aop:aspectj-autoproxy/>
<bean id="testBean1" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean2" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean3" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean1" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="testBean2" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="testBean3" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="counterAspect" class="org.springframework.aop.aspectj.CounterAspect"/>
</beans>

12
spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
View File

@@ -21,15 +21,15 @@
</aop:aspect>
</aop:config>
<bean id="tb1" name="testBean1" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="tb1" name="testBean1" class="org.springframework.beans.testfixture.beans.TestBean">
<qualifier value="myBean"/>
</bean>
<bean id="tb2" name="testBean2" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="tb2" name="testBean2" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="testBeanContainingNestedBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBeanContainingNestedBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="doctor">
<bean class="org.springframework.beans.test.fixtures.beans.NestedTestBean"/>
<bean class="org.springframework.beans.testfixture.beans.NestedTestBean"/>
</property>
</bean>
@@ -55,9 +55,9 @@
<aop:advisor pointcut="bean(*This) and !bean(dont*)" advice-ref="testInterceptor"/>
</aop:config>
<bean id="interceptThis" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="interceptThis" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="dontInterceptThis" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="dontInterceptThis" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="testInterceptor" class="org.springframework.aop.aspectj.BeanNamePointcutTests$TestInterceptor"/>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
View File

@@ -26,7 +26,7 @@
<bean id="testAspect" class="org.springframework.aop.aspectj.AdviceBindingTestAspect"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="authenticationLogger" class="org.springframework.aop.aspectj.AuthenticationLogger"/>

4
spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsTests.xml
View File

@@ -8,7 +8,7 @@
<aop:config>
<aop:aspect id="beforeAdviceBindingTests" ref="introduction">
<aop:declare-parents
types-matching="org.springframework.beans.test.fixtures.beans..*"
types-matching="org.springframework.beans.testfixture.beans..*"
implement-interface="test.mixin.Lockable"
default-impl="test.mixin.DefaultLockable"
/>
@@ -22,6 +22,6 @@
<bean id="introduction" class="org.springframework.aop.aspectj.NonAnnotatedMakeLockable"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
View File

@@ -5,7 +5,7 @@
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="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="aTestBean"/>
</bean>

4
spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
View File

@@ -8,12 +8,12 @@
<aop:config proxy-target-class="true">
<aop:aspect ref="counterAspect">
<aop:pointcut id="anyOperation"
expression="execution(* org.springframework.beans.test.fixtures.beans.TestBean.*(..)) and this(bean) and args(argument)"/>
expression="execution(* org.springframework.beans.testfixture.beans.TestBean.*(..)) and this(bean) and args(argument)"/>
<aop:around pointcut-ref="anyOperation" method="increment" arg-names="bean,argument"/>
</aop:aspect>
</aop:config>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="aTestBean"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
View File

@@ -15,6 +15,6 @@
<bean id="testAspect" class="org.springframework.aop.aspectj.OverloadedAdviceTestAspect"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
View File

@@ -16,6 +16,6 @@
<bean id="testAspect" class="org.springframework.aop.aspectj.OverloadedAdviceTestAspect"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
View File

@@ -13,7 +13,7 @@
</aop:aspect>
</aop:config>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean" />
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean" />
<bean id="interfaceExtendingAspect"
class="org.springframework.aop.aspectj.autoproxy.InterfaceExtendingAspect"/>

4
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
View File

@@ -23,11 +23,11 @@
<property name="name" value="adrian"/>
</bean>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean" parent="adrianParent">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean" parent="adrianParent">
<property name="age" value="34"/>
</bean>
<bean id="adrian2Parent" class="org.springframework.beans.test.fixtures.beans.TestBean" abstract="true">
<bean id="adrian2Parent" class="org.springframework.beans.testfixture.beans.TestBean" abstract="true">
<property name="name" value="adrian"/>
</bean>

6
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
View File

@@ -9,17 +9,17 @@
<property name="multiple" value="3"/>
</bean>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Adrian"/>
<property name="age" value="34"/>
</bean>
<bean id="adrian2" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="adrian2" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name" value="Adrian"/>
<property name="age" value="34"/>
</bean>
<bean id="i21" class="org.springframework.beans.test.fixtures.beans.NestedTestBean" scope="prototype">
<bean id="i21" class="org.springframework.beans.testfixture.beans.NestedTestBean" scope="prototype">
<property name="company" value="i21"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
View File

@@ -19,7 +19,7 @@
<property name="name" value="adrian"/>
</bean>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean" parent="adrianParent">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean" parent="adrianParent">
<property name="age" value="34"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
View File

@@ -17,7 +17,7 @@
<bean class="org.springframework.aop.aspectj.autoproxy.IncreaseReturnValue"/>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="adrian"/>
<property name="age" value="34"/>
</bean>

4
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
View File

@@ -10,12 +10,12 @@
<property name="order" value="5"/>
</bean>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name" value="adrian"/>
<property name="age" value="34"/>
</bean>
<bean id="juergen" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="juergen" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name" value="juergen"/>
<property name="age" value="30"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
View File

@@ -7,7 +7,7 @@
<bean class="test.aspect.PerThisAspect" scope="prototype"/>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name" value="adrian"/>
<property name="age" value="34"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
View File

@@ -9,7 +9,7 @@
<bean id="adrian" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="target">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="adrian"/>
<property name="age" value="34"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
View File

@@ -7,7 +7,7 @@
<bean id="aspect" class="test.aspect.TwoAdviceAspect" scope="prototype"/>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name" value="adrian"/>
<property name="age" value="34"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectSingleton.xml
View File

@@ -7,7 +7,7 @@
<bean id="aspect" class="test.aspect.TwoAdviceAspect"/>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name" value="adrian"/>
<property name="age" value="34"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
View File

@@ -18,7 +18,7 @@
<property name="multiple" value="2" />
</bean>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="adrian" />
<property name="age" value="34" />
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
View File

@@ -7,7 +7,7 @@
<bean id="aspect" class="org.springframework.aop.aspectj.autoproxy.AdviceUsingThisJoinPoint"/>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name" value="adrian"/>
<property name="age" value="34"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
View File

@@ -5,7 +5,7 @@
<aop:aspectj-autoproxy/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="aspect" class="org.springframework.aop.aspectj.autoproxy.ExceptionHandlingAspect"/>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
View File

@@ -22,7 +22,7 @@
class="org.springframework.aop.aspectj.autoproxy.benchmark.TraceAspect" >
</bean>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="adrian" />
<property name="age" value="34" />
</bean>

2
spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
View File

@@ -31,7 +31,7 @@
<bean class="org.springframework.aop.aspectj.autoproxy.benchmark.TraceAspect"/>
<bean id="adrian" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="adrian" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="adrian"/>
<property name="age" value="34"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
View File

@@ -19,7 +19,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
View File

@@ -20,7 +20,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
View File

@@ -16,7 +16,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
View File

@@ -16,7 +16,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
View File

@@ -23,7 +23,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
View File

@@ -15,7 +15,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
View File

@@ -15,7 +15,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
View File

@@ -23,7 +23,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
View File

@@ -15,7 +15,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

2
spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
View File

@@ -15,7 +15,7 @@
<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>

8
spring-context/src/test/resources/org/springframework/aop/config/PrototypeProxyTests-context.xml
View File

@@ -5,13 +5,13 @@
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="service" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype"/>
<bean id="service" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype"/>
<bean id="serviceDependent1" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="serviceDependent1" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg ref="service"/>
</bean>
<bean id="serviceDependent2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="serviceDependent2" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg ref="service"/>
</bean>
@@ -20,7 +20,7 @@
<bean id="serviceInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
<aop:config proxy-target-class="false">
<aop:pointcut id="servicePointcut" expression="target(org.springframework.beans.test.fixtures.beans.ITestBean)"/>
<aop:pointcut id="servicePointcut" expression="target(org.springframework.beans.testfixture.beans.ITestBean)"/>
<aop:advisor advice-ref="serviceInterceptor" pointcut-ref="servicePointcut"/>
</aop:config>

2
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
View File

@@ -8,7 +8,7 @@
<bean id="testBean" class="org.springframework.aop.framework.ProxyFactoryBean">
<!-- Target is autowired, so can check type of parent without a guard -->
<property name="target">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean" autowire="byType"/>
<bean class="org.springframework.beans.testfixture.beans.TestBean" autowire="byType"/>
</property>
<property name="interceptorNames" value="debugInterceptor"/>
</bean>

26
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
View File

@@ -4,7 +4,7 @@
<beans>
<!-- Simple target -->
<bean id="test" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="test" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>custom</value></property>
<property name="age"><value>666</value></property>
</bean>
@@ -12,7 +12,7 @@
<bean id="debugInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
<bean id="test1" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="interfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="target"><ref bean="test"/></property>
<property name="interceptorNames"><value>debugInterceptor</value></property>
</bean>
@@ -27,7 +27,7 @@
Aspect interfaces don't need to be included here.
They may, for example, be added by global interceptors.
-->
<property name="interfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="interfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<!--
Note that "test" is a target. An InvokerInterceptor
@@ -40,7 +40,7 @@
<bean id="prototype" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interfaces">
<value>
org.springframework.beans.test.fixtures.beans.ITestBean
org.springframework.beans.testfixture.beans.ITestBean
</value>
</property>
<property name="singleton"><value>false</value></property>
@@ -50,7 +50,7 @@
<bean id="test2" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>
org.springframework.beans.test.fixtures.beans.ITestBean
org.springframework.beans.testfixture.beans.ITestBean
</value>
</property>
<property name="singleton"><value>false</value></property>
@@ -74,7 +74,7 @@
<property name="targetName"><value>testCircleTarget1</value></property>
</bean>
<bean id="testCircleTarget1" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testCircleTarget1" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>custom</value></property>
<property name="age"><value>666</value></property>
<property name="spouse"><ref bean="testCircle2"/></property>
@@ -85,14 +85,14 @@
<property name="targetName"><value>testCircleTarget2</value></property>
</bean>
<bean id="testCircleTarget2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testCircleTarget2" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>custom</value></property>
<property name="age"><value>666</value></property>
<property name="spouse"><ref bean="testCircle1"/></property>
</bean>
<bean id="pointcuts" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="interceptorNames"><value>pointcutForVoid</value></property>
<property name="targetName"><value>test</value></property>
</bean>
@@ -107,14 +107,14 @@
<bean id="noInterceptorNamesWithoutTarget"
class="org.springframework.aop.framework.ProxyFactoryBean"
>
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
</bean>
<bean id="noInterceptorNamesWithTarget"
class="org.springframework.aop.framework.ProxyFactoryBean"
>
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="target"><ref bean="test"/></property>
</bean>
@@ -137,10 +137,10 @@
<bean id="prototypeLockMixinAdvisor" class="test.mixin.LockMixinAdvisor" scope="prototype"/>
<bean id="prototypeTestBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype"/>
<bean id="prototypeTestBean" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype"/>
<bean id="prototypeTestBeanProxy" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="interfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="singleton"><value>false</value></property>
<property name="interceptorNames">
<list>
@@ -155,7 +155,7 @@
<bean id="prototypeTestBeanProxySingletonTarget" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interfaces">
<list>
<value>org.springframework.beans.test.fixtures.beans.ITestBean</value>
<value>org.springframework.beans.testfixture.beans.ITestBean</value>
<value>test.mixin.Lockable</value>
</list>
</property>

8
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
View File

@@ -10,13 +10,13 @@
<bean id="eveTargetSource" class="org.springframework.aop.target.SingletonTargetSource">
<constructor-arg>
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Eve</value></property>
</bean>
</constructor-arg>
</bean>
<bean id="adam" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="adam" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Adam</value></property>
</bean>
@@ -32,7 +32,7 @@
<bean id="doubleTarget"
class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<!-- this is the one used and NOT the one set by targetSource -->
<property name="interceptorNames"><value>countingBeforeAdvice,adamTargetSource</value></property>
@@ -42,7 +42,7 @@
<!-- but this is also possible -->
<bean id="arbitraryTarget"
class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<!-- this is the one used and NOT the one set by targetSource -->
<property name="interceptorNames"><value>adam</value></property>
<property name="targetSource"><ref bean="eveTargetSource"/></property>

4
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
View File

@@ -4,7 +4,7 @@
<beans>
<!-- Simple target -->
<bean id="test" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="test" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>custom</value></property>
<property name="age"><value>666</value></property>
</bean>
@@ -16,7 +16,7 @@
<bean id="frozen"
class="org.springframework.aop.framework.ProxyFactoryBean"
>
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="target"><ref bean="test"/></property>
<property name="interceptorNames"><value>debugInterceptor</value></property>

2
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
View File

@@ -16,7 +16,7 @@
class="org.springframework.aop.framework.ProxyFactoryBean"
>
<property name="target">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>innerBeanTarget</value></property>
</bean>
</property>

4
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
View File

@@ -5,7 +5,7 @@
<!-- Same effect as noInterceptor names: also invalid -->
<bean id="emptyInterceptorNames" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="interfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="interceptorNames"><value></value></property>
</bean>
@@ -14,7 +14,7 @@
Must have target after *.
-->
<bean id="globalsWithoutTarget" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="interfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="interceptorNames"><value>global*</value></property>
</bean>

4
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
View File

@@ -9,7 +9,7 @@
<beans>
<bean id="adam" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="adam" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Adam</value></property>
</bean>
@@ -23,7 +23,7 @@
-->
<bean id="targetSourceNotLast"
class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<!-- this is the one used and NOT the one set by targetSource -->
<property name="interceptorNames"><value>adam,countingBeforeAdvice</value></property>

4
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
View File

@@ -7,11 +7,11 @@
<beans>
<!-- Simple target -->
<bean id="test" class="org.springframework.beans.test.fixtures.beans.SideEffectBean">
<bean id="test" class="org.springframework.beans.testfixture.beans.SideEffectBean">
<property name="count"><value>10</value></property>
</bean>
<bean id="prototypeTarget" class="org.springframework.beans.test.fixtures.beans.SideEffectBean" scope="prototype">
<bean id="prototypeTarget" class="org.springframework.beans.testfixture.beans.SideEffectBean" scope="prototype">
<property name="count"><value>10</value></property>
</bean>

10
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
View File

@@ -12,28 +12,28 @@
<bean id="serializableSingleton" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interceptorNames"><value>serializableNopInterceptor</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.Person</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.Person</value></property>
<property name="target">
<bean class="org.springframework.beans.test.fixtures.beans.SerializablePerson">
<bean class="org.springframework.beans.testfixture.beans.SerializablePerson">
<property name="name"><value>serializableSingleton</value></property>
</bean>
</property>
</bean>
<bean id="prototypeTarget" class="org.springframework.beans.test.fixtures.beans.SerializablePerson">
<bean id="prototypeTarget" class="org.springframework.beans.testfixture.beans.SerializablePerson">
<property name="name"><value>serializablePrototype</value></property>
</bean>
<bean id="serializablePrototype" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interceptorNames"><value>serializableNopInterceptor,prototypeTarget</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.Person</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.Person</value></property>
<property name="singleton"><value>false</value></property>
</bean>
<bean id="interceptorNotSerializableSingleton" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="interceptorNames"><value>nopInterceptor</value></property>
<property name="target">
<bean class="org.springframework.beans.test.fixtures.beans.SerializablePerson"/>
<bean class="org.springframework.beans.testfixture.beans.SerializablePerson"/>
</property>
</bean>

4
spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
View File

@@ -8,7 +8,7 @@
<beans>
<!-- Simple target -->
<bean id="target" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="target" class="org.springframework.beans.testfixture.beans.TestBean">
<!-- initial value :-) -->
<property name="name"><value>Adam</value></property>
</bean>
@@ -49,7 +49,7 @@
-->
<bean id="noTarget"
class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="interceptorNames"><value>nopInterceptor,unsupportedInterceptor</value></property>
</bean>

4
spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="testBeanTarget" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBeanTarget" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="simpleBeforeAdvice" class="org.springframework.aop.framework.adapter.SimpleBeforeAdviceImpl"/>
@@ -12,7 +12,7 @@
</bean>
<bean id="testBean" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="interceptorNames"><value>simpleBeforeAdviceAdvisor,testBeanTarget</value></property>
</bean>

4
spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="testBeanTarget" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBeanTarget" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="simpleBeforeAdvice" class="org.springframework.aop.framework.adapter.SimpleBeforeAdviceImpl"/>
@@ -12,7 +12,7 @@
</bean>
<bean id="testBean" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"><value>org.springframework.beans.test.fixtures.beans.ITestBean</value></property>
<property name="proxyInterfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
<property name="interceptorNames"><value>simpleBeforeAdviceAdvisor,testBeanTarget</value></property>
</bean>

4
spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
View File

@@ -33,11 +33,11 @@
<!-- Stateful mixin. Will apply to all objects. Note that singleton property is false. -->
<bean id="lockableAdvisor" class="test.mixin.LockMixinAdvisor" scope="prototype"/>
<bean id="test1" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="test1" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="age" value="4"/>
</bean>
<bean id="test2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="test2" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="age" value="4"/>
</bean>

8
spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml
View File

@@ -12,22 +12,22 @@
</property>
</bean>
<bean id="test" scope="prototype" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="test" scope="prototype" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<bean id="prototypeTest" class="org.springframework.beans.test.fixtures.beans.CountingTestBean">
<bean id="prototypeTest" class="org.springframework.beans.testfixture.beans.CountingTestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<bean id="lazyInitTest" class="org.springframework.beans.test.fixtures.beans.CountingTestBean" lazy-init="true">
<bean id="lazyInitTest" class="org.springframework.beans.testfixture.beans.CountingTestBean" lazy-init="true">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<bean id="wife" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="wife" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Kerry</value></property>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="optimizedTestBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="optimizedTestBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Optimized"/>
</bean>

10
spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml
View File

@@ -14,29 +14,29 @@
<bean id="aapc.quickTargetSourceCreator"
class="org.springframework.aop.framework.autoproxy.target.QuickTargetSourceCreator"/>
<bean id="test" scope="prototype" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="test" scope="prototype" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<bean id="wife" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="wife" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Kerry</value></property>
</bean>
<!-- Prefix means it will be pooled -->
<bean id=":test" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id=":test" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<!-- Prefix means it will be thread local -->
<bean name="%test" scope="prototype" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean name="%test" scope="prototype" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>
<!-- Prefix means it will be a prototype target source -->
<bean name="!test" scope="prototype" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean name="!test" scope="prototype" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="spouse"><ref bean="wife"/></property>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
View File

@@ -24,6 +24,6 @@
</property>
</bean>
<bean id="bean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="bean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

16
spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
View File

@@ -73,11 +73,11 @@
<bean id="introductionNopInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
<bean id="introductionUsingJdk" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="introductionUsingJdk" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>introductionUsingJdk</value></property>
</bean>
<bean id="second-introductionUsingJdk" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="second-introductionUsingJdk" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>second-introductionUsingJdk</value></property>
</bean>
@@ -88,29 +88,29 @@
lazy-init="true">
</bean>
<bean id="jdk1" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="jdk1" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>jdk1</value></property>
</bean>
<bean id="frozen" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="frozen" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="frozenBean"/>
</bean>
<alias name="frozen" alias="frozenBean"/>
<bean id="cglib1" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="cglib1" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>cglib1</value></property>
</bean>
<bean id="onlyJdk" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="onlyJdk" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>onlyJdk</value></property>
</bean>
<bean id="doubleJdk" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="doubleJdk" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>doubleJdk</value></property>
</bean>
<bean id="noproxy" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="noproxy" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>noproxy</value></property>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-list.xml
View File

@@ -9,7 +9,7 @@
<aop:scoped-proxy/>
</bean>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="friends" ref="scopedList"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-override.xml
View File

@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<aop:scoped-proxy proxy-target-class="false"/>
<property name="age" value="99"/>
</bean>

2
spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-testbean.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="testBeanTarget" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request"/>
<bean id="testBeanTarget" class="org.springframework.beans.testfixture.beans.TestBean" scope="request"/>
<bean id="testBean" class="org.springframework.aop.scope.ScopedProxyFactoryBean">
<property name="targetBeanName" value="testBeanTarget"/>

4
spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="prototypeTest" class="org.springframework.beans.test.fixtures.beans.SideEffectBean" scope="prototype">
<bean id="prototypeTest" class="org.springframework.beans.testfixture.beans.SideEffectBean" scope="prototype">
<property name="count"><value>10</value></property>
</bean>
@@ -42,7 +42,7 @@
<!-- Serialization tests using serializable target and advice -->
<bean id="serializableNop" class="org.springframework.tests.aop.interceptor.SerializableNopInterceptor" />
<bean id="prototypePerson" class="org.springframework.beans.test.fixtures.beans.SerializablePerson" scope="prototype"/>
<bean id="prototypePerson" class="org.springframework.beans.testfixture.beans.SerializablePerson" scope="prototype"/>
<bean id="personPoolTargetSource" class="org.springframework.aop.target.CommonsPool2TargetSource">
<property name="targetBeanName"><value>prototypePerson</value></property>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
View File

@@ -22,7 +22,7 @@
<property name="interceptorNames"><value>interceptor</value></property>
</bean>
<bean id="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
</bean>

12
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
View File

@@ -3,19 +3,19 @@
<beans>
<bean id="rod1" class="org.springframework.beans.test.fixtures.beans.DependenciesBean" autowire="byType">
<bean id="rod1" class="org.springframework.beans.testfixture.beans.DependenciesBean" autowire="byType">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod1a" class="org.springframework.beans.test.fixtures.beans.DependenciesBean" autowire="autodetect">
<bean id="rod1a" class="org.springframework.beans.testfixture.beans.DependenciesBean" autowire="autodetect">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod2" class="org.springframework.beans.test.fixtures.beans.DependenciesBean" autowire="byName">
<bean id="rod2" class="org.springframework.beans.testfixture.beans.DependenciesBean" autowire="byName">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod2a" class="org.springframework.beans.test.fixtures.beans.DependenciesBean" autowire="byName">
<bean id="rod2a" class="org.springframework.beans.testfixture.beans.DependenciesBean" autowire="byName">
<property name="spouse" ref="spouse"/>
</bean>
@@ -31,12 +31,12 @@
<!-- Should not pick up spouse automatically -->
</bean>
<bean id="rod5" class="org.springframework.beans.test.fixtures.beans.DependenciesBean"
<bean id="rod5" class="org.springframework.beans.testfixture.beans.DependenciesBean"
scope="prototype" autowire="constructor">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="other" class="org.springframework.beans.test.fixtures.beans.IndexedTestBean"/>
<bean id="other" class="org.springframework.beans.testfixture.beans.IndexedTestBean"/>
<bean id="parentAppCtx" class="org.springframework.context.support.ClassPathXmlApplicationContext">
<constructor-arg>

6
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
View File

@@ -8,13 +8,13 @@
<!-- age should inherit value of 1 from parent -->
</bean>
<bean id="inheritsWithDifferentClass" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean"
<bean id="inheritsWithDifferentClass" class="org.springframework.beans.testfixture.beans.DerivedTestBean"
parent="inheritedTestBean" init-method="initialize">
<property name="name"><value>override</value></property>
<!-- age should inherit value of 1 from parent -->
</bean>
<bean id="inheritsWithClass" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean"
<bean id="inheritsWithClass" class="org.springframework.beans.testfixture.beans.DerivedTestBean"
parent="inheritedTestBeanWithoutClass" init-method="initialize">
<property name="name"><value>override</value></property>
<!-- age should inherit value of 1 from parent -->
@@ -42,7 +42,7 @@
<bean id="bogusParent" parent="bogus" scope="prototype"/>
<bean id="indexedTestBean" class="org.springframework.beans.test.fixtures.beans.IndexedTestBean">
<bean id="indexedTestBean" class="org.springframework.beans.testfixture.beans.IndexedTestBean">
<property name="array[0].name"><value>myname</value></property>
</bean>

46
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<bean id="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
@@ -12,7 +12,7 @@
</property>
</bean>
<bean id="david" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="david" class="org.springframework.beans.testfixture.beans.TestBean">
<description>
Simple bean, without any collections.
</description>
@@ -23,7 +23,7 @@
<property name="age"><value>27</value></property>
</bean>
<bean id="rod" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="rod" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="age"><value>32</value></property>
<property name="friends">
@@ -35,7 +35,7 @@
</property>
</bean>
<bean id="pJenny" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="pJenny" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
@@ -44,12 +44,12 @@
</property>
</bean>
<bean id="pDavid" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="pDavid" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>David</value></property>
<property name="age"><value>27</value></property>
</bean>
<bean id="pRod" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="pRod" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Rod</value></property>
<property name="age"><value>32</value></property>
<property name="friends">
@@ -63,7 +63,7 @@
<!--
Try setting a collection property to a single value
-->
<bean id="loner" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="loner" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>loner</value></property>
<property name="age"><value>26</value></property>
<property name="friends">
@@ -97,26 +97,26 @@
</property>
</bean>
<bean id="verbose" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="verbose" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>verbose</value></property>
</bean>
<bean id="verbose2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="verbose2" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><idref bean="verbose"/></property>
</bean>
<bean id="verbose3" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="verbose3" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><idref bean="verbose"/></property>
</bean>
<bean id="emptyMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="emptyMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
</map>
</property>
</bean>
<bean id="literalMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="literalMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
<entry key="foo" value="bar"/>
@@ -126,7 +126,7 @@
</property>
</bean>
<bean id="mixedMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="mixedMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
<entry key-ref="fooKey">
@@ -158,7 +158,7 @@
<constructor-arg value="jenny"/>
</bean>
<bean id="pMixedMap" class="org.springframework.beans.test.fixtures.beans.HasMap" scope="prototype">
<bean id="pMixedMap" class="org.springframework.beans.testfixture.beans.HasMap" scope="prototype">
<property name="map">
<map>
<entry key="foo" value="bar"/>
@@ -167,7 +167,7 @@
</property>
</bean>
<bean id="mixedMapWithList" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="mixedMapWithList" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
<entry>
@@ -199,7 +199,7 @@
</property>
</bean>
<bean id="emptySet" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="emptySet" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="set">
<set>
</set>
@@ -207,7 +207,7 @@
</bean>
<bean id="set" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="set" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="set">
<set>
<value>bar</value>
@@ -217,7 +217,7 @@
</property>
</bean>
<bean id="emptyProps" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="emptyProps" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="props">
<props>
</props>
@@ -225,7 +225,7 @@
</bean>
<bean id="props" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="props" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="props">
<props>
<prop key="foo">bar</prop>
@@ -234,7 +234,7 @@
</property>
</bean>
<bean id="propsViaMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="propsViaMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="props">
<map>
<entry key="foo" value="bar"/>
@@ -243,7 +243,7 @@
</property>
</bean>
<bean id="objectArray" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="objectArray" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="objectArray">
<list>
<value>one</value>
@@ -252,7 +252,7 @@
</property>
</bean>
<bean id="classArray" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="classArray" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="classArray">
<list>
<value>java.lang.String</value>
@@ -261,7 +261,7 @@
</property>
</bean>
<bean id="integerArray" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="integerArray" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="integerArray">
<list>
<value>0</value>

8
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
View File

@@ -11,16 +11,16 @@
<bean id="target1" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean"
autowire="constructor"/>
<bean id="toBeFoundByType" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="toBeFoundByType" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="proxy2" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces" value="org.springframework.beans.test.fixtures.beans.ITestBean"/>
<property name="proxyInterfaces" value="org.springframework.beans.testfixture.beans.ITestBean"/>
<property name="targetName" value="target2"/>
</bean>
<bean id="target2" class="org.springframework.beans.test.fixtures.beans.DependenciesBean">
<bean id="target2" class="org.springframework.beans.testfixture.beans.DependenciesBean">
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someSet">
<set>
<ref bean="proxy1"/>

12
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
View File

@@ -13,7 +13,7 @@
<constructor-arg><ref bean="other"/></constructor-arg>
</bean>
<bean id="rod2Accessor" class="org.springframework.beans.test.fixtures.beans.TestBean" lazy-init="true">
<bean id="rod2Accessor" class="org.springframework.beans.testfixture.beans.TestBean" lazy-init="true">
<property name="friends">
<list>
<ref bean="rod2"/>
@@ -117,7 +117,7 @@
<bean id="rod18" class="org.springframework.beans.factory.xml.SimpleConstructorArgBean" scope="prototype">
</bean>
<bean id="kerry1" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="kerry1" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name">
<value>Kerry1</value>
</property>
@@ -126,7 +126,7 @@
</property>
</bean>
<bean id="kerry2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="kerry2" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name">
<value>Kerry2</value>
</property>
@@ -135,7 +135,7 @@
</property>
</bean>
<bean id="other" class="org.springframework.beans.test.fixtures.beans.IndexedTestBean"/>
<bean id="other" class="org.springframework.beans.testfixture.beans.IndexedTestBean"/>
<bean id="file" class="java.io.File">
<constructor-arg><value>/test</value></constructor-arg>
@@ -187,13 +187,13 @@
<bean id="lenientDependencyTestBean" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$LenientDependencyTestBean" scope="prototype">
<constructor-arg>
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean"/>
<bean class="org.springframework.beans.testfixture.beans.DerivedTestBean"/>
</constructor-arg>
</bean>
<bean id="lenientDependencyTestBeanFactoryMethod" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$LenientDependencyTestBean" scope="prototype" factory-method="create">
<constructor-arg>
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean"/>
<bean class="org.springframework.beans.testfixture.beans.DerivedTestBean"/>
</constructor-arg>
</bean>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
View File

@@ -18,7 +18,7 @@
</bean>
<bean id="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean"
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean"
scope="singleton">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>

8
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
View File

@@ -3,19 +3,19 @@
<beans default-autowire="byType">
<bean id="rod1" class="org.springframework.beans.test.fixtures.beans.DependenciesBean">
<bean id="rod1" class="org.springframework.beans.testfixture.beans.DependenciesBean">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod2" class="org.springframework.beans.test.fixtures.beans.DependenciesBean">
<bean id="rod2" class="org.springframework.beans.testfixture.beans.DependenciesBean">
<!-- Should pick up spouse automatically -->
</bean>
<bean id="rod3" class="org.springframework.beans.test.fixtures.beans.DependenciesBean" autowire="no">
<bean id="rod3" class="org.springframework.beans.testfixture.beans.DependenciesBean" autowire="no">
<!-- Should not pick up spouse automatically -->
</bean>
<bean id="spouse" class="org.springframework.beans.test.fixtures.beans.TestBean" autowire="no">
<bean id="spouse" class="org.springframework.beans.testfixture.beans.TestBean" autowire="no">
<property name="name">
<value>Kerry</value>
</property>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
View File

@@ -15,6 +15,6 @@
destroy-method="customDestroy"
/>
<bean id="prototype" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype"/>
<bean id="prototype" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype"/>
</beans>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
View File

@@ -58,7 +58,7 @@
</bean>
<bean id="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean"
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean"
scope="prototype">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
@@ -68,7 +68,7 @@
</property>
</bean>
<bean id="david" class="org.springframework.beans.test.fixtures.beans.TestBean"
<bean id="david" class="org.springframework.beans.testfixture.beans.TestBean"
scope="singleton">
<description>
Simple bean, without any collections.

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="singletonFactory" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean id="singletonFactory" class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
<property name="otherTestBean"><ref bean="singletonFactory"/></property>
</bean>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
View File

@@ -11,7 +11,7 @@
<bean id="init-method2" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$BadInitializer"
init-method="init2" scope="prototype"/>
<bean id="init-method3" class="org.springframework.beans.test.fixtures.beans.TestBean"
<bean id="init-method3" class="org.springframework.beans.testfixture.beans.TestBean"
init-method="init" scope="prototype"/>
<bean id="init-and-ib" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$InitAndIB"

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml
View File

@@ -4,7 +4,7 @@
<beans>
<bean id="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
View File

@@ -11,7 +11,7 @@
</bean>
<bean id="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="singleton">
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean" scope="singleton">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
</bean>

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
View File

@@ -12,7 +12,7 @@
<util:set id="set"/>
<util:properties id="properties" location="org/springframework/beans/factory/xml/test.properties"/>
<bean id="bean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="bean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someMap">
<map>
<entry key="map">

16
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
View File

@@ -35,32 +35,32 @@
</bean>
<bean id="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
<ref bean="david"/>
</property>
<property name="friends">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean class="org.springframework.beans.testfixture.beans.TestBean"/>
</property>
</bean>
<bean id="jennyParent" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="jennyParent" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="friends">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean class="org.springframework.beans.testfixture.beans.TestBean"/>
</property>
</bean>
<bean id="jennyChild" class="org.springframework.beans.test.fixtures.beans.TestBean" parent="jennyParent" scope="prototype">
<bean id="jennyChild" class="org.springframework.beans.testfixture.beans.TestBean" parent="jennyParent" scope="prototype">
<property name="spouse">
<ref bean="david"/>
</property>
</bean>
<bean id="david" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="david" class="org.springframework.beans.testfixture.beans.TestBean">
<description>
Simple bean, without any collections.
</description>
@@ -71,12 +71,12 @@
<property name="age"><value>27</value></property>
</bean>
<bean id="magicDavid" class="org.springframework.beans.test.fixtures.beans.TestBean" autowire="byName"/>
<bean id="magicDavid" class="org.springframework.beans.testfixture.beans.TestBean" autowire="byName"/>
<!-- this should be autowired as well! -->
<bean id="magicDavidDerived" parent="magicDavid" />
<bean id="spouse" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="spouse" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Linda"/>
</bean>

6
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="inheritedTestBean" class="org.springframework.beans.test.fixtures.beans.TestBean" abstract="true" scope="prototype">
<bean id="inheritedTestBean" class="org.springframework.beans.testfixture.beans.TestBean" abstract="true" scope="prototype">
<property name="name"><value>parent</value></property>
<property name="age"><value>1</value></property>
</bean>
@@ -13,11 +13,11 @@
<property name="age"><value>1</value></property>
</bean>
<bean id="inheritedTestBeanPrototype" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="inheritedTestBeanPrototype" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>parent</value></property>
<property name="age"><value>2</value></property>
</bean>
<bean id="inheritedTestBeanSingleton" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="inheritedTestBeanSingleton" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

80
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
View File

@@ -1,121 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?>
<bones>
<bean id="jenny" name="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="jenny" name="jenny" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse"><ref bean="david"/></property>
</bean>
<bean id="david" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="david" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="David"/>
<property name="age" value="27"/>
<property name="spouse" ref="jenny"/>
</bean>
<bean id="jenny_constructor" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="jenny_constructor" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg index="1"><ref bean="david_constructor"/></constructor-arg>
</bean>
<bean id="david_constructor" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="david_constructor" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg index="1"><ref bean="jenny_constructor"/></constructor-arg>
</bean>
<bean id="jenny_prototype" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="jenny_prototype" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="spouse" ref="david_prototype" />
</bean>
<bean id="david_prototype" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="david_prototype" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="spouse" ref="jenny_prototype" />
</bean>
<bean id="jenny_depends_on" class="org.springframework.beans.test.fixtures.beans.TestBean" depends-on="david_depends_on" />
<bean id="jenny_depends_on" class="org.springframework.beans.testfixture.beans.TestBean" depends-on="david_depends_on" />
<bean id="david_depends_on" class="org.springframework.beans.test.fixtures.beans.TestBean" depends-on="jenny_depends_on" />
<bean id="david_depends_on" class="org.springframework.beans.testfixture.beans.TestBean" depends-on="jenny_depends_on" />
<bean id="jenks" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="jenks" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Andrew</value></property>
<property name="age"><value>36</value></property>
<property name="spouse"><ref bean="jenny"/></property>
</bean>
<bean id="emma" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="emma" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="Emma"/>
<property name="age" value="31"/>
<property name="spouse" ref="jenks"/>
</bean>
<bean id="georgia" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="georgia" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Georgia</value></property>
<property name="age"><value>33</value></property>
<property name="spouse"><ref bean="jenks"/></property>
</bean>
<bean id="ego" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="ego" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="ego"/>
<property name="age" value="1"/>
<property name="spouse" ref="ego"/>
</bean>
<bean id="complexInnerEgo" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="complexInnerEgo" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="ego"/>
<property name="age" value="1"/>
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
<property name="otherTestBean" ref="complexInnerEgo"/>
</bean>
</property>
</bean>
<bean id="complexEgo" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="complexEgo" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name" value="ego"/>
<property name="age" value="1"/>
<property name="spouse" ref="egoBridge"/>
</bean>
<bean id="egoBridge" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean id="egoBridge" class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
<property name="otherTestBean" ref="complexEgo"/>
</bean>
<bean id="ego1" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean id="ego1" class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
<property name="otherTestBean" ref="ego2"/>
</bean>
<bean id="ego2" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean id="ego2" class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
<property name="otherTestBean" ref="ego1"/>
</bean>
<bean id="ego3" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean id="ego3" class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
<property name="otherTestBean">
<bean class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<bean class="org.springframework.beans.testfixture.beans.factory.DummyFactory">
<property name="otherTestBean" ref="ego3"/>
</bean>
</property>
</bean>
<!-- This bean must not conflict with the actual inner beans named "innerBean" -->
<bean id="innerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" destroy-method="destroy">
<bean id="innerBean" class="org.springframework.beans.testfixture.beans.TestBean" destroy-method="destroy">
<constructor-arg><value>outer</value></constructor-arg>
<constructor-arg type="int"><value>0</value></constructor-arg>
</bean>
<bean id="hasInnerBeans" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="hasInnerBeans" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg><value>hasInner</value></constructor-arg>
<constructor-arg index="1" type="int"><value>5</value></constructor-arg>
<property name="spouse">
<bean id="innerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" destroy-method="destroy">
<bean id="innerBean" class="org.springframework.beans.testfixture.beans.TestBean" destroy-method="destroy">
<constructor-arg><value>inner1</value></constructor-arg>
<constructor-arg type="int"><value>6</value></constructor-arg>
</bean>
</property>
<property name="friends">
<list>
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean">
<bean class="org.springframework.beans.testfixture.beans.DerivedTestBean">
<property name="name"><value>inner2</value></property>
<property name="age"><value>7</value></property>
</bean>
<bean id="innerBeanFactory" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory"/>
<bean id="innerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" destroy-method="destroy">
<bean id="innerBeanFactory" class="org.springframework.beans.testfixture.beans.factory.DummyFactory"/>
<bean id="innerBean" class="org.springframework.beans.testfixture.beans.TestBean" destroy-method="destroy">
<constructor-arg><value>inner5</value></constructor-arg>
<constructor-arg type="int"><value>6</value></constructor-arg>
</bean>
@@ -124,7 +124,7 @@
<property name="someMap">
<map>
<entry key="someKey">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean" parent="jenny">
<bean class="org.springframework.beans.testfixture.beans.TestBean" parent="jenny">
<constructor-arg><value>inner3</value></constructor-arg>
<constructor-arg type="int"><value>8</value></constructor-arg>
</bean>
@@ -139,41 +139,41 @@
</property>
</bean>
<bean id="hasInnerBeansForConstructor" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="hasInnerBeansForConstructor" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg>
<bean id="innerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" destroy-method="destroy">
<bean id="innerBean" class="org.springframework.beans.testfixture.beans.TestBean" destroy-method="destroy">
<constructor-arg><value>inner1</value></constructor-arg>
<constructor-arg type="int"><value>6</value></constructor-arg>
</bean>
</constructor-arg>
</bean>
<bean id="hasInnerBeansAsPrototype" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="hasInnerBeansAsPrototype" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<constructor-arg>
<bean id="innerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" destroy-method="destroy">
<bean id="innerBean" class="org.springframework.beans.testfixture.beans.TestBean" destroy-method="destroy">
<constructor-arg><value>inner1</value></constructor-arg>
<constructor-arg type="int"><value>6</value></constructor-arg>
</bean>
</constructor-arg>
</bean>
<bean id="hasInnerBeansWithoutDestroy" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="hasInnerBeansWithoutDestroy" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg><value>hasInner</value></constructor-arg>
<constructor-arg index="1" type="int"><value>5</value></constructor-arg>
<property name="spouse">
<bean id="innerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="innerBean" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<constructor-arg><value>inner1</value></constructor-arg>
<constructor-arg type="int"><value>6</value></constructor-arg>
</bean>
</property>
<property name="friends">
<list>
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean">
<bean class="org.springframework.beans.testfixture.beans.DerivedTestBean">
<property name="name"><value>inner2</value></property>
<property name="age"><value>7</value></property>
</bean>
<bean id="innerBeanFactory" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory"/>
<bean id="innerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="innerBeanFactory" class="org.springframework.beans.testfixture.beans.factory.DummyFactory"/>
<bean id="innerBean" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<constructor-arg><value>inner5</value></constructor-arg>
<constructor-arg type="int"><value>6</value></constructor-arg>
</bean>
@@ -181,11 +181,11 @@
</property>
</bean>
<bean id="failsOnInnerBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="failsOnInnerBean" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someMap">
<map>
<entry key="someKey">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean" parent="jenny">
<bean class="org.springframework.beans.testfixture.beans.TestBean" parent="jenny">
<constructor-arg><value>inner3</value></constructor-arg>
<constructor-arg type="int"><value>8</value></constructor-arg>
<property name="touchy" value="."/>
@@ -201,9 +201,9 @@
</property>
</bean>
<bean id="failsOnInnerBeanForConstructor" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="failsOnInnerBeanForConstructor" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg>
<bean id="innerBean" class="org.springframework.beans.test.fixtures.beans.TestBean" destroy-method="destroy">
<bean id="innerBean" class="org.springframework.beans.testfixture.beans.TestBean" destroy-method="destroy">
<constructor-arg><value>inner1</value></constructor-arg>
<constructor-arg type="int"><value>6</value></constructor-arg>
<property name="touchy" value="."/>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
View File

@@ -3,8 +3,8 @@
<beans>
<bean id="foo" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="foo" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean name="otherFoo,foo" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean name="otherFoo,foo" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
View File

@@ -3,8 +3,8 @@
<beans>
<bean id="foo" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="foo" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean name="foo" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean name="foo" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

4
spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
View File

@@ -4,8 +4,8 @@
xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="foo" class="org.springframework.beans.test.fixtures.beans.TestBean" p:name="Baz"/>
<bean id="foo" class="org.springframework.beans.testfixture.beans.TestBean" p:name="Baz"/>
<bean id="bar" class="org.springframework.beans.test.fixtures.beans.TestBean" p:name="#{foo.name}"/>
<bean id="bar" class="org.springframework.beans.testfixture.beans.TestBean" p:name="#{foo.name}"/>
</beans>

8
spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
View File

@@ -10,11 +10,11 @@
<test:testBean id="testBean" name="Rob Harrop" age="23"/>
<bean id="customisedTestBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="customisedTestBean" class="org.springframework.beans.testfixture.beans.TestBean">
<test:set name="Rob Harrop" age="23"/>
</bean>
<bean id="debuggingTestBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="debuggingTestBean" class="org.springframework.beans.testfixture.beans.TestBean">
<test:debug/>
<property name="name" value="Rob Harrop"/>
<property name="age" value="23"/>
@@ -24,14 +24,14 @@
<test:debug/>
</bean>
<bean id="chainedTestBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="chainedTestBean" class="org.springframework.beans.testfixture.beans.TestBean">
<test:debug/>
<test:nop/>
<property name="name" value="Rob Harrop"/>
<property name="age" value="23"/>
</bean>
<bean id="decorateWithAttribute" class="org.springframework.beans.test.fixtures.beans.TestBean" test:object-name="foo"/>
<bean id="decorateWithAttribute" class="org.springframework.beans.testfixture.beans.TestBean" test:object-name="foo"/>
<util:list id="list.of.things">
<test:person name="Fiona Apple" age="20"/>

46
spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<bean id="jenny" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
@@ -12,7 +12,7 @@
</property>
</bean>
<bean id="david" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="david" class="org.springframework.beans.testfixture.beans.TestBean">
<description>
Simple bean, without any collections.
</description>
@@ -23,7 +23,7 @@
<property name="age"><value>27</value></property>
</bean>
<bean id="rod" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="rod" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="age"><value>32</value></property>
<property name="friends">
@@ -35,7 +35,7 @@
</property>
</bean>
<bean id="pJenny" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="pJenny" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
@@ -44,12 +44,12 @@
</property>
</bean>
<bean id="pDavid" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="pDavid" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>David</value></property>
<property name="age"><value>27</value></property>
</bean>
<bean id="pRod" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="pRod" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>Rod</value></property>
<property name="age"><value>32</value></property>
<property name="friends">
@@ -63,7 +63,7 @@
<!--
Try setting a collection property to a single value
-->
<bean id="loner" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="loner" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>loner</value></property>
<property name="age"><value>26</value></property>
<property name="friends">
@@ -97,26 +97,26 @@
</property>
</bean>
<bean id="verbose" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="verbose" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><value>verbose</value></property>
</bean>
<bean id="verbose2" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="verbose2" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><idref bean="verbose"/></property>
</bean>
<bean id="verbose3" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="verbose3" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="name"><idref bean="verbose"/></property>
</bean>
<bean id="emptyMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="emptyMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
</map>
</property>
</bean>
<bean id="literalMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="literalMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
<entry key="foo" value="bar"/>
@@ -126,7 +126,7 @@
</property>
</bean>
<bean id="mixedMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="mixedMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
<entry key-ref="fooKey">
@@ -158,7 +158,7 @@
<constructor-arg value="jenny"/>
</bean>
<bean id="pMixedMap" class="org.springframework.beans.test.fixtures.beans.HasMap" scope="prototype">
<bean id="pMixedMap" class="org.springframework.beans.testfixture.beans.HasMap" scope="prototype">
<property name="map">
<map>
<entry key="foo" value="bar"/>
@@ -167,7 +167,7 @@
</property>
</bean>
<bean id="mixedMapWithList" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="mixedMapWithList" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="map">
<map>
<entry>
@@ -199,7 +199,7 @@
</property>
</bean>
<bean id="emptySet" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="emptySet" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="set">
<set>
</set>
@@ -207,7 +207,7 @@
</bean>
<bean id="set" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="set" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="set">
<set>
<value>bar</value>
@@ -217,7 +217,7 @@
</property>
</bean>
<bean id="emptyProps" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="emptyProps" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="props">
<props>
</props>
@@ -225,7 +225,7 @@
</bean>
<bean id="props" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="props" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="props">
<props>
<prop key="foo">bar</prop>
@@ -234,7 +234,7 @@
</property>
</bean>
<bean id="propsViaMap" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="propsViaMap" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="props">
<map>
<entry key="foo" value="bar"/>
@@ -243,7 +243,7 @@
</property>
</bean>
<bean id="objectArray" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="objectArray" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="objectArray">
<list>
<value>one</value>
@@ -252,7 +252,7 @@
</property>
</bean>
<bean id="classArray" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="classArray" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="classArray">
<list>
<value>java.lang.String</value>
@@ -261,7 +261,7 @@
</property>
</bean>
<bean id="integerArray" class="org.springframework.beans.test.fixtures.beans.HasMap">
<bean id="integerArray" class="org.springframework.beans.testfixture.beans.HasMap">
<property name="integerArray">
<list>
<value>0</value>

6
spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="inheritedTestBean" class="org.springframework.beans.test.fixtures.beans.TestBean" abstract="true">
<bean id="inheritedTestBean" class="org.springframework.beans.testfixture.beans.TestBean" abstract="true">
<property name="name"><value>parent</value></property>
<property name="age"><value>1</value></property>
</bean>
@@ -13,11 +13,11 @@
<property name="age"><value>1</value></property>
</bean>
<bean id="inheritedTestBeanPrototype" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<bean id="inheritedTestBeanPrototype" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
<property name="name"><value>parent</value></property>
<property name="age"><value>2</value></property>
</bean>
<bean id="inheritedTestBeanSingleton" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="inheritedTestBeanSingleton" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>

2
spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties
View File

@@ -1 +1 @@
propertiesDeclaredBean.(class)=org.springframework.beans.test.fixtures.beans.TestBean
propertiesDeclaredBean.(class)=org.springframework.beans.testfixture.beans.TestBean

2
spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="xmlDeclaredBean" class="org.springframework.beans.test.fixtures.beans.TestBean">
<bean id="xmlDeclaredBean" class="org.springframework.beans.testfixture.beans.TestBean">
<constructor-arg value="xml.declared"/>
</bean>

2
spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
View File

@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="proxiedXmlBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="proxiedXmlBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="anAspect" class="org.springframework.context.annotation.configuration.ImportResourceTests$AnAspect"/>

18
spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
View File

@@ -14,34 +14,34 @@
</property>
</bean>
<bean id="threadScopedObject" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="thread"/>
<bean id="threadScopedObject" class="org.springframework.beans.testfixture.beans.TestBean" scope="thread"/>
<!--
<bean id="requestScopedDisposableObject" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request"/>
<bean id="requestScopedDisposableObject" class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="request"/>
<bean id="requestScopedFactoryBean" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory" scope="request"/>
<bean id="requestScopedFactoryBean" class="org.springframework.beans.testfixture.beans.factory.DummyFactory" scope="request"/>
<bean id="requestScopedObjectCircle1" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle1" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<property name="spouse" ref="requestScopedObjectCircle2"/>
</bean>
<bean id="requestScopedObjectCircle2" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="request">
<bean id="requestScopedObjectCircle2" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
<property name="spouse" ref="requestScopedObjectCircle1"/>
</bean>
<bean id="requestScopedOuterBean" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request">
<bean id="requestScopedOuterBean" class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="request">
<property name="name" value="outer"/>
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean">
<bean class="org.springframework.beans.testfixture.beans.DerivedTestBean">
<property name="name" value="inner"/>
</bean>
</property>
</bean>
<bean id="singletonOuterBean" class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" lazy-init="true">
<bean id="singletonOuterBean" class="org.springframework.beans.testfixture.beans.DerivedTestBean" lazy-init="true">
<property name="name" value="outer"/>
<property name="spouse">
<bean class="org.springframework.beans.test.fixtures.beans.DerivedTestBean" scope="request">
<bean class="org.springframework.beans.testfixture.beans.DerivedTestBean" scope="request">
<property name="name" value="inner"/>
</bean>
</property>

20
spring-context/src/test/resources/org/springframework/context/support/testBeans.properties
View File

@@ -1,42 +1,42 @@
# this must only be used for ApplicationContexts, some classes are only appropriate for application contexts
rod.(class)=org.springframework.beans.test.fixtures.beans.TestBean
rod.(class)=org.springframework.beans.testfixture.beans.TestBean
rod.name=Rod
rod.age=31
roderick.(parent)=rod
roderick.name=Roderick
kerry.(class)=org.springframework.beans.test.fixtures.beans.TestBean
kerry.(class)=org.springframework.beans.testfixture.beans.TestBean
kerry.name=Kerry
kerry.age=34
kerry.spouse(ref)=rod
kathy.(class)=org.springframework.beans.test.fixtures.beans.TestBean
kathy.(class)=org.springframework.beans.testfixture.beans.TestBean
kathy.(singleton)=false
typeMismatch.(class)=org.springframework.beans.test.fixtures.beans.TestBean
typeMismatch.(class)=org.springframework.beans.testfixture.beans.TestBean
typeMismatch.name=typeMismatch
typeMismatch.age=34x
typeMismatch.spouse(ref)=rod
typeMismatch.(singleton)=false
validEmpty.(class)=org.springframework.beans.test.fixtures.beans.TestBean
validEmpty.(class)=org.springframework.beans.testfixture.beans.TestBean
listenerVeto.(class)=org.springframework.beans.test.fixtures.beans.TestBean
listenerVeto.(class)=org.springframework.beans.testfixture.beans.TestBean
typeMismatch.name=typeMismatch
typeMismatch.age=34x
typeMismatch.spouse(ref)=rod
singletonFactory.(class)=org.springframework.beans.test.fixtures.beans.factory.DummyFactory
singletonFactory.(class)=org.springframework.beans.testfixture.beans.factory.DummyFactory
singletonFactory.singleton=true
prototypeFactory.(class)=org.springframework.beans.test.fixtures.beans.factory.DummyFactory
prototypeFactory.(class)=org.springframework.beans.testfixture.beans.factory.DummyFactory
prototypeFactory.singleton=false
mustBeInitialized.(class)=org.springframework.beans.test.fixtures.beans.MustBeInitialized
mustBeInitialized.(class)=org.springframework.beans.testfixture.beans.MustBeInitialized
lifecycle.(class)=org.springframework.context.LifecycleContextBean
lifecyclePostProcessor.(class)=org.springframework.beans.test.fixtures.beans.LifecycleBean$PostProcessor
lifecyclePostProcessor.(class)=org.springframework.beans.testfixture.beans.LifecycleBean$PostProcessor

14
spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
View File

@@ -41,11 +41,11 @@
<!-- Local EJB Tests -->
<jee:local-slsb id="simpleLocalEjb" jndi-name="ejb/MyLocalBean"
business-interface="org.springframework.beans.test.fixtures.beans.ITestBean"/>
business-interface="org.springframework.beans.testfixture.beans.ITestBean"/>
<jee:local-slsb id="complexLocalEjb"
jndi-name="ejb/MyLocalBean"
business-interface="org.springframework.beans.test.fixtures.beans.ITestBean"
business-interface="org.springframework.beans.testfixture.beans.ITestBean"
cache-home="true"
lookup-home-on-startup="true"
resource-ref="true">
@@ -54,15 +54,15 @@
<!-- Remote EJB Tests -->
<jee:remote-slsb id="simpleRemoteEjb" jndi-name="ejb/MyRemoteBean"
business-interface="org.springframework.beans.test.fixtures.beans.ITestBean"/>
business-interface="org.springframework.beans.testfixture.beans.ITestBean"/>
<jee:remote-slsb id="complexRemoteEjb"
jndi-name="ejb/MyRemoteBean"
business-interface="org.springframework.beans.test.fixtures.beans.ITestBean"
business-interface="org.springframework.beans.testfixture.beans.ITestBean"
cache-home="true"
lookup-home-on-startup="true"
resource-ref="true"
home-interface="org.springframework.beans.test.fixtures.beans.ITestBean"
home-interface="org.springframework.beans.testfixture.beans.ITestBean"
refresh-home-on-connect-failure="true"
cache-session-bean="true">
<jee:environment>foo=bar</jee:environment>
@@ -71,8 +71,8 @@
<!-- Lazy beans Tests-->
<jee:jndi-lookup id="lazyDataSource" jndi-name="jdbc/MyDataSource" lazy-init="true" />
<jee:local-slsb id="lazyLocalBean" jndi-name="ejb/MyLocalBean"
business-interface="org.springframework.beans.test.fixtures.beans.ITestBean" lazy-init="true" />
business-interface="org.springframework.beans.testfixture.beans.ITestBean" lazy-init="true" />
<jee:remote-slsb id="lazyRemoteBean" jndi-name="ejb/MyRemoteBean"
business-interface="org.springframework.beans.test.fixtures.beans.ITestBean" lazy-init="true" />
business-interface="org.springframework.beans.testfixture.beans.ITestBean" lazy-init="true" />
</beans>

2
spring-context/src/test/resources/org/springframework/scripting/bsh/MessengerImpl.bsh
View File

@@ -1,4 +1,4 @@
import org.springframework.beans.test.fixtures.beans.TestBean;
import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.scripting.TestBeanAwareMessenger;
public class MyMessenger implements TestBeanAwareMessenger {

2
spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml
View File

@@ -35,7 +35,7 @@
autowire="byName" init-method="init" destroy-method="destroy">
</lang:bsh>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<lang:bsh id="calculator" script-interfaces="org.springframework.scripting.Calculator">
<lang:inline-script>

2
spring-context/src/test/resources/org/springframework/scripting/groovy/ScriptBean.groovy
View File

@@ -1,6 +1,6 @@
package org.springframework.scripting.groovy;
import org.springframework.beans.test.fixtures.beans.TestBean
import org.springframework.beans.testfixture.beans.TestBean
import org.springframework.context.ApplicationContext
import org.springframework.context.ApplicationContextAware
import org.springframework.scripting.ContextScriptBean

2
spring-context/src/test/resources/org/springframework/scripting/groovy/groovy-multiple-properties.xml
View File

@@ -19,6 +19,6 @@
<lang:property name="age" value="31"/>
</lang:groovy>
<bean id="testBean" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
</beans>