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

Remove duplicate test classes

Browse Source 
Prior to this commit many test utility classes and sample beans were
duplicated across projects. This was previously necessary due to the
fact that dependent test sources were not shared during a gradle
build. Since the introduction of the 'test-source-set-dependencies'
gradle plugin this is no longer the case.

This commit attempts to remove as much duplicate code as possible,
co-locating test utilities and beans in the most suitable project.
For example, test beans are now located in the 'spring-beans'
project.

Some of the duplicated code had started to drift apart when
modifications made in one project where not ported to others. All
changes have now been consolidated and when necessary existing tests
have been refactored to account for the differences.

Conflicts:
	spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
	spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
	spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
This commit is contained in:
Phillip Webb
2013-01-03 00:43:48 -08:00
committed by Chris Beams
parent 2a30fa07ea
commit 42b5d6dd7e
813 changed files with 2241 additions and 27860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
View File

@@ -1,3 +1,3 @@
testBean.(class)=test.beans.TestBean
testBean.(class)=org.springframework.tests.sample.beans.TestBean
testBean.$0=Rob Harrop
testBean.$1=23
testBean.$1=23

6
spring-beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
View File

@@ -1,5 +1,5 @@
sally.(class)=test.beans.TestBean
sally.(class)=org.springframework.tests.sample.beans.TestBean
sally.name=Sally
rob.(class)=test.beans.TestBean
rob.$0(ref)=sally
rob.(class)=org.springframework.tests.sample.beans.TestBean
rob.$0(ref)=sally

4
spring-beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties
View File

@@ -1,2 +1,2 @@
testBean.(class)=test.beans.TestBean
testBean.$0=Rob Harrop
testBean.(class)=org.springframework.tests.sample.beans.TestBean
testBean.$0=Rob Harrop

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

@@ -5,7 +5,7 @@
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
default-merge="false">
<bean id="abstractTestBean" class="test.beans.TestBean" abstract="true">
<bean id="abstractTestBean" class="org.springframework.tests.sample.beans.TestBean" abstract="true">
<property name="someList">
<list>
<value>alpha</value>

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
View File

@@ -3,9 +3,9 @@
<beans>
<bean id="rob" class="test.beans.TestBean" scope="prototype" autowire="constructor"/>
<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" scope="prototype" autowire="constructor"/>
<bean id="sally" class="test.beans.TestBean" scope="prototype"/>
<bean id="sally" class="org.springframework.tests.sample.beans.TestBean" scope="prototype"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
View File

@@ -3,9 +3,9 @@
<beans>
<bean id="rob" class="test.beans.TestBean" autowire="byType"/>
<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" autowire="byType"/>
<bean id="sally" class="test.beans.TestBean"/>
<bean id="sally" class="org.springframework.tests.sample.beans.TestBean"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
View File

@@ -4,9 +4,9 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
default-autowire-candidates="">
<bean id="rob" class="test.beans.TestBean" autowire="byType"/>
<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" autowire="byType"/>
<bean id="sally" class="test.beans.TestBean" autowire-candidate="true"/>
<bean id="sally" class="org.springframework.tests.sample.beans.TestBean" autowire-candidate="true"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean" autowire-candidate="true">
<property name="properties">

4
spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
View File

@@ -4,9 +4,9 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
default-autowire-candidates="props*,*ly">
<bean id="rob" class="test.beans.TestBean" autowire="byType"/>
<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" autowire="byType"/>
<bean id="sally" class="test.beans.TestBean"/>
<bean id="sally" class="org.springframework.tests.sample.beans.TestBean"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">

8
spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
View File

@@ -10,22 +10,22 @@
<alias name="testBean" alias="testBeanAlias2"/>
<bean id="testBean" class="test.beans.TestBean">
<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean">
<constructor-arg type="java.lang.String" value="Rob Harrop"/>
<property name="friends">
<ref bean="testBean2"/>
</property>
<property name="doctor">
<bean class="test.beans.NestedTestBean">
<bean class="org.springframework.tests.sample.beans.NestedTestBean">
<constructor-arg type="java.lang.String" value="ACME"/>
</bean>
</property>
</bean>
<bean id="testBean2" class="test.beans.TestBean">
<bean id="testBean2" class="org.springframework.tests.sample.beans.TestBean">
<property name="name" value="Juergen Hoeller"/>
<property name="spouse">
<bean class="test.beans.TestBean">
<bean class="org.springframework.tests.sample.beans.TestBean">
<property name="name" value="Eva Schallmeiner"/>
</bean>
</property>

