Index: topia/src/test/org/codelutin/topia/persistence/AbstractPersistenceStorageTestCase.java diff -u topia/src/test/org/codelutin/topia/persistence/AbstractPersistenceStorageTestCase.java:1.10 topia/src/test/org/codelutin/topia/persistence/AbstractPersistenceStorageTestCase.java:1.11 --- topia/src/test/org/codelutin/topia/persistence/AbstractPersistenceStorageTestCase.java:1.10 Tue Aug 30 13:19:53 2005 +++ topia/src/test/org/codelutin/topia/persistence/AbstractPersistenceStorageTestCase.java Wed Sep 21 20:34:51 2005 @@ -23,9 +23,9 @@ * Created: 21 juillet 2005 19:57:28 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.10 $ + * @version $Revision: 1.11 $ * - * Last update: $Date: 2005/08/30 13:19:53 $ + * Last update: $Date: 2005/09/21 20:34:51 $ * by : $Author: bpoussin $ */ @@ -33,10 +33,10 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.Properties; import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.topia.TopiaConst; import org.codelutin.topia.TopiaId; import org.codelutin.util.CallAnalyse; @@ -44,7 +44,7 @@ public abstract class AbstractPersistenceStorageTestCase extends TestCase { // TopiaPersistenceStorageTest /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Logger log = Logger.getLogger("org.codelutin.topia.persistence.TopiaPersistenceStorageTest"); + static private Log log = LogFactory.getLog(AbstractPersistenceStorageTestCase.class); PersistenceStorage storage = null; TopiaTestContext testContext = null; @@ -88,7 +88,7 @@ TopiaPersistenceObject o = new TopiaPersistenceObject(id).initDefaultValue(); TopiaPersistenceObject o2 = new TopiaPersistenceObject(id); - o.setField("name", "testCommit"); + o.setField("name", "testCommit", child1); storage.beginTransaction(child1); storage.store(child1, o); @@ -102,11 +102,11 @@ assertTrue(storage.exists(child1, id)); assertTrue(storage.exists(child2, id)); - o2.getField("name"); + o2.getField("name", child2); storage.restore(child2, o2); - assertEquals("testCommit", o.getData().getField("name")); - assertEquals("testCommit", o2.getData().getField("name")); + assertEquals("testCommit", o.getData().getField("name", child2)); + assertEquals("testCommit", o2.getData().getField("name", child2)); } finally { CallAnalyse.exit(AbstractPersistenceStorageTestCase.class.getName() + ".testCommit"); } @@ -120,7 +120,7 @@ String id = TopiaId.create(ObjectTestEntity.class); TopiaPersistenceObject o = new TopiaPersistenceObject(id).initDefaultValue(); - o.setField("name", "testRollback"); + o.setField("name", "testRollback", child1); storage.beginTransaction(child1); storage.store(child1, o); @@ -147,7 +147,7 @@ TopiaPersistenceObject o = new TopiaPersistenceObject(id).initDefaultValue(); TopiaPersistenceObject o2 = new TopiaPersistenceObject(id); - o.setField("name", "testIsolation"); + o.setField("name", "testIsolation", child1); storage.beginTransaction(child1); storage.store(child1, o); @@ -162,7 +162,7 @@ assertFalse(storage.exists(child2, id)); assertTrue(storage.exists(child3, id)); - o.setField("name", "testIsolationBis"); + o.setField("name", "testIsolationBis", child1); storage.store(child1, o); assertTrue(storage.exists(child1, id)); @@ -175,12 +175,12 @@ assertFalse(storage.exists(child2, id)); assertTrue(storage.exists(child3, id)); - o2.getField("name"); + o2.getField("name", child3); storage.restore(child3, o2); assertFalse(o.getData().equals(o2.getData())); - assertEquals("testIsolationBis", o.getData().getField("name")); - assertEquals("testIsolation", o2.getData().getField("name")); + assertEquals("testIsolationBis", o.getData().getField("name", child3)); + assertEquals("testIsolation", o2.getData().getField("name", child3)); } finally { CallAnalyse.exit(AbstractPersistenceStorageTestCase.class.getName() + ".testIsolation"); } @@ -196,7 +196,7 @@ TopiaPersistenceObject o = new TopiaPersistenceObject(id).initDefaultValue(); - o.setField("name", "testdelete"); + o.setField("name", "testdelete", child1); storage.beginTransaction(child1); storage.store(child1, o); @@ -237,9 +237,9 @@ child1.setTransaction(tth.newTranstaction()); Collection ids = storage.getAllId(child1); - log.info("ids.size: " + ids.size()); + log.debug("ids.size: " + ids.size()); Collection os = new ArrayList(ids.size()); - System.out.println("suppression des id: " + ids); + // System.out.println("suppression des id: " + ids); storage.beginTransaction(child1); for(String id: ids){ @@ -252,7 +252,7 @@ storage.store(child1, os); Collection idsvide = storage.getAllId(child1); - System.out.println("list d'id vide ? " + idsvide); + // System.out.println("list d'id vide ? " + idsvide); assertEquals(0, idsvide.size()); TopiaTestContext child2 = testContext.createChild(); @@ -280,29 +280,29 @@ TopiaPersistenceObject o = new TopiaPersistenceObject(id).initDefaultValue(); TopiaPersistenceObject o2 = new TopiaPersistenceObject(id); - o.setField("name", "testDataType"); - o2.getField("name"); + o.setField("name", "testDataType", child1); + o2.getField("name", child1); - o.setField("string", "string"); - o2.getField("string"); + o.setField("string", "string", child1); + o2.getField("string", child1); - o.setField("boolean", Boolean.TRUE); - o2.getField("boolean"); + o.setField("boolean", Boolean.TRUE, child1); + o2.getField("boolean", child1); - o.setField("byte", Byte.valueOf((byte)1)); - o2.getField("byte"); + o.setField("byte", Byte.valueOf((byte)1), child1); + o2.getField("byte", child1); - o.setField("int", Integer.valueOf(2)); - o2.getField("int"); + o.setField("int", Integer.valueOf(2), child1); + o2.getField("int", child1); - o.setField("double", Double.valueOf(3.3)); - o2.getField("double"); + o.setField("double", Double.valueOf(3.3), child1); + o2.getField("double", child1); - o.setField("char", Character.valueOf('c')); - o2.getField("char"); + o.setField("char", Character.valueOf('c'), child1); + o2.getField("char", child1); - o.setField("object", new ArrayList()); - o2.getField("object"); + o.setField("object", new ArrayList(), child1); + o2.getField("object", child1); storage.beginTransaction(child1); storage.store(child1, o); @@ -310,9 +310,14 @@ storage.restore(child1, o2); - System.out.println("o =" + o.getData()); - System.out.println("o2=" + o2.getData()); - assertEquals(o.getData(), o2.getData()); + assertEquals(o.getData().getField("name", child1), o2.getData().getField("name", child1)); + assertEquals(o.getData().getField("string", child1), o2.getData().getField("string", child1)); + assertEquals(o.getData().getField("boolean", child1), o2.getData().getField("boolean", child1)); + assertEquals(o.getData().getField("byte", child1), o2.getData().getField("byte", child1)); + assertEquals(o.getData().getField("int", child1), o2.getData().getField("int", child1)); + assertEquals(o.getData().getField("double", child1), o2.getData().getField("double", child1)); + assertEquals(o.getData().getField("char", child1), o2.getData().getField("char", child1)); + assertEquals(o.getData().getField("object", child1), o2.getData().getField("object", child1)); } finally { CallAnalyse.exit(AbstractPersistenceStorageTestCase.class.getName() + ".testDataType"); } @@ -335,13 +340,13 @@ String id = TopiaId.create(ObjectTestEntity.class); TopiaPersistenceObject o = new TopiaPersistenceObject(id).initDefaultValue(); - o.setField("string", "testPerf"); - o.setField("boolean", Boolean.TRUE); - o.setField("byte", Byte.valueOf((byte)1)); - o.setField("int", Integer.valueOf(i)); - o.setField("double", Double.valueOf(3.3)); - o.setField("char", Character.valueOf('c')); - o.setField("object", new ArrayList()); + o.setField("string", "testPerf", child1); + o.setField("boolean", Boolean.TRUE, child1); + o.setField("byte", Byte.valueOf((byte)1), child1); + o.setField("int", Integer.valueOf(i), child1); + o.setField("double", Double.valueOf(3.3), child1); + o.setField("char", Character.valueOf('c'), child1); + o.setField("object", new ArrayList(), child1); list.add(o); }