[jbosscache-commits] JBoss Cache SVN: r4858 - in pojo/trunk/src/test/java/org/jboss/cache/pojo: test and 1 other directory.

Author: jason.greene(a)jboss.com Date: 2007-12-13 22:53:27 -0500 (Thu, 13 Dec 2007) New Revision: 4858 Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/test/Person.java Log: Fix regression Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java 2007-12-14 01:58:52 UTC (rev 4857) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java 2007-12-14 03:53:27 UTC (rev 4858) @@ -58,7 +58,12 @@ private Person createPerson(String id, String name, int age) { - Person p = new Person(); + return createPerson(id, name, age, null); + } + + private Person createPerson(String id, String name, int age, Map<String, String> finalMap) + { + Person p = new Person(finalMap); p.setName(name); p.setAge(age); Address add = new Address(); @@ -182,7 +187,7 @@ public void testFinalMap() throws Exception { log.info("testMap() ...."); - Person ben = createPerson("/person/test1", "Ben Wang", 40); + Person ben = createPerson("/person/test1", "Ben Wang", 40, new HashMap<String, String>()); assertEquals((Object) "Ben Wang", ben.getName()); Map<String, String> map = ben.getFinalMap(); if (!(map instanceof ClassProxy)) Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2007-12-14 01:58:52 UTC (rev 4857) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2007-12-14 03:53:27 UTC (rev 4858) @@ -4,7 +4,9 @@ import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertTrue; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,7 +51,12 @@ private Person createPerson(String id, String name, int age) { - Person p = new Person(); + return createPerson(id, name, age, null); + } + + private Person createPerson(String id, String name, int age, Map<String, String> map) + { + Person p = new Person(map); p.setName(name); p.setAge(age); cache.attach(id, p); @@ -115,7 +122,7 @@ public void testFinal() throws Exception { - Person jason = createPerson("/person/test1", "Jason Greene", 28); + Person jason = createPerson("/person/test1", "Jason Greene", 28, new HashMap<String, String>()); jason.getFinalMap().put("test1", "testa"); jason.getFinalMap().put("test2", "testb"); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/test/Person.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/test/Person.java 2007-12-14 01:58:52 UTC (rev 4857) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/test/Person.java 2007-12-14 03:53:27 UTC (rev 4858) @@ -46,8 +46,13 @@ public Person() { - finalMap = new HashMap<String, String>(); + this(null); } + + public Person(Map<String, String> map) + { + finalMap = map; + } public String getName() {