ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ReentrantLockTest.java

Comparing jsr166/src/test/tck/ReentrantLockTest.java (file contents):
Revision 1.60 by jsr166, Fri Jul 3 00:23:43 2015 UTC vs.
Revision 1.62 by jsr166, Fri Jul 3 01:25:15 2015 UTC

#	Line 161 | Line 161 | public class ReentrantLockTest extends J
161		case awaitNanos:
162		long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
163		long nanosRemaining = c.awaitNanos(timeoutNanos);
164	<	assertTrue(nanosRemaining > 0);
164	>	assertTrue(nanosRemaining > timeoutNanos / 2);
165		assertTrue(nanosRemaining <= timeoutNanos);
166		break;
167		case awaitUntil:
#	Line 566 | Line 566 | public class ReentrantLockTest extends J
566		final Condition c = lock.newCondition();
567		lock.lock();
568		long startTime = System.nanoTime();
569	<	long timeoutMillis = 10;
570	<	java.util.Date d = new java.util.Date();
571	<	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
572	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
569	>	assertFalse(c.awaitUntil(delayedDate(timeoutMillis())));
570	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
571		lock.unlock();
572		} catch (InterruptedException fail) { threadUnexpectedException(fail); }
573		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines