diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/HasMap.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/HasMap.java new file mode 100644 index 00000000000..3bac49498b5 --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/HasMap.java @@ -0,0 +1,94 @@ +/* + * 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; + +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +/** + * Bean exposing a map. Used for bean factory tests. + * + * @author Rod Johnson + * @since 05.06.2003 + */ +public class HasMap { + + private Map map; + + private Set set; + + private Properties props; + + private Object[] objectArray; + + private Class[] classArray; + + private Integer[] intArray; + + private HasMap() { + } + + public Map getMap() { + return map; + } + + public void setMap(Map map) { + this.map = map; + } + + public Set getSet() { + return set; + } + + public void setSet(Set set) { + this.set = set; + } + + public Properties getProps() { + return props; + } + + public void setProps(Properties props) { + this.props = props; + } + + public Object[] getObjectArray() { + return objectArray; + } + + public void setObjectArray(Object[] objectArray) { + this.objectArray = objectArray; + } + + public Class[] getClassArray() { + return classArray; + } + + public void setClassArray(Class[] classArray) { + this.classArray = classArray; + } + + public Integer[] getIntegerArray() { + return intArray; + } + + public void setIntegerArray(Integer[] is) { + intArray = is; + } + +} diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MapAndSet.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MapAndSet.java new file mode 100644 index 00000000000..1d059ea569d --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MapAndSet.java @@ -0,0 +1,39 @@ +/* + * Copyright 2002-2006 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.xml; + +import java.util.Map; +import java.util.Set; + +/** + * @author Chris Beams + */ +public class MapAndSet { + + private Object obj; + + public MapAndSet(Map map) { + this.obj = map; + } + + public MapAndSet(Set set) { + this.obj = set; + } + + public Object getObject() { + return obj; + } +} diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java new file mode 100644 index 00000000000..8ed5f2517ec --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java @@ -0,0 +1,41 @@ +/* + * Copyright 2002-2006 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.xml; + +import java.util.Collection; + +/** + * Bean that exposes a simple property that can be set + * to a mix of references and individual values. + * + * @author Rod Johnson + * @since 27.05.2003 + */ +public class MixedCollectionBean { + + private Collection jumble; + + + public void setJumble(Collection jumble) { + this.jumble = jumble; + } + + public Collection getJumble() { + return jumble; + } + +} diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/collections.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/collections.xml new file mode 100644 index 00000000000..f2fd356460d --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/collections.xml @@ -0,0 +1,374 @@ + + + + + Jenny + 30 + + + + + + + + + Simple bean, without any collections. + + + The name of the user + David + + 27 + + + + Rod + 32 + + List of Rod's friends + + + + + + + + + Jenny + 30 + + + + + + + + David + 27 + + + + Rod + 32 + + + + + + + + + + + loner + 26 + + + My List + + + + + + + + + + literal + + + + + + + + + + + literal + + + + + + + + + verbose + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bar + + + + + zero + + bar + + + + + ba + + + + + + + bar + + + + + + + + + + + + + + + + + + + bar + + + + + + + + + + + + + + + + + + bar + TWO + + + + + + + + + + + + + + + + + one + + + + + + + + + java.lang.String + java.lang.Exception + + + + + + + + 0 + 1 + 2 + + + + + + + + bar + jenny + + + + java.util.LinkedList + + + + + + + bar + jenny + + + + java.util.LinkedList + + + true + + + + + + + bar + jenny + + + + java.util.TreeSet + + + + + + + bar + jenny + + + + java.util.TreeSet + + + true + + + + + + + bar + jenny + + + + java.util.TreeMap + + + + + + + bar + jenny + + + + java.util.TreeMap + + + true + + + + + + + My Map + + + + + + + + + + + My Set + + + + + diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/parent.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/parent.xml new file mode 100644 index 00000000000..6f5675fffd6 --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/parent.xml @@ -0,0 +1,23 @@ + + + + + + + parent + 1 + + + + parent + 1 + + + + parent + 2 + + + + + diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java b/org.springframework.context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java rename to org.springframework.context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java similarity index 98% rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java index a7d90eed51f..745fe8b3e49 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java +++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java @@ -56,7 +56,7 @@ public class ClassPathBeanDefinitionScannerTests { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(10, beanCount); + assertEquals(9, beanCount); assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("stubFooDao")); @@ -73,7 +73,7 @@ public class ClassPathBeanDefinitionScannerTests { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(10, beanCount); + assertEquals(9, beanCount); scanner.scan(BASE_PACKAGE); assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("fooServiceImpl")); @@ -191,7 +191,7 @@ public class ClassPathBeanDefinitionScannerTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, false); scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class)); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(5, beanCount); + assertEquals(4, beanCount); assertTrue(context.containsBean("messageBean")); assertTrue(context.containsBean(AnnotationConfigUtils.AUTOWIRED_ANNOTATION_PROCESSOR_BEAN_NAME)); assertTrue(context.containsBean(AnnotationConfigUtils.COMMON_ANNOTATION_PROCESSOR_BEAN_NAME)); @@ -204,7 +204,7 @@ public class ClassPathBeanDefinitionScannerTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, false); scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class)); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(5, beanCount); + assertEquals(4, beanCount); assertTrue(context.containsBean("messageBean")); assertFalse(context.containsBean("serviceInvocationCounter")); assertFalse(context.containsBean("fooServiceImpl")); @@ -222,7 +222,7 @@ public class ClassPathBeanDefinitionScannerTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, true); scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class)); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(11, beanCount); + assertEquals(10, beanCount); assertTrue(context.containsBean("messageBean")); assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("fooServiceImpl")); @@ -240,7 +240,7 @@ public class ClassPathBeanDefinitionScannerTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, true); scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class)); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(9, beanCount); + assertEquals(8, beanCount); assertFalse(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("stubFooDao")); @@ -257,7 +257,7 @@ public class ClassPathBeanDefinitionScannerTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context, true); scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class)); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(9, beanCount); + assertEquals(8, beanCount); assertFalse(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("stubFooDao")); @@ -293,7 +293,7 @@ public class ClassPathBeanDefinitionScannerTests { scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class)); scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class)); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(8, beanCount); + assertEquals(7, beanCount); assertFalse(context.containsBean("fooServiceImpl")); assertFalse(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("stubFooDao")); @@ -310,7 +310,7 @@ public class ClassPathBeanDefinitionScannerTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setBeanNameGenerator(new TestBeanNameGenerator()); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(10, beanCount); + assertEquals(9, beanCount); assertFalse(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("fooService")); assertTrue(context.containsBean("serviceInvocationCounter")); @@ -329,7 +329,7 @@ public class ClassPathBeanDefinitionScannerTests { GenericApplicationContext multiPackageContext = new GenericApplicationContext(); ClassPathBeanDefinitionScanner multiPackageScanner = new ClassPathBeanDefinitionScanner(multiPackageContext); int singlePackageBeanCount = singlePackageScanner.scan(BASE_PACKAGE); - assertEquals(10, singlePackageBeanCount); + assertEquals(9, singlePackageBeanCount); multiPackageScanner.scan(BASE_PACKAGE, "org.springframework.dao.annotation"); // assertTrue(multiPackageBeanCount > singlePackageBeanCount); } @@ -339,7 +339,7 @@ public class ClassPathBeanDefinitionScannerTests { GenericApplicationContext context = new GenericApplicationContext(); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(10, beanCount); + assertEquals(9, beanCount); assertEquals(beanCount, context.getBeanDefinitionCount()); int addedBeanCount = scanner.scan("org.springframework.aop.aspectj.annotation"); assertEquals(beanCount + addedBeanCount, context.getBeanDefinitionCount()); @@ -352,7 +352,7 @@ public class ClassPathBeanDefinitionScannerTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setBeanNameGenerator(new TestBeanNameGenerator()); int beanCount = scanner.scan(BASE_PACKAGE); - assertEquals(10, beanCount); + assertEquals(9, beanCount); context.refresh(); FooServiceImpl fooService = (FooServiceImpl) context.getBean("fooService"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/DoubleScanTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java similarity index 90% rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/DoubleScanTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java index e69956009e1..143ce5ffa45 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/DoubleScanTests.java +++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java @@ -18,12 +18,13 @@ package org.springframework.context.annotation; /** * @author Juergen Hoeller + * @author Chris Beams */ public class DoubleScanTests extends SimpleScanTests { @Override protected String[] getConfigLocations() { - return new String[] {"org/springframework/context/annotation/doubleScanTests.xml"}; + return new String[] {"doubleScanTests.xml"}; } } \ No newline at end of file diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java similarity index 62% rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java index c40a6587376..2b31f74f61e 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java +++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java @@ -16,7 +16,10 @@ package org.springframework.context.annotation; -import org.springframework.test.AbstractDependencyInjectionSpringContextTests; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.springframework.context.support.ClassPathXmlApplicationContext; import example.scannable.FooService; import example.scannable.ServiceInvocationCounter; @@ -24,21 +27,15 @@ import example.scannable.ServiceInvocationCounter; /** * @author Mark Fisher */ -public class SimpleConfigTests extends AbstractDependencyInjectionSpringContextTests { - - private FooService fooService; +public class SimpleConfigTests { - private ServiceInvocationCounter serviceInvocationCounter; - - public void setFooService(FooService fooService) { - this.fooService = fooService; - } - - public void setServiceInvocationCounter(ServiceInvocationCounter serviceInvocationCounter) { - this.serviceInvocationCounter = serviceInvocationCounter; - } - + @Test public void testFooService() throws Exception { + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(getConfigLocations(), getClass()); + + FooService fooService = (FooService) ctx.getBean("fooServiceImpl"); + ServiceInvocationCounter serviceInvocationCounter = (ServiceInvocationCounter) ctx.getBean("serviceInvocationCounter"); + String value = fooService.foo(1); assertEquals("bar", value); @@ -47,10 +44,10 @@ public class SimpleConfigTests extends AbstractDependencyInjectionSpringContextT fooService.foo(1); assertEquals(2, serviceInvocationCounter.getCount()); } - - @Override - protected String[] getConfigLocations() { - return new String[] {"org/springframework/context/annotation/simpleConfigTests.xml"}; + + public String[] getConfigLocations() { + return new String[] {"simpleConfigTests.xml"}; } + } diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/SimpleScanTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java similarity index 67% rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/SimpleScanTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java index e7d4769a9c5..d0bb3a8c594 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/SimpleScanTests.java +++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java @@ -16,7 +16,10 @@ package org.springframework.context.annotation; -import org.springframework.test.AbstractDependencyInjectionSpringContextTests; +import static org.junit.Assert.*; + +import org.junit.Test; +import org.springframework.context.support.ClassPathXmlApplicationContext; import example.scannable.FooService; import example.scannable.ServiceInvocationCounter; @@ -24,30 +27,21 @@ import example.scannable.ServiceInvocationCounter; /** * @author Mark Fisher * @author Juergen Hoeller + * @author Chris Beams */ -public class SimpleScanTests extends AbstractDependencyInjectionSpringContextTests { +public class SimpleScanTests { - private FooService fooService; - - private ServiceInvocationCounter serviceInvocationCounter; - - - public void setFooService(FooService fooService) { - this.fooService = fooService; - } - - public void setServiceInvocationCounter(ServiceInvocationCounter serviceInvocationCounter) { - this.serviceInvocationCounter = serviceInvocationCounter; - } - - - @Override protected String[] getConfigLocations() { - return new String[] {"org/springframework/context/annotation/simpleScanTests.xml"}; + return new String[] {"simpleScanTests.xml"}; } - + @Test public void testFooService() throws Exception { + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(getConfigLocations(), getClass()); + + FooService fooService = (FooService) ctx.getBean("fooServiceImpl"); + ServiceInvocationCounter serviceInvocationCounter = (ServiceInvocationCounter) ctx.getBean("serviceInvocationCounter"); + assertEquals(0, serviceInvocationCounter.getCount()); assertTrue(fooService.isInitCalled()); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/doubleScanTests.xml b/org.springframework.context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/doubleScanTests.xml rename to org.springframework.context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml b/org.springframework.context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml similarity index 82% rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml rename to org.springframework.context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml index 0425e4fe316..d3916174f18 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml +++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml @@ -11,9 +11,9 @@ - + - + diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation/simpleScanTests.xml b/org.springframework.context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation/simpleScanTests.xml rename to org.springframework.context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java b/org.springframework.context/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/context/annotation3/StubFooDao.java b/org.springframework.context/src/test/java/org/springframework/context/annotation3/StubFooDao.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/context/annotation3/StubFooDao.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation3/StubFooDao.java