28
spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="parentWithList" class="test.beans.TestBean">
<bean id="parentWithList" class="org.springframework.tests.sample.beans.TestBean">
<property name="someList">
<list>
<value>Rob Harrop</value>
@@ -23,12 +23,12 @@
<bean id="childWithListOfRefs" parent="parentWithList">
<property name="someList">
<list merge="true">
<bean class="test.beans.TestBean"/>
<bean class="org.springframework.tests.sample.beans.TestBean"/>
</list>
</property>
</bean>
<bean id="parentWithSet" class="test.beans.TestBean">
<bean id="parentWithSet" class="org.springframework.tests.sample.beans.TestBean">
<property name="someSet">
<set>
<value>Rob Harrop</value>
@@ -47,14 +47,14 @@
<bean id="childWithSetOfRefs" parent="parentWithSet">
<property name="someSet">
<set merge="true">
<bean class="test.beans.TestBean">
<bean class="org.springframework.tests.sample.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</set>
</property>
</bean>
<bean id="parentWithMap" class="test.beans.TestBean">
<bean id="parentWithMap" class="org.springframework.tests.sample.beans.TestBean">
<property name="someMap">
<map>
<entry key="Rob" value="Sall"/>
@@ -76,7 +76,7 @@
<property name="someMap">
<map merge="true">
<entry key="Rob">
<bean class="test.beans.TestBean">
<bean class="org.springframework.tests.sample.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</entry>
@@ -84,7 +84,7 @@
</property>
</bean>
<bean id="parentWithProps" class="test.beans.TestBean">
<bean id="parentWithProps" class="org.springframework.tests.sample.beans.TestBean">
<property name="someProperties">
<props>
<prop key="Rob">Sall</prop>
@@ -103,7 +103,7 @@
</bean>
<bean id="parentWithListInConstructor" class="test.beans.TestBean">
<bean id="parentWithListInConstructor" class="org.springframework.tests.sample.beans.TestBean">
<constructor-arg index="0">
<list>
<value>Rob Harrop</value>
@@ -123,12 +123,12 @@
<bean id="childWithListOfRefsInConstructor" parent="parentWithListInConstructor">
<constructor-arg index="0">
<list merge="true">
<bean class="test.beans.TestBean"/>
<bean class="org.springframework.tests.sample.beans.TestBean"/>
</list>
</constructor-arg>
</bean>
<bean id="parentWithSetInConstructor" class="test.beans.TestBean">
<bean id="parentWithSetInConstructor" class="org.springframework.tests.sample.beans.TestBean">
<constructor-arg index="0">
<set>
<value>Rob Harrop</value>
@@ -147,14 +147,14 @@
<bean id="childWithSetOfRefsInConstructor" parent="parentWithSetInConstructor">
<constructor-arg index="0">
<set merge="true">
<bean class="test.beans.TestBean">
<bean class="org.springframework.tests.sample.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</set>
</constructor-arg>
</bean>
<bean id="parentWithMapInConstructor" class="test.beans.TestBean">
<bean id="parentWithMapInConstructor" class="org.springframework.tests.sample.beans.TestBean">
<constructor-arg index="0">
<map>
<entry key="Rob" value="Sall"/>
@@ -176,7 +176,7 @@
<constructor-arg index="0">
<map merge="true">
<entry key="Rob">
<bean class="test.beans.TestBean">
<bean class="org.springframework.tests.sample.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</entry>
@@ -184,7 +184,7 @@
</constructor-arg>
</bean>
<bean id="parentWithPropsInConstructor" class="test.beans.TestBean">
<bean id="parentWithPropsInConstructor" class="org.springframework.tests.sample.beans.TestBean">
<constructor-arg index="0">
<props>
<prop key="Rob">Sall</prop>

