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

polishing .beans tests

Browse Source
This commit is contained in:
Chris Beams
2008-12-24 19:34:04 +00:00
parent 670bfd5ee2
commit 751daf95a1
83 changed files with 252 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/fieldRetrieving.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="testBean" class="org.springframework.beans.TestBean">
<bean id="testBean" class="test.beans.TestBean">
<property name="someIntegerArray">
<list>
<bean name="java.sql.Connection.TRANSACTION_SERIALIZABLE" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean"/>

14
org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/propertyPath.xml
View File

@@ -3,19 +3,19 @@
<beans>
<bean id="tb" class="org.springframework.beans.TestBean" scope="prototype">
<bean id="tb" class="test.beans.TestBean" scope="prototype">
<property name="age"><value>10</value></property>
<property name="spouse">
<bean class="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="age"><value>11</value></property>
</bean>
</property>
</bean>
<bean id="otb" class="org.springframework.beans.TestBean">
<bean id="otb" class="test.beans.TestBean">
<property name="age"><value>98</value></property>
<property name="spouse">
<bean class="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="age"><value>99</value></property>
</bean>
</property>
@@ -23,7 +23,7 @@
<bean id="propertyPath1" class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
<property name="targetObject">
<bean class="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="age"><value>12</value></property>
</bean>
</property>
@@ -46,10 +46,10 @@
<bean id="propertyPath3" class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
<property name="targetBeanName"><value>tb</value></property>
<property name="propertyPath"><value>spouse</value></property>
<property name="resultType"><value>org.springframework.beans.TestBean</value></property>
<property name="resultType"><value>test.beans.TestBean</value></property>
</bean>
<bean id="tbWithInner" class="org.springframework.beans.TestBean">
<bean id="tbWithInner" class="test.beans.TestBean">
<property name="age" value="10"/>
<property name="spouse">
<bean name="otb.spouse" class="org.springframework.beans.factory.config.PropertyPathFactoryBean"/>

8
org.springframework.beans/src/test/resources/org/springframework/beans/factory/parsing/withErrors.xml
View File

@@ -6,7 +6,7 @@
<bean id="invalidClass" class="some.class.that.does.not.Exist"/>
<bean id="invalidMapDefinition" class="org.springframework.beans.TestBean">
<bean id="invalidMapDefinition" class="test.beans.TestBean">
<property name="someMap">
<map>
<entry/>
@@ -14,9 +14,9 @@
</property>
</bean>
<bean id="nestedBeanErrors" class="org.springframework.beans.TestBean">
<bean id="nestedBeanErrors" class="test.beans.TestBean">
<property name="spouse">
<bean class="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="someMap">
<map>
<entry/>
@@ -26,5 +26,5 @@
</property>
</bean>
<bean id="validBean" class="org.springframework.beans.TestBean"/>
<bean id="validBean" class="test.beans.TestBean"/>
</beans>

2
org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
View File

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

4
org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
View File

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

2
org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties
View File

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

4
org.springframework.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="org.springframework.beans.TestBean" scope="prototype" autowire="constructor"/>
<bean id="rob" class="test.beans.TestBean" scope="prototype" autowire="constructor"/>
<bean id="sally" class="org.springframework.beans.TestBean" scope="prototype"/>
<bean id="sally" class="test.beans.TestBean" scope="prototype"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">

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

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

4
org.springframework.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="org.springframework.beans.TestBean" autowire="byType"/>
<bean id="rob" class="test.beans.TestBean" autowire="byType"/>
<bean id="sally" class="org.springframework.beans.TestBean" autowire-candidate="true"/>
<bean id="sally" class="test.beans.TestBean" autowire-candidate="true"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean" autowire-candidate="true">
<property name="properties">

4
org.springframework.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="org.springframework.beans.TestBean" autowire="byType"/>
<bean id="rob" class="test.beans.TestBean" autowire="byType"/>
<bean id="sally" class="org.springframework.beans.TestBean"/>
<bean id="sally" class="test.beans.TestBean"/>
<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">

