prototype beans receive independent collection/array even when based on single value (SPR-5512)
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user