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

Move common FactoryMethods to spring-beans test fixtures

Browse Source 
See gh-23550
This commit is contained in:
Sam Brannen
2019-12-31 16:03:56 +01:00
parent 94f8ef08e2
commit 57b771ba92
12 changed files with 30 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,6 @@
<constructor-arg ref="service"/>
</bean>
<bean id="nullInstance" class="org.springframework.tests.sample.beans.FactoryMethods" factory-method="nullInstance"/>
<bean id="serviceInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
<aop:config proxy-target-class="false">

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

@@ -25,7 +25,7 @@
</bean>
<bean id="factoryMethods"
class="org.springframework.beans.factory.xml.FactoryMethods"
class="org.springframework.beans.testfixture.beans.FactoryMethods"
factory-method="newInstance"
scope="prototype">
<constructor-arg index="0"><ref bean="jenny"/></constructor-arg>

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

@@ -16,7 +16,7 @@
<property name="age"><value>30</value></property>
</bean>
<bean id="factoryMethods" class="org.springframework.beans.factory.xml.FactoryMethods"
<bean id="factoryMethods" class="org.springframework.beans.testfixture.beans.FactoryMethods"
factory-method="newInstance" scope="prototype">
<constructor-arg index="0"><ref bean="jenny"/></constructor-arg>
</bean>

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

@@ -4,7 +4,7 @@
<beans>
<bean id="default" class="org.springframework.beans.factory.xml.FactoryMethods"
<bean id="default" class="org.springframework.beans.testfixture.beans.FactoryMethods"
factory-method="defaultInstance">
<!-- No constructor-arg elements -->
<property name="stringValue"><value>setterString</value></property>