Author: jukka
Date: Wed Oct 14 09:17:45 2009
New Revision: 825067

URL: http://svn.apache.org/viewvc?rev=825067&view=rev
Log:
JCRTCK-19: Add more information to AbstractLockTest error messages

Merged revision 808920 from Jackrabbit trunk.

Modified:
    jackrabbit/commons/jcr-tests/trunk/   (props changed)
    jackrabbit/commons/jcr-tests/trunk/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java

Propchange: jackrabbit/commons/jcr-tests/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 14 09:17:45 2009
@@ -1,3 +1,3 @@
 /jackrabbit/branches/1.5/jackrabbit-jcr-tests:794012,794100,794102
 /jackrabbit/sandbox/tripod-JCR-2209/jackrabbit-jcr-tests:795441-795863
-/jackrabbit/trunk/jackrabbit-jcr-tests:806531,808408,808430,808776
+/jackrabbit/trunk/jackrabbit-jcr-tests:806531,808408,808430,808776,808920

Modified: jackrabbit/commons/jcr-tests/trunk/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-tests/trunk/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java?rev=825067&r1=825066&r2=825067&view=diff
==============================================================================
--- jackrabbit/commons/jcr-tests/trunk/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java (original)
+++ jackrabbit/commons/jcr-tests/trunk/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java Wed Oct 14 09:17:45 2009
@@ -273,9 +273,10 @@
                 wait(remaining * 2000); // wait twice as long to be safe
             } catch (InterruptedException ignore) {
             }
+            long secs = lock.getSecondsRemaining();
             assertTrue(
-                    "A released lock must return a negative number of seconds",
-                    lock.getSecondsRemaining() < 0);
+                    "A released lock must return a negative number of seconds, was: " + secs,
+                    secs < 0);
             String message = "If the timeout hint is respected the lock"
                 + " must be automatically released.";
             assertFalse(message, lock.isLive());