Author: julien(a)jboss.com Date: 2008-01-24 16:27:57 -0500 (Thu, 24 Jan 2008) New Revision: 9599 Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MultiValuedPropertyMap.java modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/MultiValuedPropertyMapTestCase.java Log: bug fixes in MultiValuedPrropertyMap with test cases Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MultiValuedPropertyMap.java =================================================================== --- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MultiValuedPropertyMap.java 2008-01-24 19:32:08 UTC (rev 9598) +++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MultiValuedPropertyMap.java 2008-01-24 21:27:57 UTC (rev 9599) @@ -200,22 +200,31 @@ } // - for (Map.Entry<String, LinkedList<T>> entry : appended.content.entrySet()) + if (appended.content != null) { - String name = entry.getKey(); + for (Map.Entry<String, LinkedList<T>> entry : appended.content.entrySet()) + { + String name = entry.getKey(); - // - LinkedList<T> values = content.get(name); + // + if (content == null) + { + content = new HashMap<String, LinkedList<T>>(appended.content.size()); + } - // - if (values != null) - { - values.addAll(entry.getValue()); + // + LinkedList<T> values = content.get(name); + + // + if (values != null) + { + values.addAll(entry.getValue()); + } + else + { + content.put(name, new LinkedList<T>(entry.getValue())); + } } - else - { - content.put(name, new LinkedList<T>(entry.getValue())); - } } } } Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/MultiValuedPropertyMapTestCase.java =================================================================== --- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/MultiValuedPropertyMapTestCase.java 2008-01-24 19:32:08 UTC (rev 9598) +++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/MultiValuedPropertyMapTestCase.java 2008-01-24 21:27:57 UTC (rev 9599) @@ -119,9 +119,35 @@ } } - public void testAppend() + public void testAppend1() { MultiValuedPropertyMap<String> props = new MultiValuedPropertyMap<String>(); + MultiValuedPropertyMap<String> appended = new MultiValuedPropertyMap<String>(); + appended.setProperty("foo", "bar"); + props.append(appended); + + // + assertEquals(Tools.toSet("foo"), props.getPropertyNames()); + assertEquals(Tools.toList("bar"), props.getPropertyValues("foo")); + } + + public void testAppend2() + { + MultiValuedPropertyMap<String> props = new MultiValuedPropertyMap<String>(); + props.setProperty("foo", "bar"); + + // + MultiValuedPropertyMap<String> appended = new MultiValuedPropertyMap<String>(); + props.append(appended); + + // + assertEquals(Tools.toSet("foo"), props.getPropertyNames()); + assertEquals(Tools.toList("bar"), props.getPropertyValues("foo")); + } + + public void testAppend3() + { + MultiValuedPropertyMap<String> props = new MultiValuedPropertyMap<String>(); props.setProperty("foo", "foo1"); props.setProperty("bar", "bar1"); props.addProperty("bar", "bar2");