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/10/06 13:44:01 UTC
svn commit: r1707009 - in /jackrabbit/branches/2.8: ./
jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
Author: reschke
Date: Tue Oct 6 11:44:00 2015
New Revision: 1707009
URL: http://svn.apache.org/viewvc?rev=1707009&view=rev
Log:
JCR-3915: undo incorrect change to lock token test (in 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 Tue Oct 6 11:44:00 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,1696929
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1674859,1680757
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=1707009&r1=1707008&r2=1707009&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 Tue Oct 6 11:44:00 2015
@@ -112,7 +112,6 @@ 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());
@@ -124,11 +123,9 @@ public class LockTest extends AbstractJC
// get same node
Node n2 = (Node) otherSuperuser.getItem(n1.getPath());
- 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: lock token must be null for other session
+ assertNull("Lock token must be null for other session",
+ n2.getLock().getLockToken());
// assert: modifying same node in other session must fail
try {