78
spring-beans/src/test/resources/org/springframework/beans/factory/xml/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 http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
<bean id="jenny" class="test.beans.TestBean">
<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
@@ -11,8 +11,8 @@
<ref local="david"/>
</property>
</bean>
<bean id="david" class="test.beans.TestBean">
<bean id="david" class="org.springframework.tests.sample.beans.TestBean">
<description>
Simple bean, without any collections.
</description>
@@ -22,8 +22,8 @@
</property>
<property name="age"><value>27</value></property>
</bean>
<bean id="rod" class="test.beans.TestBean">
<bean id="rod" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Rod</value></property>
<property name="age"><value>32</value></property>
<property name="friends">
@@ -34,8 +34,8 @@
</list>
</property>
</bean>
<bean id="pJenny" class="test.beans.TestBean" scope="prototype">
<bean id="pJenny" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
@@ -44,13 +44,13 @@
</property>
</bean>
<bean id="pDavid" class="test.beans.DerivedTestBean" scope="prototype">
<bean id="pDavid" class="org.springframework.tests.sample.beans.DerivedTestBean" scope="prototype">
<property name="name"><value>David</value></property>
<property name="age"><value>27</value></property>
<property name="actualSpouse" value="Jen"/>
</bean>
<bean id="pRod" class="test.beans.TestBean" scope="prototype">
<bean id="pRod" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="name"><value>Rod</value></property>
<property name="age"><value>32</value></property>
<property name="friends">
@@ -64,7 +64,7 @@
<!--
Try setting a collection property to a single value
-->
<bean id="loner" class="test.beans.TestBean">
<bean id="loner" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>loner</value></property>
<property name="age"><value>26</value></property>
<property name="friends">
@@ -74,7 +74,7 @@
</list>
</property>
</bean>
<bean id="jumble" class="org.springframework.beans.factory.xml.MixedCollectionBean">
<property name="jumble">
<list>
@@ -89,7 +89,7 @@
</list>
</property>
</bean>
<bean id="jumble2" class="org.springframework.beans.factory.xml.MixedCollectionBean" lazy-init="true">
<property name="jumble">
<list>
@@ -102,26 +102,26 @@
</property>
</bean>
<bean id="verbose" class="test.beans.TestBean">
<bean id="verbose" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>verbose</value></property>
</bean>
<bean id="verbose2" class="test.beans.TestBean">
<bean id="verbose2" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><idref local="verbose"/></property>
</bean>
<bean id="verbose3" class="test.beans.TestBean">
<bean id="verbose3" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><idref bean="verbose"/></property>
</bean>
<bean id="emptyMap" class="org.springframework.beans.factory.xml.HasMap">
<bean id="emptyMap" class="org.springframework.tests.sample.beans.HasMap">
<property name="map">
<map>
</map>
</property>
</bean>
<bean id="literalMap" class="org.springframework.beans.factory.xml.HasMap">
<bean id="literalMap" class="org.springframework.tests.sample.beans.HasMap">
<property name="map">
<map>
<entry key="foo" value="bar"/>
@@ -131,7 +131,7 @@
</property>
</bean>
<bean id="mixedMap" class="org.springframework.beans.factory.xml.HasMap">
<bean id="mixedMap" class="org.springframework.tests.sample.beans.HasMap">
<property name="map">
<map value-type="java.lang.Integer">
<entry key-ref="fooKey">
@@ -158,7 +158,7 @@
</bean>
<!-- The <description> element below caused parsing exception prior to resolution of SPR-8563 -->
<bean id="mapWithDescriptionInEntry" class="org.springframework.beans.factory.xml.HasMap">
<bean id="mapWithDescriptionInEntry" class="org.springframework.tests.sample.beans.HasMap">
<property name="map">
<map>
<entry key="e1">
@@ -177,7 +177,7 @@
<constructor-arg value="jenny"/>
</bean>
<bean id="pMixedMap" class="org.springframework.beans.factory.xml.HasMap" scope="prototype">
<bean id="pMixedMap" class="org.springframework.tests.sample.beans.HasMap" scope="prototype">
<property name="map">
<map>
<entry key="foo" value="bar"/>
@@ -186,7 +186,7 @@
</property>
</bean>
<bean id="mixedMapWithList" class="org.springframework.beans.factory.xml.HasMap">
<bean id="mixedMapWithList" class="org.springframework.tests.sample.beans.HasMap">
<property name="map">
<map>
<entry>
@@ -217,15 +217,15 @@
</map>
</property>
</bean>
<bean id="emptySet" class="org.springframework.beans.factory.xml.HasMap">
<bean id="emptySet" class="org.springframework.tests.sample.beans.HasMap">
<property name="set">
<set>
</set>
</property>
</bean>
<bean id="set" class="org.springframework.beans.factory.xml.HasMap">
<bean id="set" class="org.springframework.tests.sample.beans.HasMap">
<property name="set">
<set>
<value>bar</value>
@@ -235,7 +235,7 @@
</property>
</bean>
<bean id="concurrentSet" class="org.springframework.beans.factory.xml.HasMap">
<bean id="concurrentSet" class="org.springframework.tests.sample.beans.HasMap">
<property name="concurrentSet">
<set>
<value>bar</value>
@@ -245,7 +245,7 @@
</property>
</bean>
<bean id="identityMap" class="org.springframework.beans.factory.xml.HasMap">
<bean id="identityMap" class="org.springframework.tests.sample.beans.HasMap">
<property name="identityMap">
<map>
<entry key="foo" value="bar"/>
@@ -254,15 +254,15 @@
</property>
</bean>
<bean id="emptyProps" class="org.springframework.beans.factory.xml.HasMap">
<bean id="emptyProps" class="org.springframework.tests.sample.beans.HasMap">
<property name="props">
<props>
</props>
</property>
</bean>
<bean id="props" class="org.springframework.beans.factory.xml.HasMap">
<bean id="props" class="org.springframework.tests.sample.beans.HasMap">
<property name="props">
<props>
<prop key="foo">bar</prop>
@@ -270,8 +270,8 @@
</props>
</property>
</bean>
<bean id="propsViaMap" class="org.springframework.beans.factory.xml.HasMap">
<bean id="propsViaMap" class="org.springframework.tests.sample.beans.HasMap">
<property name="props">
<map>
<entry key="foo" value="bar"/>
@@ -280,7 +280,7 @@
</property>
</bean>
<bean id="objectArray" class="org.springframework.beans.factory.xml.HasMap">
<bean id="objectArray" class="org.springframework.tests.sample.beans.HasMap">
<property name="objectArray">
<list>
<value>one</value>
@@ -288,8 +288,8 @@
</list>
</property>
</bean>
<bean id="classArray" class="org.springframework.beans.factory.xml.HasMap">
<bean id="classArray" class="org.springframework.tests.sample.beans.HasMap">
<property name="classArray">
<list>
<value>java.lang.String</value>
@@ -297,8 +297,8 @@
</list>
</property>
</bean>
<bean id="integerArray" class="org.springframework.beans.factory.xml.HasMap">
<bean id="integerArray" class="org.springframework.tests.sample.beans.HasMap">
<property name="integerArray">
<list>
<value>0</value>

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

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean id="testBean" class="test.beans.TestBean">
<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean">
<property name="someList">
<list value-type="java.lang.Integer">
<value>1</value>
@@ -28,7 +28,7 @@
</property>
</bean>
<bean id="testBean2" class="test.beans.TestBean">
<bean id="testBean2" class="org.springframework.tests.sample.beans.TestBean">
<property name="someMap">
<map key-type="java.lang.Integer" value-type="java.lang.Boolean">
<entry>

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

