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 147184f2328..158b3e0d1ee 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 a376eac4908..8e586b2ae9e 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 00000000000..813049d1a59
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 00000000000..0bd9225e535
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+ Rob Harrop
+ Rod Johnson
+
+
+
+
+
+
+
+ Juergen Hoeller
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Rob Harrop
+
+
+
+
+
+
+
+ Sally Greenwood
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sall
+ Kerry
+
+
+
+
+
+
+
+ Eva
+ Sally
+
+
+
+
+
+
+
+
+ Rob Harrop
+ Rod Johnson
+
+
+
+
+
+
+
+ Juergen Hoeller
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Rob Harrop
+
+
+
+
+
+
+
+ Sally Greenwood
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sall
+ Kerry
+
+
+
+
+
+
+
+ Eva
+ Sally
+
+
+
+
+
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 00000000000..584063fde10
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+ 1
+ 2
+ 3
+
+
+
+
+ 1
+ 2
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file