You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2011/12/28 14:17:57 UTC
svn commit: r1225179 - in
/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock:
LockManagerTest.java LockTest.java
Author: reschke
Date: Wed Dec 28 13:17:57 2011
New Revision: 1225179
URL: http://svn.apache.org/viewvc?rev=1225179&view=rev
Log:
JCR-3195: fix assumptions about null-ness of lock token
Modified:
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java?rev=1225179&r1=1225178&r2=1225179&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java Wed Dec 28 13:17:57 2011
@@ -243,7 +243,9 @@ public class LockManagerTest extends Abs
try {
lockMgr.removeLockToken(ltoken);
- assertNull("Lock token must not be exposed any more.", l.getLockToken());
+ String nlt = l.getLockToken();
+ assertTrue("freshly obtained lock token must either be null or the same as the one returned earlier",
+ nlt == null || nlt.equals(ltoken));
} finally {
// make sure lock token is added even if test fail
lockMgr.addLockToken(ltoken);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java?rev=1225179&r1=1225178&r2=1225179&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java Wed Dec 28 13:17:57 2011
@@ -64,8 +64,10 @@ public class LockTest extends AbstractJC
// remove lock token
superuser.removeLockToken(lockToken);
- // assert: session must get a null lock token
- assertNull("session must get a null lock token", lock.getLockToken());
+
+ String nlt = lock.getLockToken();
+ assertTrue("freshly obtained lock token must either be null or the same as the one returned earlier",
+ nlt == null || nlt.equals(lockToken));
// assert: session must still hold lock token
assertFalse("session must not hold lock token",
@@ -427,8 +429,9 @@ public class LockTest extends AbstractJC
otherSuperuser.removeLockToken(lockToken);
superuser.addLockToken(lockToken);
- // assert: user must get null token
- assertNull("user must get null token", lock.getLockToken());
+ String nlt = lock.getLockToken();
+ assertTrue("freshly obtained lock token must either be null or the same as the one returned earlier",
+ nlt == null || nlt.equals(lockToken));
// assert: user must get non-null token
assertNotNull("user must get non-null token",