svn commit: r369605 - /db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/LockingTest.java

[arminw]

Author: arminw
Date: Mon Jan 16 15:57:24 2006
New Revision: 369605

URL: http://svn.apache.org/viewcvs?rev=369605&view=rev
Log:
use IdentityFactory to create Identity objects

Modified:
    
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/LockingTest.java

Modified: 
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/LockingTest.java
URL: 
http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/LockingTest.java?rev=369605&r1=369604&r2=369605&view=diff
==============================================================================
--- 
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/LockingTest.java 
(original)
+++ 
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/LockingTest.java 
Mon Jan 16 15:57:24 2006
@@ -8,6 +8,7 @@
 import org.apache.ojb.broker.PersistenceBroker;
 import org.apache.ojb.broker.PersistenceBrokerFactory;
 import org.apache.ojb.broker.TestHelper;
+import org.apache.ojb.broker.Identity;
 import org.apache.ojb.broker.query.Criteria;
 import org.apache.ojb.broker.query.QueryFactory;
 import org.apache.ojb.junit.OJBTestCase;
@@ -72,6 +73,11 @@
         super.tearDown();
     }
 
+    protected Identity createIdentity(TransactionImpl tx, Object obj)
+    {
+        return tx.getBrokerInternal().serviceIdentity().buildIdentity(obj);
+    }
+
     public void testWrite_1() throws Exception
     {
         String name = "testWrite_1_" + System.currentTimeMillis();
@@ -223,10 +229,10 @@
         tx1.begin();
         tx2.begin();
         LockManager lm = LockManagerFactory.getLockManager();
-        boolean success1 = lm.writeLock(tx1, a);
-        boolean success2 = lm.writeLock(tx2, a);
+        boolean success1 = lm.writeLock(tx1, createIdentity(tx1, a));
+        boolean success2 = lm.writeLock(tx2, createIdentity(tx2, a));
 
-        boolean success3 = lm.releaseLock(tx1, a);
+        boolean success3 = lm.releaseLock(tx1, createIdentity(tx1, a));
 
         assertTrue("1st lock should succeed", success1);
         assertTrue("2nd lock should not succeed", !success2);
@@ -259,19 +265,19 @@
 
         assertFalse(tx1.getGUID().equals(tx2.getGUID()));
 
-        assertTrue("1st lock should succeed", lm.writeLock(tx1, a1));
-        assertFalse("2nd lock should not succeed", lm.writeLock(tx2, a2));
-        lm.releaseLock(tx2, a2);
-        lm.releaseLock(tx2, a1);
-        assertFalse(lm.checkWrite(tx2, a1));
-        assertFalse(lm.checkWrite(tx2, a2));
-        assertTrue(lm.checkWrite(tx1, a1));
-        assertTrue(lm.checkWrite(tx1, a2));
+        assertTrue("1st lock should succeed", lm.writeLock(tx1, 
createIdentity(tx1, a1)));
+        assertFalse("2nd lock should not succeed", lm.writeLock(tx2, 
createIdentity(tx2, a2)));
+        lm.releaseLock(tx2, createIdentity(tx2, a2));
+        lm.releaseLock(tx2, createIdentity(tx1, a1));
+        assertFalse(lm.checkWrite(tx2, createIdentity(tx1, a1)));
+        assertFalse(lm.checkWrite(tx2, createIdentity(tx1, a2)));
+        assertTrue(lm.checkWrite(tx1, createIdentity(tx1, a1)));
+        assertTrue(lm.checkWrite(tx1, createIdentity(tx1, a2)));
         //assertFalse("2nd release should not succeed", lm.releaseLock(tx2, 
a2));
         //assertFalse("2nd release should not succeed", lm.releaseLock(tx2, 
a1));
-        assertTrue("release should succeed", lm.releaseLock(tx1, a2));
-        assertTrue("2nd object lock should succeed", lm.writeLock(tx2, a2));
-        assertTrue("release 2nd object lock should succeed", 
lm.releaseLock(tx2, a2));
+        assertTrue("release should succeed", lm.releaseLock(tx1, 
createIdentity(tx1, a2)));
+        assertTrue("2nd object lock should succeed", lm.writeLock(tx2, 
createIdentity(tx1, a2)));
+        assertTrue("release 2nd object lock should succeed", 
lm.releaseLock(tx2, createIdentity(tx1, a2)));
 
         try
         {
@@ -362,13 +368,13 @@
             tx.lock(arr[i], Transaction.WRITE);
         }
         LockManager lm = LockManagerFactory.getLockManager();
-        boolean success = lm.writeLock(tx, arr[(loops - 2)]);
+        boolean success = lm.writeLock(tx, createIdentity(tx, arr[(loops - 
2)]));
         assertTrue("lock should succeed", success);
         tx.commit();
 
         TransactionImpl tx2 = (TransactionImpl) odmg2.newTransaction();
         tx2.begin();
-        success = lm.writeLock(tx2, arr[(loops - 2)]);
+        success = lm.writeLock(tx2, createIdentity(tx2, arr[(loops - 2)]));
         assertTrue("lock should succeed", success);
 
         OQLQuery query = odmg2.newOQLQuery();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]