[jboss-svn-commits] JBL Code SVN: r29525 - labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/test/java/uk/ac/ncl/sdia/a8905943/stm.

[jboss-svn-commits at lists.jboss.org]

Author: whitingjr
Date: 2009-10-01 13:01:12 -0400 (Thu, 01 Oct 2009)
New Revision: 29525

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/test/java/uk/ac/ncl/sdia/a8905943/stm/AbstractUnitT.java
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/test/java/uk/ac/ncl/sdia/a8905943/stm/TestUnitModelReplicatedMemory.java
Log:
Added xml JAXB classes for marshalling data.

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/test/java/uk/ac/ncl/sdia/a8905943/stm/AbstractUnitT.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/test/java/uk/ac/ncl/sdia/a8905943/stm/AbstractUnitT.java	2009-10-01 16:59:14 UTC (rev 29524)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/test/java/uk/ac/ncl/sdia/a8905943/stm/AbstractUnitT.java	2009-10-01 17:01:12 UTC (rev 29525)
@@ -7,7 +7,6 @@
 package uk.ac.ncl.sdia.a8905943.stm;
 
 import java.sql.Connection;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -59,3 +58,4 @@
    }
 
 }
+ 
\ No newline at end of file

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/test/java/uk/ac/ncl/sdia/a8905943/stm/TestUnitModelReplicatedMemory.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/test/java/uk/ac/ncl/sdia/a8905943/stm/TestUnitModelReplicatedMemory.java	2009-10-01 16:59:14 UTC (rev 29524)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/test/java/uk/ac/ncl/sdia/a8905943/stm/TestUnitModelReplicatedMemory.java	2009-10-01 17:01:12 UTC (rev 29525)
@@ -7,8 +7,10 @@
 package uk.ac.ncl.sdia.a8905943.stm;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import junit.framework.Assert;
 
@@ -43,9 +45,9 @@
       JXPathContext context = JXPathContext.newContext(this.stm);
       Object object = context.getValue("model/uk.ac.ncl.sdia.a8905943.model.Car");
       Assert.assertNotNull(object);
-      List<Object> list = (List<Object>)object ;
-      Assert.assertFalse(list.isEmpty());
-      Assert.assertEquals(3, list.size());
+      Set<Object> set = (Set<Object>)object ;
+      Assert.assertFalse(set.isEmpty());
+      Assert.assertEquals(3, set.size());
    }
    /**
     * This is a non transactional test to check model elements can be
@@ -57,7 +59,7 @@
    {
       //String fishEntityFQCN=  "Fish";
       String fishEntityFQCN=  Fish.class.getName();
-      List<Object> entityList = new ArrayList<Object>();
+      Set<Object> entityList = new HashSet<Object>();
       Fish fishy1 = new Fish(1l);
       fishy1.setType("Whiting");
       entityList.add(fishy1);
@@ -121,7 +123,7 @@
    {
       super.setUp();
       
-      List<Object> entityList = new ArrayList<Object>();
+      Set<Object> entityList = new HashSet<Object>();
       Car car1 = new Car(1l);
       entityList.add(car1);
       car1.setMake("Ford");