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

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

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

2
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-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 class="org.springframework.tests.sample.beans.TestBean">
<bean class="org.springframework.beans.test.fixtures.beans.TestBean">
<constructor-arg value="${name}"/>
</bean>

10
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/applicationContext.xml
View File

@@ -9,7 +9,7 @@
<import resource="/resources/../resources/themeSource.xml"/>
<bean id="lifecyclePostProcessor" class="org.springframework.tests.sample.beans.LifecycleBean$PostProcessor"/>
<bean id="lifecyclePostProcessor" class="org.springframework.beans.test.fixtures.beans.LifecycleBean$PostProcessor"/>
<!--
<bean
@@ -25,14 +25,14 @@
</bean>
-->
<bean id="beanThatListens" class="org.springframework.context.BeanThatListens"/>
<bean id="beanThatListens" class="org.springframework.context.test.fixtures.beans.BeanThatListens"/>
<bean id="parentListener" class="org.springframework.context.TestListener"/>
<bean id="parentListener" class="org.springframework.context.test.fixtures.beans.TestApplicationListener"/>
<!-- Inherited tests -->
<!-- name and age values will be overridden by myinit.properties" -->
<bean id="rod" class="org.springframework.tests.sample.beans.TestBean">
<bean id="rod" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="name">
<value>dummy</value>
</property>
@@ -45,7 +45,7 @@
Tests of lifecycle callbacks
-->
<bean id="mustBeInitialized"
class="org.springframework.tests.sample.beans.MustBeInitialized">
class="org.springframework.beans.test.fixtures.beans.MustBeInitialized">
</bean>
<bean id="lifecycle"

20
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml
View File

@@ -3,26 +3,26 @@
<beans>
<bean id="aca" class="org.springframework.context.ACATester"/>
<bean id="aca" class="org.springframework.context.test.fixtures.beans.ACATester"/>
<bean id="aca-prototype" class="org.springframework.context.ACATester" scope="prototype"/>
<bean id="aca-prototype" class="org.springframework.context.test.fixtures.beans.ACATester" scope="prototype"/>
<bean id="testListener" class="org.springframework.context.TestListener"/>
<bean id="testListener" class="org.springframework.context.test.fixtures.beans.TestApplicationListener"/>
<bean id="roderick" parent="rod">
<property name="name"><value>Roderick</value></property>
<property name="age"><value>31</value></property>
</bean>
<bean id="kathy" class="org.springframework.tests.sample.beans.TestBean" scope="prototype"/>
<bean id="kathy" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype"/>
<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean">
<bean id="kerry" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="name"><value>Kerry</value></property>
<property name="age"><value>34</value></property>
<property name="spouse"><ref bean="rod"/></property>
</bean>
<bean id="typeMismatch" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<bean id="typeMismatch" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<property name="name"><value>typeMismatch</value></property>
<property name="age"><value>34x</value></property>
<property name="spouse"><ref bean="rod"/></property>
@@ -31,20 +31,20 @@
<!-- Factory beans are automatically treated
differently -->
<bean id="singletonFactory"
class="org.springframework.tests.sample.beans.factory.DummyFactory">
class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
</bean>
<bean id="prototypeFactory"
class="org.springframework.tests.sample.beans.factory.DummyFactory">
class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<property name="singleton"><value>false</value></property>
</bean>
<bean id="listenerVeto" class="org.springframework.tests.sample.beans.TestBean">
<bean id="listenerVeto" class="org.springframework.beans.test.fixtures.beans.TestBean">
<!-- <listener property="age" beanRef="agistListener" /> -->
<property name="name"><value>listenerVeto</value></property>
<property name="age"><value>66</value></property>
</bean>
<bean id="validEmpty" class="org.springframework.tests.sample.beans.TestBean"/>
<bean id="validEmpty" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
</beans>

2
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/contextInclude.xml
View File

@@ -1,6 +1,6 @@
<!-- Include snippet to be loaded via entity reference in applicationContext.xml -->
<bean id="father" class="org.springframework.tests.sample.beans.TestBean">
<bean id="father" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="name"><value>yetanotherdummy</value></property>
</bean>

4
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
View File

@@ -3,12 +3,12 @@
<beans>
<bean id="rob" class="org.springframework.tests.sample.beans.TestBean">
<bean id="rob" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="name" value="dummy"/>
<property name="age" value="-1"/>
</bean>
<bean id="rodProto" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<bean id="rodProto" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<property name="name" value="dummy"/>
<property name="age" value="-1"/>
</bean>

22
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml
View File

@@ -11,49 +11,49 @@
<property name="basenamePrefix"><value>org/springframework/web/context/WEB-INF/test-</value></property>
</bean>
<bean id="aca" class="org.springframework.context.ACATester"/>
<bean id="aca" class="org.springframework.context.test.fixtures.beans.ACATester"/>
<bean id="aca-prototype" class="org.springframework.context.ACATester" scope="prototype"/>
<bean id="aca-prototype" class="org.springframework.context.test.fixtures.beans.ACATester" scope="prototype"/>
<bean id="rod" class="org.springframework.tests.sample.beans.TestBean">
<bean id="rod" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="age"><value>31</value></property>
<property name="spouse"><ref bean="father"/></property>
</bean>
<bean id="testListener" class="org.springframework.context.TestListener"/>
<bean id="testListener" class="org.springframework.context.test.fixtures.beans.TestApplicationListener"/>
<bean id="roderick" parent="rod">
<property name="name"><value>Roderick</value></property>
<property name="age"><value>31</value></property>
</bean>
<bean id="kathy" class="org.springframework.tests.sample.beans.TestBean" scope="prototype"/>
<bean id="kathy" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype"/>
<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean">
<bean id="kerry" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="name"><value>Kerry</value></property>
<property name="age"><value>34</value></property>
<property name="spouse"><ref bean="rod"/></property>
</bean>
<bean id="typeMismatch" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<bean id="typeMismatch" class="org.springframework.beans.test.fixtures.beans.TestBean" scope="prototype">
<property name="name"><value>typeMismatch</value></property>
<property name="age"><value>34x</value></property>
<property name="spouse"><ref bean="rod"/></property>
</bean>
<bean id="singletonFactory" class="org.springframework.tests.sample.beans.factory.DummyFactory">
<bean id="singletonFactory" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
</bean>
<bean id="prototypeFactory" class="org.springframework.tests.sample.beans.factory.DummyFactory">
<bean id="prototypeFactory" class="org.springframework.beans.test.fixtures.beans.factory.DummyFactory">
<property name="singleton"><value>false</value></property>
</bean>
<bean id="listenerVeto" class="org.springframework.tests.sample.beans.TestBean">
<bean id="listenerVeto" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="name"><value>listenerVeto</value></property>
<property name="age"><value>66</value></property>
</bean>
<bean id="validEmpty" class="org.springframework.tests.sample.beans.TestBean"/>
<bean id="validEmpty" class="org.springframework.beans.test.fixtures.beans.TestBean"/>
</beans>

4
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/testNamespace.xml
View File

@@ -3,12 +3,12 @@
<beans>
<bean id="rod" class="org.springframework.tests.sample.beans.TestBean">
<bean id="rod" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="age"><value>31</value></property>
</bean>
<bean id="kerryX" class="org.springframework.tests.sample.beans.TestBean">
<bean id="kerryX" class="org.springframework.beans.test.fixtures.beans.TestBean">
<property name="name"><value>Kerry</value></property>
<property name="age"><value>34</value></property>
<property name="spouse"><ref bean="rod"/></property>