[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/tests DBObjectTest.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/tests
In directory jcorp2.servlets.net:/tmp/cvs-serv14921/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/tests

Modified Files:
	DBObjectTest.java 
Log Message:
minor improvment in test case


Index: DBObjectTest.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/tests/DBObjectTest.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** DBObjectTest.java	1 Sep 2004 03:20:36 -0000	1.37
--- DBObjectTest.java	1 Sep 2004 03:31:49 -0000	1.38
***************
*** 504,520 ****
  
              try {
                  //
!                 //First try adding, then rolling back
                  //
                  oneConnection.setAutoCommit(false);
-                 Test1 test1 = new Test1(oneConnection);
  
                  test1.setField("TestKey", 1);
                  test1.setField("TextTest", "Long Test");
                  test1.add();
  
                  Test2 test2 = new Test2(oneConnection);
                  test2.setField("TestKey", 1);
                  test2.add();
                  oneConnection.rollback();
  
--- 504,532 ----
  
              try {
+ 
+                 // before test, make sure no object exists in db (during autocommit)
+                 Test1 test1 = new Test1(oneConnection);
+                 test1.setField("TestKey", 1);
+                 if (test1.find()) test1.delete();
+ 
                  //
!                 // turn on transaction
                  //
                  oneConnection.setAutoCommit(false);
  
+                 // add item during transaction
+                 test1 = new Test1(oneConnection);
                  test1.setField("TestKey", 1);
                  test1.setField("TextTest", "Long Test");
                  test1.add();
  
+                 // different object
                  Test2 test2 = new Test2(oneConnection);
                  test2.setField("TestKey", 1);
                  test2.add();
+ 
+                 //
+                 // ok, rollback, which should remove objects
+                 //
                  oneConnection.rollback();