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 2015/08/21 13:12:26 UTC
svn commit: r1696939 - in /jackrabbit/branches/2.8: ./
jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
Author: reschke
Date: Fri Aug 21 11:12:26 2015
New Revision: 1696939
URL: http://svn.apache.org/r1696939
Log:
JCR-3900: LockTest.testNodeLocked: incorrect assumption about when the lock token can be returned (ported to 2.8)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 21 11:12:26 2015
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1674859,1680757
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1674859,1680757,1696929
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java?rev=1696939&r1=1696938&r2=1696939&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java Fri Aug 21 11:12:26 2015
@@ -112,6 +112,7 @@ public class LockTest extends AbstractJC
// lock node
Lock lock = n1.lock(false, true);
+ String lt = lock.getLockToken();
// assert: isLive must return true
assertTrue("Lock must be live", lock.isLive());
@@ -123,9 +124,11 @@ public class LockTest extends AbstractJC
// get same node
Node n2 = (Node) otherSuperuser.getItem(n1.getPath());
- // assert: lock token must be null for other session
- assertNull("Lock token must be null for other session",
- n2.getLock().getLockToken());
+ Lock lock2 = n2.getLock();
+ assertNotNull("other session must see the lock", lock2);
+ String lt2 = lock2.getLockToken();
+ assertTrue("other session must either not get the lock token, or see the actual one (tokens: " + lt + ", " + lt2 + ")",
+ lt2 == null || lt2.equals(lt));
// assert: modifying same node in other session must fail
try {