From a0bf1b4adea6b4b3ea3cc9bfaaca8c5b4fa9a1ae Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 24 Dec 2008 20:29:14 +0000 Subject: [PATCH] polishing .beans tests --- ...ngletonBeanFactoryLocatorTests-beans1.xml} | 0 ...ngletonBeanFactoryLocatorTests-beans2.xml} | 0 ...SingletonBeanFactoryLocatorTests-ref1.xml} | 4 +- .../SingletonBeanFactoryLocatorTests.java | 68 +++++++++++++++-- .../beans/factory/access/TestBean.java | 75 ------------------- 5 files changed, 64 insertions(+), 83 deletions(-) rename org.springframework.beans/src/test/java/org/springframework/beans/factory/access/{beans1.xml => SingletonBeanFactoryLocatorTests-beans1.xml} (100%) rename org.springframework.beans/src/test/java/org/springframework/beans/factory/access/{beans2.xml => SingletonBeanFactoryLocatorTests-beans2.xml} (100%) rename org.springframework.beans/src/test/java/org/springframework/beans/factory/access/{ref1.xml => SingletonBeanFactoryLocatorTests-ref1.xml} (92%) delete mode 100644 org.springframework.beans/src/test/java/org/springframework/beans/factory/access/TestBean.java diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/beans1.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml similarity index 100% rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/access/beans1.xml rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/beans2.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml similarity index 100% rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/access/beans2.xml rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-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/SingletonBeanFactoryLocatorTests-ref1.xml similarity index 92% rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/access/ref1.xml rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml index 2dde7a31b37..17721213c89 100644 --- 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/SingletonBeanFactoryLocatorTests-ref1.xml @@ -11,7 +11,7 @@ - + diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java index 9bdca2165cd..cae50e6ec64 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * 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. @@ -18,6 +18,8 @@ package org.springframework.beans.factory.access; import static org.junit.Assert.assertTrue; +import java.util.List; + import org.junit.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.util.ClassUtils; @@ -26,12 +28,14 @@ import org.springframework.util.ClassUtils; * @author Colin Sampaleanu * @author Chris Beams */ -public class SingletonBeanFactoryLocatorTests { +public final class SingletonBeanFactoryLocatorTests { + private static final Class CLASS = SingletonBeanFactoryLocatorTests.class; + private static final String REF1_XML = CLASS.getSimpleName() + "-ref1.xml"; @Test public void testBasicFunctionality() { SingletonBeanFactoryLocator facLoc = new SingletonBeanFactoryLocator( - "classpath*:" + ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml")); + "classpath*:" + ClassUtils.addResourcePathToPackagePath(CLASS, REF1_XML)); basicFunctionalityTest(facLoc); } @@ -73,16 +77,16 @@ public class SingletonBeanFactoryLocatorTests { public void testGetInstance() { // Try with and without 'classpath*:' prefix, and with 'classpath:' prefix. BeanFactoryLocator facLoc = SingletonBeanFactoryLocator.getInstance( - ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml")); + ClassUtils.addResourcePathToPackagePath(CLASS, REF1_XML)); getInstanceTest1(facLoc); facLoc = SingletonBeanFactoryLocator.getInstance( - "classpath*:/" + ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml")); + "classpath*:/" + ClassUtils.addResourcePathToPackagePath(CLASS, REF1_XML)); getInstanceTest2(facLoc); // This will actually get another locator instance, as the key is the resource name. facLoc = SingletonBeanFactoryLocator.getInstance( - "classpath:" + ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml")); + "classpath:" + ClassUtils.addResourcePathToPackagePath(CLASS, REF1_XML)); getInstanceTest3(facLoc); } @@ -180,3 +184,55 @@ public class SingletonBeanFactoryLocatorTests { } } + + +class TestBean { + + private String name; + + private List list; + + private Object objRef; + + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return Returns the list. + */ + public List getList() { + return list; + } + + /** + * @param list The list to set. + */ + public void setList(List list) { + this.list = list; + } + + /** + * @return Returns the object. + */ + public Object getObjRef() { + return objRef; + } + + /** + * @param object The object to set. + */ + public void setObjRef(Object object) { + this.objRef = object; + } +} diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/TestBean.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/TestBean.java deleted file mode 100644 index eaf1d5ec0b0..00000000000 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/access/TestBean.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2002-2005 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.beans.factory.access; - -import java.util.List; - -/** - * Scrap bean for use in tests. - * - * @author Colin Sampaleanu - */ -public class TestBean { - - private String name; - - private List list; - - private Object objRef; - - /** - * @return Returns the name. - */ - public String getName() { - return name; - } - - /** - * @param name The name to set. - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return Returns the list. - */ - public List getList() { - return list; - } - - /** - * @param list The list to set. - */ - public void setList(List list) { - this.list = list; - } - - /** - * @return Returns the object. - */ - public Object getObjRef() { - return objRef; - } - - /** - * @param object The object to set. - */ - public void setObjRef(Object object) { - this.objRef = object; - } -}