@@ -102,7 +102,7 @@
<bean id="listInstance" class="org.springframework.beans.factory.xml.FactoryMethods"
factory-method="listInstance"/>
<bean id="juergen" class="test.beans.TestBean">
<bean id="juergen" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Juergen</value></property>
</bean>
@@ -127,7 +127,7 @@
<!-- Unnamed bean with factory-bean declaration -->
<bean factory-bean="instanceFactory" factory-method="defaultInstance"/>
<bean id="testBeanWithInnerFactoryMethod" class="test.beans.TestBean">
<bean id="testBeanWithInnerFactoryMethod" class="org.springframework.tests.sample.beans.TestBean">
<property name="friends">
<list>
<!-- Unnamed bean with factory-bean declaration -->

10
spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
View File

@@ -3,16 +3,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean xml:lang="en" id="testBean" class="test.beans.TestBean"/>
<bean xml:lang="en" id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
<bean id="fooBean" class="test.beans.TestBean">
<bean id="fooBean" class="org.springframework.tests.sample.beans.TestBean">
<property name="spouse">
<bean class="test.beans.TestBean"/>
<bean class="org.springframework.tests.sample.beans.TestBean"/>
</property>
<property name="friends">
<list>
<bean class="test.beans.TestBean"/>
<bean class="test.beans.TestBean"/>
<bean class="org.springframework.tests.sample.beans.TestBean"/>
<bean class="org.springframework.tests.sample.beans.TestBean"/>
</list>
</property>
</bean>