8
org.springframework.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="org.springframework.beans.TestBean">
<bean id="testBean" class="test.beans.TestBean">
<constructor-arg type="java.lang.String" value="Rob Harrop"/>
<property name="friends">
<ref bean="testBean2"/>
</property>
<property name="doctor">
<bean class="org.springframework.beans.NestedTestBean">
<bean class="test.beans.NestedTestBean">
<constructor-arg type="java.lang.String" value="ACME"/>
</bean>
</property>
</bean>
<bean id="testBean2" class="org.springframework.beans.TestBean">
<bean id="testBean2" class="test.beans.TestBean">
<property name="name" value="Juergen Hoeller"/>
<property name="spouse">
<bean class="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="name" value="Eva Schallmeiner"/>
</bean>
</property>

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

@@ -3,7 +3,7 @@
<beans>
<bean id="parentWithList" class="org.springframework.beans.TestBean">
<bean id="parentWithList" class="test.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="org.springframework.beans.TestBean"/>
<bean class="test.beans.TestBean"/>
</list>
</property>
</bean>
<bean id="parentWithSet" class="org.springframework.beans.TestBean">
<bean id="parentWithSet" class="test.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="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</set>
</property>
</bean>
<bean id="parentWithMap" class="org.springframework.beans.TestBean">
<bean id="parentWithMap" class="test.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="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</entry>
@@ -84,7 +84,7 @@
</property>
</bean>
<bean id="parentWithProps" class="org.springframework.beans.TestBean">
<bean id="parentWithProps" class="test.beans.TestBean">
<property name="someProperties">
<props>
<prop key="Rob">Sall</prop>
@@ -103,7 +103,7 @@
</bean>
<bean id="parentWithListInConstructor" class="org.springframework.beans.TestBean">
<bean id="parentWithListInConstructor" class="test.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="org.springframework.beans.TestBean"/>
<bean class="test.beans.TestBean"/>
</list>
</constructor-arg>
</bean>
<bean id="parentWithSetInConstructor" class="org.springframework.beans.TestBean">
<bean id="parentWithSetInConstructor" class="test.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="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</set>
</constructor-arg>
</bean>
<bean id="parentWithMapInConstructor" class="org.springframework.beans.TestBean">
<bean id="parentWithMapInConstructor" class="test.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="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="name" value="Sally"/>
</bean>
</entry>
@@ -184,7 +184,7 @@
</constructor-arg>
</bean>
<bean id="parentWithPropsInConstructor" class="org.springframework.beans.TestBean">
<bean id="parentWithPropsInConstructor" class="test.beans.TestBean">
<constructor-arg index="0">
<props>
<prop key="Rob">Sall</prop>

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

@@ -3,7 +3,7 @@
"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="testBean" class="org.springframework.beans.TestBean">
<bean id="testBean" class="test.beans.TestBean">
<property name="someList">
<list value-type="java.lang.Integer">
<value>1</value>
@@ -28,7 +28,7 @@
</property>
</bean>
<bean id="testBean2" class="org.springframework.beans.TestBean">
<bean id="testBean2" class="test.beans.TestBean">
<property name="someMap">
<map key-type="java.lang.Integer" value-type="java.lang.Boolean">
<entry>

10
org.springframework.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="org.springframework.beans.TestBean"/>
<bean xml:lang="en" id="testBean" class="test.beans.TestBean"/>
<bean id="fooBean" class="org.springframework.beans.TestBean">
<bean id="fooBean" class="test.beans.TestBean">
<property name="spouse">
<bean class="org.springframework.beans.TestBean"/>
<bean class="test.beans.TestBean"/>
</property>
<property name="friends">
<list>
<bean class="org.springframework.beans.TestBean"/>
<bean class="org.springframework.beans.TestBean"/>
<bean class="test.beans.TestBean"/>
<bean class="test.beans.TestBean"/>
</list>
</property>
</bean>

