moving unit tests from .testsuite -> .context

moved ContextSingletonBeanFactoryLocatorTests -> .context
pulled SingletonBeanFactoryLocatorTests and friends into .context via externals for use by the above

org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.access;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.access.BeanFactoryLocator;
+import org.springframework.beans.factory.access.BeanFactoryReference;
+import org.springframework.beans.factory.access.SingletonBeanFactoryLocatorTests;
+import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.ClassUtils;
+
+/**
+ * @author Colin Sampaleanu
+ * @author Juergen Hoeller
+ * @author Chris Beams
+ */
+public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactoryLocatorTests {
+
+	@Test
+	public void testBaseBeanFactoryDefs() {
+		// Just test the base BeanFactory/AppContext defs we are going to work
+		// with in other tests.
+		new XmlBeanFactory(new ClassPathResource("/org/springframework/beans/factory/access/beans1.xml"));
+		new XmlBeanFactory(new ClassPathResource("/org/springframework/beans/factory/access/beans2.xml"));
+	}
+
+	@Test
+	public void testBasicFunctionality() {
+		ContextSingletonBeanFactoryLocator facLoc = new ContextSingletonBeanFactoryLocator(
+				"classpath*:" + ClassUtils.addResourcePathToPackagePath(
+				getClass(), "ContextSingletonBeanFactoryLocatorTests.xml"));
+		
+		basicFunctionalityTest(facLoc);
+
+		BeanFactoryReference bfr = facLoc.useBeanFactory("a.qualified.name.of.some.sort");
+		BeanFactory fac = bfr.getFactory();
+		assertTrue(fac instanceof ApplicationContext);
+		assertEquals("a.qualified.name.of.some.sort", ((ApplicationContext) fac).getId());
+		assertEquals("a.qualified.name.of.some.sort", ((ApplicationContext) fac).getDisplayName());
+		BeanFactoryReference bfr2 = facLoc.useBeanFactory("another.qualified.name");
+		BeanFactory fac2 = bfr2.getFactory();
+		assertEquals("another.qualified.name", ((ApplicationContext) fac2).getId());
+		assertEquals("another.qualified.name", ((ApplicationContext) fac2).getDisplayName());
+		assertTrue(fac2 instanceof ApplicationContext);
+	}
+
+	/**
+	 * This test can run multiple times, but due to static keyed lookup of the locators,
+	 * 2nd and subsequent calls will actuall get back same locator instance. This is not
+	 * really an issue, since the contained bean factories will still be loaded and released.
+	 */
+	@Test
+	public void testGetInstance() {
+		// Try with and without 'classpath*:' prefix, and with 'classpath:' prefix.
+		BeanFactoryLocator facLoc = ContextSingletonBeanFactoryLocator.getInstance(
+				ClassUtils.addResourcePathToPackagePath(
+				getClass(), "ContextSingletonBeanFactoryLocatorTests.xml"));
+		getInstanceTest1(facLoc);
+		
+		facLoc = ContextSingletonBeanFactoryLocator.getInstance(
+				"classpath*:" + ClassUtils.addResourcePathToPackagePath(
+				getClass(), "ContextSingletonBeanFactoryLocatorTests.xml"));
+		getInstanceTest2(facLoc);
+
+		// This will actually get another locator instance, as the key is the resource name.
+		facLoc = ContextSingletonBeanFactoryLocator.getInstance(
+				"classpath:" + ClassUtils.addResourcePathToPackagePath(
+				getClass(), "ContextSingletonBeanFactoryLocatorTests.xml"));
+		getInstanceTest3(facLoc);
+	}
+
+}

org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.xml

@@ -0,0 +1,27 @@
+<?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.context.support.ClassPathXmlApplicationContext">
+    <property name="configLocation" 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.context.support.ClassPathXmlApplicationContext">
+    <property name="configLocation" value="org/springframework/beans/factory/access/beans1.xml"/>
+    <property name="parent" ref="a.qualified.name.of.some.sort"/>
+  </bean>
+
+  <alias name="another.qualified.name" alias="a.qualified.name.which.is.an.alias"/>
+
+</beans>