From f7813b48e1294b008dec166293544fadbab2e8b2 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Mon, 15 Dec 2008 18:37:33 +0000
Subject: [PATCH] moving unit tests from .testsuite -> .beans moving and
 prepping to move SingletonBeanFactoryLocatorTests and
 ContextSingletonBeanFactoryLocatorTests to their respective .beans and
 .context packages

---
 .../SingletonBeanFactoryLocatorTests.java     |  0
 .../beans/factory/access/TestBean.java        |  0
 .../beans/factory/access/beans1.xml           |  0
 .../beans/factory/access/beans2.xml           |  0
 .../beans/factory/access/ref1.xml             | 28 +++++++++++++++++++
 ...ntextSingletonBeanFactoryLocatorTests.java | 10 +++----
 .../ref1.xml => context/access/context.xml}   |  3 +-
 7 files changed, 33 insertions(+), 8 deletions(-)
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/access/TestBean.java (100%)
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/access/beans1.xml (100%)
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/access/beans2.xml (100%)
 create mode 100644 org.springframework.beans/src/test/java/org/springframework/beans/factory/access/ref1.xml
 rename org.springframework.testsuite/src/test/java/org/springframework/{beans/factory/access/ref1.xml => context/access/context.xml} (92%)

diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/TestBean.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/TestBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/TestBean.java
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/access/TestBean.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/beans1.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/beans1.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/beans1.xml
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/access/beans1.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/beans2.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/beans2.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/beans2.xml
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/access/beans2.xml
diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/ref1.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/ref1.xml
new file mode 100644
index 00000000000..2dde7a31b37
--- /dev/null
+++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/ref1.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<!-- We are only using one definition file for the purposes of this test, since we do not have multiple
+	classloaders available in the environment to allow combining multiple files of the same name, but
+	of course the contents within could be spread out across multiple files of the same name withing
+	different jars -->
+
+<beans>
+
+  <!-- this definition could be inside one beanRefFactory.xml file -->
+  <bean id="a.qualified.name.of.some.sort"
+      class="org.springframework.beans.factory.xml.XmlBeanFactory">
+    <constructor-arg value="org/springframework/beans/factory/access/beans1.xml"/>
+  </bean>
+
+  <!-- while the following two could be inside another, also on the classpath,
+	perhaps coming from another component jar -->
+
+  <bean id="another.qualified.name"
+      class="org.springframework.beans.factory.xml.XmlBeanFactory">
+    <constructor-arg value="org/springframework/beans/factory/access/beans1.xml"/>
+    <constructor-arg ref="a.qualified.name.of.some.sort"/> <!-- parent bean factory -->
+  </bean>
+
+  <alias name="another.qualified.name" alias="a.qualified.name.which.is.an.alias"/>
+
+</beans>
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/org.springframework.testsuite/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
index d9651330450..1a134904d40 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
+++ b/org.springframework.testsuite/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
@@ -45,11 +45,9 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor
 
 	@Test
 	public void testBasicFunctionality() {
-		// Just use definition file from the SingletonBeanFactoryLocator test,
-		// since it is completely valid.
 		ContextSingletonBeanFactoryLocator facLoc = new ContextSingletonBeanFactoryLocator(
 				"classpath*:" + ClassUtils.addResourcePathToPackagePath(
-				SingletonBeanFactoryLocatorTests.class, "ref1.xml"));
+				getClass(), "context.xml"));
 		
 		basicFunctionalityTest(facLoc);
 
@@ -75,18 +73,18 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor
 		// Try with and without 'classpath*:' prefix, and with 'classpath:' prefix.
 		BeanFactoryLocator facLoc = ContextSingletonBeanFactoryLocator.getInstance(
 				ClassUtils.addResourcePathToPackagePath(
-				SingletonBeanFactoryLocatorTests.class, "ref1.xml"));
+				getClass(), "context.xml"));
 		getInstanceTest1(facLoc);
 		
 		facLoc = ContextSingletonBeanFactoryLocator.getInstance(
 				"classpath*:" + ClassUtils.addResourcePathToPackagePath(
-				SingletonBeanFactoryLocatorTests.class, "ref1.xml"));
+				getClass(), "context.xml"));
 		getInstanceTest2(facLoc);
 
 		// This will actually get another locator instance, as the key is the resource name.
 		facLoc = ContextSingletonBeanFactoryLocator.getInstance(
 				"classpath:" + ClassUtils.addResourcePathToPackagePath(
-				SingletonBeanFactoryLocatorTests.class, "ref1.xml"));
+				getClass(), "context.xml"));
 		getInstanceTest3(facLoc);
 	}
 
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/ref1.xml b/org.springframework.testsuite/src/test/java/org/springframework/context/access/context.xml
similarity index 92%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/ref1.xml
rename to org.springframework.testsuite/src/test/java/org/springframework/context/access/context.xml
index a90e6063ed6..929f26c0d7f 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/access/ref1.xml
+++ b/org.springframework.testsuite/src/test/java/org/springframework/context/access/context.xml
@@ -16,10 +16,9 @@
 
   <!-- while the following two could be inside another, also on the classpath,
 	perhaps coming from another component jar -->
-
   <bean id="another.qualified.name"
       class="org.springframework.context.support.ClassPathXmlApplicationContext">
-    <property name="configLocations" value="org/springframework/beans/factory/access/beans2.xml"/>
+    <property name="configLocation" value="org/springframework/beans/factory/access/beans1.xml"/>
     <property name="parent" ref="a.qualified.name.of.some.sort"/>
   </bean>