Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prototype beans receive independent collection/array even when based on single value (SPR-5512)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-02-21 18:04:08 +00:00
parent 2de9e2a38d
commit dc1edccc56
4 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
View File

@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
import java.util.Arrays;
import junit.framework.TestCase;
import test.beans.CustomEnum;
@@ -158,6 +159,37 @@ public class UtilNamespaceHandlerTests extends TestCase {
Set innerSet = (Set) map.get("foo");
assertEquals(1, innerSet.size());
assertTrue(innerSet.contains("bar"));
TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedCollectionsBean");
assertEquals(list, bean2.getSomeList());
assertEquals(set, bean2.getSomeSet());
assertEquals(map, bean2.getSomeMap());
assertFalse(list == bean2.getSomeList());
assertFalse(set == bean2.getSomeSet());
assertFalse(map == bean2.getSomeMap());
}
public void testNestedShortcutCollections() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("nestedShortcutCollections");
assertEquals(1, bean.getStringArray().length);
assertEquals("fooStr", bean.getStringArray()[0]);
List list = bean.getSomeList();
assertEquals(1, list.size());
assertEquals("foo", list.get(0));
Set set = bean.getSomeSet();
assertEquals(1, set.size());
assertTrue(set.contains("bar"));
TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedShortcutCollections");
assertTrue(Arrays.equals(bean.getStringArray(), bean2.getStringArray()));
assertFalse(bean.getStringArray() == bean2.getStringArray());
assertEquals(list, bean2.getSomeList());
assertEquals(set, bean2.getSomeSet());
assertFalse(list == bean2.getSomeList());
assertFalse(set == bean2.getSomeSet());
}
public void testNestedInCollections() throws Exception {
@@ -175,6 +207,14 @@ public class UtilNamespaceHandlerTests extends TestCase {
Map map = bean.getSomeMap();
assertEquals(1, map.size());
assertEquals(CustomEnum.VALUE_1, map.get("min"));
TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedCustomTagBean");
assertEquals(list, bean2.getSomeList());
assertEquals(set, bean2.getSomeSet());
assertEquals(map, bean2.getSomeMap());
assertFalse(list == bean2.getSomeList());
assertFalse(set == bean2.getSomeSet());
assertFalse(map == bean2.getSomeMap());
}
public void testCircularCollections() throws Exception {

8
org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
View File

@@ -67,7 +67,7 @@
<value>Rob Harrop</value>
</util:set>
<bean id="nestedCollectionsBean" class="test.beans.TestBean">
<bean id="nestedCollectionsBean" class="test.beans.TestBean" scope="prototype">
<property name="someList">
<util:list>
<value>foo</value>
@@ -89,6 +89,12 @@
</property>
</bean>
<bean id="nestedShortcutCollections" class="test.beans.TestBean" scope="prototype">
<property name="stringArray" value="fooStr"/>
<property name="someList" value="foo"/>
<property name="someSet" value="bar"/>
</bean>
<bean id="nestedCustomTagBean" class="test.beans.TestBean" scope="prototype">
<property name="someList">
<list>