From dcaf024e76aec457d38111684d10d2601c830b4f Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 29 Oct 2008 18:03:15 +0000
Subject: [PATCH] Moved tests from testsuite to beans

---
 .../beans/factory/CountingFactory.java        |   4 +-
 .../xml/AutowireWithExclusionTests.java       |  15 +-
 .../factory/xml/BeanNameGenerationTests.java  |   0
 .../factory/xml/CollectionMergingTests.java   |   0
 .../xml/CollectionsWithDefaultTypesTests.java |   0
 .../beans/factory/xml/GeneratedNameBean.java  |   0
 .../beans/factory/xml/beanNameGeneration.xml  |  18 ++
 .../beans/factory/xml/collectionMerging.xml   | 205 ++++++++++++++++++
 .../xml/collectionsWithDefaultTypes.xml       |  61 ++++++
 9 files changed, 294 insertions(+), 9 deletions(-)
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java (100%)
 create mode 100644 org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
 create mode 100644 org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
 create mode 100644 org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml

diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/CountingFactory.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/CountingFactory.java
index 147184f232..158b3e0d1e 100644
--- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/CountingFactory.java
+++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/CountingFactory.java
@@ -22,7 +22,7 @@ import org.springframework.beans.TestBean;
  * @author Juergen Hoeller
  */
 public class CountingFactory implements FactoryBean {
-	
+
 	private static int factoryBeanInstanceCount = 0;
 
 
@@ -61,4 +61,4 @@ public class CountingFactory implements FactoryBean {
 		return true;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
index a376eac490..8e586b2ae9 100644
--- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
+++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
@@ -17,6 +17,7 @@
 package org.springframework.beans.factory.xml;
 
 import junit.framework.TestCase;
+import junit.framework.Assert;
 
 import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.CountingFactory;
@@ -40,7 +41,7 @@ public class AutowireWithExclusionTests extends TestCase {
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		TestBean sally = (TestBean) beanFactory.getBean("sally");
 		assertEquals(sally, rob.getSpouse());
-		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithExclusion() throws Exception {
@@ -49,7 +50,7 @@ public class AutowireWithExclusionTests extends TestCase {
 		beanFactory.preInstantiateSingletons();
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithExclusionInParentFactory() throws Exception {
@@ -62,7 +63,7 @@ public class AutowireWithExclusionTests extends TestCase {
 		child.registerBeanDefinition("rob2", robDef);
 		TestBean rob = (TestBean) child.getBean("rob2");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithPrimaryInParentFactory() throws Exception {
@@ -79,7 +80,7 @@ public class AutowireWithExclusionTests extends TestCase {
 		child.registerBeanDefinition("props3", propsDef);
 		TestBean rob = (TestBean) child.getBean("rob2");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithPrimaryOverridingParentFactory() throws Exception {
@@ -96,7 +97,7 @@ public class AutowireWithExclusionTests extends TestCase {
 		child.registerBeanDefinition("props3", propsDef);
 		TestBean rob = (TestBean) child.getBean("rob2");
 		assertEquals("props3", rob.getSomeProperties().getProperty("name"));
-		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithInclusion() throws Exception {
@@ -105,7 +106,7 @@ public class AutowireWithExclusionTests extends TestCase {
 		beanFactory.preInstantiateSingletons();
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithSelectiveInclusion() throws Exception {
@@ -114,7 +115,7 @@ public class AutowireWithExclusionTests extends TestCase {
 		beanFactory.preInstantiateSingletons();
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testConstructorAutowireWithAutoSelfExclusion() throws Exception {
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
new file mode 100644
index 0000000000..813049d1a5
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
@@ -0,0 +1,18 @@
+<?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 class="org.springframework.beans.factory.xml.GeneratedNameBean">
+		<property name="child">
+			<bean class="org.springframework.beans.factory.xml.GeneratedNameBean"/>
+		</property>
+	</bean>
+
+	<bean class="org.springframework.beans.factory.xml.GeneratedNameBean">
+		<property name="child">
+			<bean class="org.springframework.beans.factory.xml.GeneratedNameBean"/>
+		</property>
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
new file mode 100644
index 0000000000..0bd9225e53
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
@@ -0,0 +1,205 @@
+<?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="parentWithList" class="org.springframework.beans.TestBean">
+		<property name="someList">
+			<list>
+				<value>Rob Harrop</value>
+				<value>Rod Johnson</value>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="childWithList" parent="parentWithList">
+		<property name="someList">
+			<list merge="true">
+				<value>Juergen Hoeller</value>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="childWithListOfRefs" parent="parentWithList">
+		<property name="someList">
+			<list merge="true">
+				<bean class="org.springframework.beans.TestBean"/>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="parentWithSet" class="org.springframework.beans.TestBean">
+		<property name="someSet">
+			<set>
+				<value>Rob Harrop</value>
+			</set>
+		</property>
+	</bean>
+
+	<bean id="childWithSet" parent="parentWithSet">
+		<property name="someSet">
+			<set merge="true">
+				<value>Sally Greenwood</value>
+			</set>
+		</property>
+	</bean>
+
+	<bean id="childWithSetOfRefs" parent="parentWithSet">
+		<property name="someSet">
+			<set merge="true">
+				<bean class="org.springframework.beans.TestBean">
+					<property name="name" value="Sally"/>
+				</bean>
+			</set>
+		</property>
+	</bean>
+
+	<bean id="parentWithMap" class="org.springframework.beans.TestBean">
+		<property name="someMap">
+			<map>
+				<entry key="Rob" value="Sall"/>
+				<entry key="Juergen" value="Eva"/>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="childWithMap" parent="parentWithMap">
+		<property name="someMap">
+			<map merge="true">
+				<entry key="Rod" value="Kerry"/>
+				<entry key="Rob" value="Sally"/>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="childWithMapOfRefs" parent="parentWithMap">
+		<property name="someMap">
+			<map merge="true">
+				<entry key="Rob">
+					<bean class="org.springframework.beans.TestBean">
+						<property name="name" value="Sally"/>
+					</bean>
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="parentWithProps" class="org.springframework.beans.TestBean">
+		<property name="someProperties">
+			<props>
+				<prop key="Rob">Sall</prop>
+				<prop key="Rod">Kerry</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="childWithProps" parent="parentWithProps">
+		<property name="someProperties">
+			<props merge="true">
+				<prop key="Juergen">Eva</prop>
+				<prop key="Rob">Sally</prop>
+			</props>
+		</property>
+	</bean>
+
+
+	<bean id="parentWithListInConstructor" class="org.springframework.beans.TestBean">
+		<constructor-arg index="0">
+			<list>
+				<value>Rob Harrop</value>
+				<value>Rod Johnson</value>
+			</list>
+		</constructor-arg>
+	</bean>
+
+	<bean id="childWithListInConstructor" parent="parentWithListInConstructor">
+		<constructor-arg index="0">
+			<list merge="true">
+				<value>Juergen Hoeller</value>
+			</list>
+		</constructor-arg>
+	</bean>
+
+	<bean id="childWithListOfRefsInConstructor" parent="parentWithListInConstructor">
+		<constructor-arg index="0">
+			<list merge="true">
+				<bean class="org.springframework.beans.TestBean"/>
+			</list>
+		</constructor-arg>
+	</bean>
+
+	<bean id="parentWithSetInConstructor" class="org.springframework.beans.TestBean">
+		<constructor-arg index="0">
+			<set>
+				<value>Rob Harrop</value>
+			</set>
+		</constructor-arg>
+	</bean>
+
+	<bean id="childWithSetInConstructor" parent="parentWithSetInConstructor">
+		<constructor-arg index="0">
+			<set merge="true">
+				<value>Sally Greenwood</value>
+			</set>
+		</constructor-arg>
+	</bean>
+
+	<bean id="childWithSetOfRefsInConstructor" parent="parentWithSetInConstructor">
+		<constructor-arg index="0">
+			<set merge="true">
+				<bean class="org.springframework.beans.TestBean">
+					<property name="name" value="Sally"/>
+				</bean>
+			</set>
+		</constructor-arg>
+	</bean>
+
+	<bean id="parentWithMapInConstructor" class="org.springframework.beans.TestBean">
+		<constructor-arg index="0">
+			<map>
+				<entry key="Rob" value="Sall"/>
+				<entry key="Juergen" value="Eva"/>
+			</map>
+		</constructor-arg>
+	</bean>
+
+	<bean id="childWithMapInConstructor" parent="parentWithMapInConstructor">
+		<constructor-arg index="0">
+			<map merge="true">
+				<entry key="Rod" value="Kerry"/>
+				<entry key="Rob" value="Sally"/>
+			</map>
+		</constructor-arg>
+	</bean>
+
+	<bean id="childWithMapOfRefsInConstructor" parent="parentWithMapInConstructor">
+		<constructor-arg index="0">
+			<map merge="true">
+				<entry key="Rob">
+					<bean class="org.springframework.beans.TestBean">
+						<property name="name" value="Sally"/>
+					</bean>
+				</entry>
+			</map>
+		</constructor-arg>
+	</bean>
+
+	<bean id="parentWithPropsInConstructor" class="org.springframework.beans.TestBean">
+		<constructor-arg index="0">
+			<props>
+				<prop key="Rob">Sall</prop>
+				<prop key="Rod">Kerry</prop>
+			</props>
+		</constructor-arg>
+	</bean>
+
+	<bean id="childWithPropsInConstructor" parent="parentWithPropsInConstructor">
+		<constructor-arg index="0">
+			<props merge="true">
+				<prop key="Juergen">Eva</prop>
+				<prop key="Rob">Sally</prop>
+			</props>
+		</constructor-arg>
+	</bean>
+
+</beans>
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
new file mode 100644
index 0000000000..584063fde1
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
@@ -0,0 +1,61 @@
+<?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="testBean" class="org.springframework.beans.TestBean">
+		<property name="someList">
+			<list value-type="java.lang.Integer">
+				<value>1</value>
+				<value>2</value>
+				<value>3</value>
+			</list>
+		</property>
+		<property name="someSet">
+			<set value-type="java.lang.Integer">
+				<value>1</value>
+				<value>2</value>
+				<value>3</value>
+			</set>
+		</property>
+		<property name="someMap">
+			<map key-type="java.lang.Integer" value-type="java.lang.Boolean">
+				<entry key="1" value="true"/>
+				<entry key="2" value="false"/>
+				<entry key="3" value="false"/>
+				<entry key="4" value="true"/>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="testBean2" class="org.springframework.beans.TestBean">
+		<property name="someMap">
+			<map key-type="java.lang.Integer" value-type="java.lang.Boolean">
+				<entry>
+					<key>
+						<value>1</value>
+					</key>
+					<value>true</value>
+				</entry>
+				<entry>
+					<key>
+						<value>2</value>
+					</key>
+					<value>false</value>
+				</entry>
+				<entry>
+					<key>
+						<value>3</value>
+					</key>
+					<value>false</value>
+				</entry>
+				<entry>
+					<key>
+						<value>4</value>
+					</key>
+					<value>true</value>
+				</entry>
+			</map>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file