8
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/shortcutTests.xml
View File

@@ -8,15 +8,15 @@
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="test.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally">
<property name="age" value="24"/>
</bean>
<bean id="sally" class="org.springframework.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
<bean id="sally" class="test.beans.TestBean" p:name="Sally Greenwood" p:spouse-ref="rob"/>
<bean id="sally2" class="org.springframework.beans.TestBean">
<bean id="sally2" class="test.beans.TestBean">
<property name="spouse">
<bean id="rob2" class="org.springframework.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally2">
<bean id="rob2" class="test.beans.TestBean" p:name="Rob Harrop" p:spouse-ref="sally2">
<property name="age" value="24"/>
</bean>
</property>

24
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="validEmptyWithDescription" class="org.springframework.beans.TestBean">
<bean id="validEmptyWithDescription" class="test.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=" org.springframework.beans.TestBean " name="myalias">
<bean id="aliased" class=" test.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="org.springframework.beans.TestBean" name="alias1,alias2">
<bean id="multiAliased" class="test.beans.TestBean" name="alias1,alias2">
<property name="name"><value>aliased</value></property>
</bean>
<alias name="multiAliased" alias="alias4"/>
<bean class="org.springframework.beans.TestBean" name="aliasWithoutId1,aliasWithoutId2,aliasWithoutId3">
<bean class="test.beans.TestBean" name="aliasWithoutId1,aliasWithoutId2,aliasWithoutId3">
<property name="name"><value>aliased</value></property>
</bean>
<bean class="org.springframework.beans.TestBean">
<bean class="test.beans.TestBean">
<property name="name"><null/></property>
</bean>
@@ -40,7 +40,7 @@
<bean class="org.springframework.beans.factory.xml.DummyReferencer"/>
<bean id="rod" class="org.springframework.beans.TestBean">
<bean id="rod" class="test.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,20 +52,20 @@
<!-- Should inherit age -->
</bean>
<bean id="kerry" class="org.springframework.beans.TestBean">
<bean id="kerry" class="test.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="org.springframework.beans.TestBean" scope="prototype">
<bean id="kathy" class="test.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="org.springframework.beans.TestBean" scope="prototype">
<bean id="typeMismatch" class="test.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>
@@ -113,14 +113,14 @@
<property name="testBean2"><ref bean="kathy"/></property>
</bean>
<bean id="listenerVeto" class="org.springframework.beans.TestBean">
<bean id="listenerVeto" class="test.beans.TestBean">
<property name="name"><value>listenerVeto</value></property>
<property name="age"><value>66</value></property>
</bean>
<bean id="validEmpty" class="org.springframework.beans.TestBean"/>
<bean id="validEmpty" class="test.beans.TestBean"/>
<bean id="commentsInValue" class="org.springframework.beans.TestBean">
<bean id="commentsInValue" class="test.beans.TestBean">
<property name="name"><value>this is<!-- don't mind me --> a <![CDATA[<!--comment-->]]></value></property>
</bean>

14
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
View File

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

2
org.springframework.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="org.springframework.beans.TestBean"/>
<bean id="testBean" class="test.beans.TestBean"/>
</beans>

2
org.springframework.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="org.springframework.beans.TestBean"/>
<bean id="testBean" class="test.beans.TestBean"/>
</beans>

6
org.springframework.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="org.springframework.beans.TestBean">
<spring:bean id="testBean1" class="test.beans.TestBean">
<spring:meta key="foo" value="bar"/>
</spring:bean>
<spring:bean id="testBean2" class="org.springframework.beans.TestBean" parent="testBean1">
<spring:bean id="testBean2" class="test.beans.TestBean" parent="testBean1">
<spring:meta key="abc" value="123"/>
</spring:bean>
<spring:bean id="testBean3" class="org.springframework.beans.TestBean">
<spring:bean id="testBean3" class="test.beans.TestBean">
<spring:property name="name" value="Rob">
<spring:meta key="surname" value="Harrop"/>
</spring:property>