22
spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
View File

@@ -5,43 +5,43 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<!--
<bean id="simple1" class="test.beans.DummyBean">
<bean id="simple1" class="org.springframework.tests.sample.beans.DummyBean">
<constructor-arg value="name"/>
</bean>
-->
<bean id="simple" class="test.beans.DummyBean" c:_="simple"/>
<bean id="simple" class="org.springframework.tests.sample.beans.DummyBean" c:_="simple"/>
<!--
<bean id="simple1-ref" class="test.beans.DummyBean">
<bean id="simple1-ref" class="org.springframework.tests.sample.beans.DummyBean">
<constructor-arg ref="name"/>
</bean>
-->
<bean id="simple-ref" class="test.beans.DummyBean" c:_-ref="name"/>
<bean id="simple-ref" class="org.springframework.tests.sample.beans.DummyBean" c:_-ref="name"/>
<bean id="name" class="java.lang.String">
<constructor-arg type="java.lang.String" value="some-name" index="0"/>
</bean>
<!--
<bean id="name-value1" class="test.beans.TestBean">
<bean id="name-value1" class="org.springframework.tests.sample.beans.TestBean">
<constructor-arg name="name" value="foo"/>
<constructor-arg name="age" value="10"/>
</bean>
-->
<bean id="name-value" class="test.beans.TestBean" c:age="10" c:name="name-value"/>
<bean id="name-value" class="org.springframework.tests.sample.beans.TestBean" c:age="10" c:name="name-value"/>
<!--
<bean id="name-ref1" class="test.beans.DummyBean">
<bean id="name-ref1" class="org.springframework.tests.sample.beans.DummyBean">
<constructor-arg name="name" ref="name"/>
<constructor-arg name="spouse" ref="name-value"/>
</bean>
-->
<bean id="name-ref" class="test.beans.DummyBean" c:name-ref="name" c:spouse-ref="name-value"/>
<bean id="name-ref" class="org.springframework.tests.sample.beans.DummyBean" c:name-ref="name" c:spouse-ref="name-value"/>
<bean id="indexed-value" class="test.beans.DummyBean" c:_1="austria" c:_0="at" c:_2="10"/>
<bean id="indexed-value" class="org.springframework.tests.sample.beans.DummyBean" c:_1="austria" c:_0="at" c:_2="10"/>
<bean id="indexed-ref" class="test.beans.DummyBean" c:_0-ref="name" c:_1-ref="name-value"/>
<bean id="indexed-ref" class="org.springframework.tests.sample.beans.DummyBean" c:_0-ref="name" c:_1-ref="name-value"/>
<bean id="beanWithRefConstructorArg" class="test.beans.DummyBean" c:nameRef="silly name" c:ageRef="10"/>
<bean id="beanWithRefConstructorArg" class="org.springframework.tests.sample.beans.DummyBean" c:nameRef="silly name" c:ageRef="10"/>
</beans>

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

@@ -4,7 +4,7 @@
xmlns:p="http://www.springframework.org/schema/c"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="error" class="org.springframework.beans.TestBean" c:name="error-bean">
<bean id="error" class="org.springframework.tests.sample.beans.TestBean" c:name="error-bean">
<constructor-arg name="name" value="error-bean"/>
</bean>

10
spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
View File

@@ -8,20 +8,20 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
<bean id="rob" class="test.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
<property name="age" value="24"/>
</bean>
<bean id="sally" class="test.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
<bean id="sally" class="org.springframework.tests.sample.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
<bean id="sally2" class="test.beans.TestBean">
<bean id="sally2" class="org.springframework.tests.sample.beans.TestBean">
<property name="spouse">
<bean id="rob2" class="test.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally2">
<bean id="rob2" class="org.springframework.tests.sample.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally2">
<property name="age" value="24"/>
</bean>
</property>
</bean>
<bean id="derivedSally" class="test.beans.DerivedTestBean" p:name="Sally Greenwood" p:spouseRef="r"/>
<bean id="derivedSally" class="org.springframework.tests.sample.beans.DerivedTestBean" p:name="Sally Greenwood" p:spouseRef="r"/>
</beans>

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

