From 3620181a105a93ced68ad6c0b6e13914a7630efe Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 30 Oct 2008 16:46:52 +0000
Subject: [PATCH] Moved tests from testsuite to orm

---
 .../HibernateTransactionManagerTests.java     |   0
 .../LocalSessionFactoryBeanTests.java         |   0
 .../beans/factory/xml/child.xml               |  51 +++++++
 .../beans/factory/xml/test.xml                | 127 ++++++++++++++++++
 .../orm/hibernate3/filterDefinitions.xml      |  30 +++++
 .../orm/hibernate3/typeDefinitions.xml        |  32 +++++
 6 files changed, 240 insertions(+)
 rename {org.springframework.testsuite => org.springframework.orm}/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.orm}/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java (100%)
 create mode 100644 org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
 create mode 100644 org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
 create mode 100644 org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml
 create mode 100644 org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml

diff --git a/org.springframework.testsuite/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
rename to org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
rename to org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
diff --git a/org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/child.xml b/org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
new file mode 100644
index 0000000000..654e76e7fb
--- /dev/null
+++ b/org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/child.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<bean id="inheritsFromParentFactory" parent="inheritedTestBean">
+		<property name="name"><value>override</value></property>
+		<!-- age should inherit value of 1 from parent -->
+	</bean>
+	
+	<bean id="inheritsWithDifferentClass" class="org.springframework.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.DerivedTestBean"
+			parent="inheritedTestBeanWithoutClass" init-method="initialize">
+		<property name="name"><value>override</value></property>
+		<!-- age should inherit value of 1 from parent -->
+	</bean>
+
+	<bean id="protoypeInheritsFromParentFactorySingleton" parent="inheritedTestBean" scope="prototype">
+		<property name="name"><value>prototypeOverridesInheritedSingleton</value></property>
+		<!-- age should inherit value of 1 from parent -->
+	</bean>
+	
+	<bean id="prototypeInheritsFromParentFactoryPrototype" parent="inheritedTestBeanPrototype" scope="prototype">
+		<property name="name"><value>prototype-override</value></property>
+		<!-- age should inherit value of 2 from parent -->
+	</bean>
+	
+	<bean id="singletonInheritsFromParentFactoryPrototype" parent="inheritedTestBeanPrototype" scope="singleton">
+		<property name="name"><value>prototype-override</value></property>
+		<!-- age should inherit value of 2 from parent -->
+	</bean>
+	
+	<bean id="inheritedTestBean" parent="inheritedTestBean">
+		<property name="name"><value>overrideParentBean</value></property>
+		<!-- age should inherit value of 1 from parent -->
+	</bean>
+
+	<bean id="bogusParent" parent="bogus" scope="prototype"/>
+
+	<bean id="indexedTestBean" class="org.springframework.beans.IndexedTestBean">
+		<property name="array[0].name"><value>myname</value></property>
+	</bean>
+
+	<bean parent="inheritedTestBean"/>
+
+</beans>
diff --git a/org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/test.xml b/org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
new file mode 100644
index 0000000000..e67e310136
--- /dev/null
+++ b/org.springframework.orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<bean id="validEmptyWithDescription" class="org.springframework.beans.TestBean">
+		<description>
+			I have no properties and I'm happy without them.
+		</description>
+	</bean>
+
+	<!--
+		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">
+		<property name="name"><value>aliased</value></property>
+	</bean>
+
+	<alias name="aliased" alias="youralias"/>
+
+	<alias name="multiAliased" alias="alias3"/>
+
+	<bean id="multiAliased" class="org.springframework.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">
+		<property name="name"><value>aliased</value></property>
+	</bean>
+
+	<bean class="org.springframework.beans.TestBean">
+		<property name="name"><null/></property>
+	</bean>
+
+	<bean class="org.springframework.beans.factory.xml.DummyReferencer"/>
+
+	<bean class="org.springframework.beans.factory.xml.DummyReferencer"/>
+
+	<bean class="org.springframework.beans.factory.xml.DummyReferencer"/>
+
+	<bean id="rod" class="org.springframework.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>
+		<property name="touchy"><value/></property>
+	</bean>
+
+	<bean id="roderick" parent="rod">
+		<property name="name"><value>Roderick<!-- a comment --></value></property>
+		<!-- Should inherit age -->
+	</bean>
+
+	<bean id="kerry" class="org.springframework.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">
+		<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">
+		<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.MustBeInitialized"/>
+
+	<bean id="lifecycle" class="org.springframework.beans.factory.LifecycleBean"
+		  init-method="declaredInitMethod">
+		<property name="initMethodDeclared"><value>true</value></property>
+	</bean>
+
+	<bean id="protectedLifecycle" class="org.springframework.beans.factory.xml.ProtectedLifecycleBean"
+		  init-method="declaredInitMethod">
+		<property name="initMethodDeclared"><value>true</value></property>
+	</bean>
+
+	<!-- Factory beans are automatically treated differently -->
+	<bean id="singletonFactory"	class="org.springframework.beans.factory.DummyFactory">
+	</bean>
+
+	<bean id="prototypeFactory"	class="org.springframework.beans.factory.DummyFactory">
+		<property name="singleton"><value>false</value></property>
+	</bean>
+
+	<!-- Check that the circular reference resolution mechanism doesn't break
+	     repeated references to the same FactoryBean -->
+	<bean id="factoryReferencer" class="org.springframework.beans.factory.xml.DummyReferencer">
+		<property name="testBean1"><ref bean="singletonFactory"/></property>
+		<property name="testBean2"><ref local="singletonFactory"/></property>
+		<property name="dummyFactory"><ref bean="&amp;singletonFactory"/></property>
+	</bean>
+
+	<bean id="factoryReferencerWithConstructor" class="org.springframework.beans.factory.xml.DummyReferencer">
+		<constructor-arg><ref bean="&amp;singletonFactory"/></constructor-arg>
+		<property name="testBean1"><ref bean="singletonFactory"/></property>
+		<property name="testBean2"><ref local="singletonFactory"/></property>
+	</bean>
+
+	<!-- Check that the circular reference resolution mechanism doesn't break
+	     prototype instantiation -->
+	<bean id="prototypeReferencer" class="org.springframework.beans.factory.xml.DummyReferencer" scope="prototype">
+		<property name="testBean1"><ref local="kathy"/></property>
+		<property name="testBean2"><ref bean="kathy"/></property>
+	</bean>
+
+	<bean id="listenerVeto" class="org.springframework.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="commentsInValue" class="org.springframework.beans.TestBean">
+	  <property name="name"><value>this is<!-- don't mind me --> a <![CDATA[<!--comment-->]]></value></property>
+	</bean>
+
+</beans>
diff --git a/org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml b/org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml
new file mode 100644
index 0000000000..96b19990ac
--- /dev/null
+++ b/org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/filterDefinitions.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBeanTests$FilterTestLocalSessionFactoryBean">
+		<property name="filterDefinitions">
+			<list>
+				<bean class="org.springframework.orm.hibernate3.FilterDefinitionFactoryBean">
+					<property name="filterName" value="filter1"/>
+					<property name="parameterTypes">
+						<props>
+							<prop key="param1">string</prop>
+							<prop key="otherParam">long</prop>
+						</props>
+					</property>
+					<property name="defaultFilterCondition" value="someCondition"/>
+				</bean>
+				<bean id="filter2" class="org.springframework.orm.hibernate3.FilterDefinitionFactoryBean">
+					<property name="parameterTypes">
+						<props>
+							<prop key="myParam">integer</prop>
+						</props>
+					</property>
+				</bean>
+			</list>
+		</property>
+	</bean>
+
+</beans>
diff --git a/org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml b/org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml
new file mode 100644
index 0000000000..bd12f319b7
--- /dev/null
+++ b/org.springframework.orm/src/test/resources/org/springframework/orm/hibernate3/typeDefinitions.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBeanTests$TypeTestLocalSessionFactoryBean">
+		<property name="typeDefinitions">
+			<list>
+				<bean class="org.springframework.orm.hibernate3.TypeDefinitionBean">
+					<property name="typeName" value="type1"/>
+					<property name="typeClass" value="mypackage.MyTypeClass"/>
+					<property name="parameters">
+						<props>
+							<prop key="param1">value1</prop>
+							<prop key="otherParam">othervalue</prop>
+						</props>
+					</property>
+				</bean>
+				<bean id="type2" class="org.springframework.orm.hibernate3.TypeDefinitionBean">
+					<property name="typeName" value="type2"/>
+					<property name="typeClass" value="mypackage.MyOtherTypeClass"/>
+					<property name="parameters">
+						<props>
+							<prop key="myParam">myvalue</prop>
+						</props>
+					</property>
+				</bean>
+			</list>
+		</property>
+	</bean>
+
+</beans>