From b8a8ceae91f5de2ebecf9c0d9cb42e87edb1429b Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 15 Dec 2008 18:49:11 +0000 Subject: [PATCH] moving unit tests from .testsuite -> .context moved ContextSingletonBeanFactoryLocatorTests -> .context pulled SingletonBeanFactoryLocatorTests and friends into .context via externals for use by the above --- .../access/ContextSingletonBeanFactoryLocatorTests.java | 8 ++++---- .../access/ContextSingletonBeanFactoryLocatorTests.xml | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java (93%) rename org.springframework.testsuite/src/test/java/org/springframework/context/access/context.xml => org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.xml (100%) diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java similarity index 93% rename from org.springframework.testsuite/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java rename to org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java index 1a134904d40..7bc6e1c2e3c 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java +++ b/org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java @@ -47,7 +47,7 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor public void testBasicFunctionality() { ContextSingletonBeanFactoryLocator facLoc = new ContextSingletonBeanFactoryLocator( "classpath*:" + ClassUtils.addResourcePathToPackagePath( - getClass(), "context.xml")); + getClass(), "ContextSingletonBeanFactoryLocatorTests.xml")); basicFunctionalityTest(facLoc); @@ -73,18 +73,18 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor // Try with and without 'classpath*:' prefix, and with 'classpath:' prefix. BeanFactoryLocator facLoc = ContextSingletonBeanFactoryLocator.getInstance( ClassUtils.addResourcePathToPackagePath( - getClass(), "context.xml")); + getClass(), "ContextSingletonBeanFactoryLocatorTests.xml")); getInstanceTest1(facLoc); facLoc = ContextSingletonBeanFactoryLocator.getInstance( "classpath*:" + ClassUtils.addResourcePathToPackagePath( - getClass(), "context.xml")); + 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(), "context.xml")); + getClass(), "ContextSingletonBeanFactoryLocatorTests.xml")); getInstanceTest3(facLoc); } diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/access/context.xml b/org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/context/access/context.xml rename to org.springframework.context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.xml