@@ -8,10 +8,10 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
<bean id="rob" class="org.springframework.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
<bean id="rob" class="org.springframework.tests.sample.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
<property name="name" value="Rob Harrop"/>
</bean>
<bean id="sally" class="org.springframework.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
<bean id="sally" class="org.springframework.tests.sample.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
</beans>

32
spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="validEmptyWithDescription" class="test.beans.TestBean">
<bean id="validEmptyWithDescription" class="org.springframework.tests.sample.beans.TestBean">
<description>
I have no properties and I'm happy without them.
</description>
@@ -12,7 +12,7 @@
<!--
Check automatic creation of alias, to allow for names that are illegal as XML ids.
-->
<bean id="aliased" class=" test.beans.TestBean " name="myalias">
<bean id="aliased" class=" org.springframework.tests.sample.beans.TestBean " name="myalias">
<property name="name"><value>aliased</value></property>
</bean>
@@ -20,17 +20,17 @@
<alias name="multiAliased" alias="alias3"/>
<bean id="multiAliased" class="test.beans.TestBean" name="alias1,alias2">
<bean id="multiAliased" class="org.springframework.tests.sample.beans.TestBean" name="alias1,alias2">
<property name="name"><value>aliased</value></property>
</bean>
<alias name="multiAliased" alias="alias4"/>
<bean class="test.beans.TestBean" name="aliasWithoutId1,aliasWithoutId2,aliasWithoutId3">
<bean class="org.springframework.tests.sample.beans.TestBean" name="aliasWithoutId1,aliasWithoutId2,aliasWithoutId3">
<property name="name"><value>aliased</value></property>
</bean>
<bean class="test.beans.TestBean">
<bean class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><null/></property>
</bean>
@@ -40,7 +40,7 @@
<bean class="org.springframework.beans.factory.xml.DummyReferencer"/>
<bean id="rod" class="test.beans.TestBean">
<bean id="rod" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value><!-- a comment -->Rod</value></property>
<property name="age"><value>31</value></property>
<property name="spouse"><ref bean="father"/></property>
@@ -52,29 +52,29 @@
<!-- Should inherit age -->
</bean>
<bean id="kerry" class="test.beans.TestBean">
<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Ker<!-- a comment -->ry</value></property>
<property name="age"><value>34</value></property>
<property name="spouse"><ref local="rod"/></property>
<property name="touchy"><value></value></property>
</bean>
<bean id="kathy" class="test.beans.TestBean" scope="prototype">
<bean id="kathy" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="name"><value>Kathy</value></property>
<property name="age"><value>28</value></property>
<property name="spouse"><ref bean="father"/></property>
</bean>
<bean id="typeMismatch" class="test.beans.TestBean" scope="prototype">
<bean id="typeMismatch" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="name"><value>typeMismatch</value></property>
<property name="age"><value>34x</value></property>
<property name="spouse"><ref local="rod"/></property>
</bean>
<!-- Test of lifecycle callbacks -->
<bean id="mustBeInitialized" class="org.springframework.beans.factory.xml.MustBeInitialized"/>
<bean id="mustBeInitialized" class="org.springframework.tests.sample.beans.MustBeInitialized"/>
<bean id="lifecycle" class="test.beans.LifecycleBean"
<bean id="lifecycle" class="org.springframework.tests.sample.beans.LifecycleBean"
init-method="declaredInitMethod">
<property name="initMethodDeclared"><value>true</value></property>
</bean>
@@ -85,10 +85,10 @@
</bean>
<!-- Factory beans are automatically treated differently -->
<bean id="singletonFactory" class="test.beans.DummyFactory">
<bean id="singletonFactory" class="org.springframework.tests.sample.beans.factory.DummyFactory">
</bean>
<bean id="prototypeFactory" class="test.beans.DummyFactory">
<bean id="prototypeFactory" class="org.springframework.tests.sample.beans.factory.DummyFactory">
<property name="singleton"><value>false</value></property>
</bean>
@@ -113,14 +113,14 @@
<property name="testBean2"><ref bean="kathy"/></property>
</bean>
<bean id="listenerVeto" class="test.beans.TestBean">
<bean id="listenerVeto" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>listenerVeto</value></property>
<property name="age"><value>66</value></property>
</bean>
<bean id="validEmpty" class="test.beans.TestBean"/>
<bean id="validEmpty" class="org.springframework.tests.sample.beans.TestBean"/>
<bean id="commentsInValue" class="test.beans.TestBean">
<bean id="commentsInValue" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>this is<!-- don't mind me --> a <![CDATA[<!--comment-->]]></value></property>
</bean>

18
spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
View File

@@ -17,7 +17,7 @@
name
"/>
<bean id="testBean" class="test.beans.TestBean" scope="prototype">
<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="name">
<util:property-path path="configuredBean.name"/>
</property>
@@ -26,13 +26,13 @@
</property>
</bean>
<bean id="constructedTestBean" class="test.beans.TestBean">
<bean id="constructedTestBean" class="org.springframework.tests.sample.beans.TestBean">
<constructor-arg index="0">
<util:property-path path="configuredBean.name"/>
</constructor-arg>
</bean>
<bean id="configuredBean" class="test.beans.TestBean">
<bean id="configuredBean" class="org.springframework.tests.sample.beans.TestBean">
<property name="name" value="Rob Harrop"/>
</bean>
@@ -67,7 +67,7 @@
<value>Rob Harrop</value>
</util:set>
<bean id="nestedCollectionsBean" class="test.beans.TestBean" scope="prototype">
<bean id="nestedCollectionsBean" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="someList">
<util:list>
<value>foo</value>
@@ -89,13 +89,13 @@
</property>
</bean>
<bean id="nestedShortcutCollections" class="test.beans.TestBean" scope="prototype">
<bean id="nestedShortcutCollections" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="stringArray" value="fooStr"/>
<property name="someList" value="foo"/>
<property name="someSet" value="bar"/>
</bean>
<bean id="nestedCustomTagBean" class="test.beans.TestBean" scope="prototype">
<bean id="nestedCustomTagBean" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="someList">
<list>
<util:constant static-field="java.lang.Integer.MIN_VALUE"/>
@@ -111,13 +111,13 @@
<map>
<entry>
<key><value>min</value></key>
<util:constant static-field="test.beans.CustomEnum.VALUE_1"/>
<util:constant static-field="org.springframework.tests.sample.beans.CustomEnum.VALUE_1"/>
</entry>
</map>
</property>
</bean>
<bean id="circularCollectionsBean" class="test.beans.TestBean">
<bean id="circularCollectionsBean" class="org.springframework.tests.sample.beans.TestBean">
<property name="someList">
<util:list>
<ref bean="circularCollectionsBean"/>
@@ -147,7 +147,7 @@
<entry key="foo" value-ref="circularCollectionBeansBean"/>
</util:map>
<bean id="circularCollectionBeansBean" class="test.beans.TestBean">
<bean id="circularCollectionBeansBean" class="org.springframework.tests.sample.beans.TestBean">
<property name="someList" ref="circularList"/>
<property name="someSet" ref="circularSet"/>
<property name="someMap" ref="circularMap"/>

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

@@ -9,5 +9,5 @@ This is a top level block comment
<!-- more trickery--> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd"><!-- some nasty stuff -->
<beans>
<bean id="testBean" class="test.beans.TestBean"/>
<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
</beans>

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

@@ -7,5 +7,5 @@ This is a top level block comment
the parser now --> <!-- <beans>
-->
<!-- more trickery--><beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"><!-- end -->
<bean id="testBean" class="test.beans.TestBean"/>
<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
</beans>

6
spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
View File

@@ -4,15 +4,15 @@
xmlns:spring="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<spring:bean id="testBean1" class="test.beans.TestBean">
<spring:bean id="testBean1" class="org.springframework.tests.sample.beans.TestBean">
<spring:meta key="foo" value="bar"/>
</spring:bean>
<spring:bean id="testBean2" class="test.beans.TestBean" parent="testBean1">
<spring:bean id="testBean2" class="org.springframework.tests.sample.beans.TestBean" parent="testBean1">
<spring:meta key="abc" value="123"/>
</spring:bean>
<spring:bean id="testBean3" class="test.beans.TestBean">
<spring:bean id="testBean3" class="org.springframework.tests.sample.beans.TestBean">
<spring:property name="name" value="Rob">
<spring:meta key="surname" value="Harrop"/>
</spring:property>