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.58 by jsr166, Sat Apr 25 04:55:31 2015 UTC vs.
Revision 1.61 by jsr166, Fri Jul 3 00:25:35 2015 UTC

#	Line 146 | Line 146 | public class ReentrantLockTest extends J
146		enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
147
148		/**
149	<	* Awaits condition using the specified AwaitMethod.
149	>	* Awaits condition "indefinitely" using the specified AwaitMethod.
150		*/
151		void await(Condition c, AwaitMethod awaitMethod)
152		throws InterruptedException {
#	Line 159 | Line 159 | public class ReentrantLockTest extends J
159		assertTrue(c.await(timeoutMillis, MILLISECONDS));
160		break;
161		case awaitNanos:
162	<	long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
163	<	long nanosRemaining = c.awaitNanos(nanosTimeout);
164	<	assertTrue(nanosRemaining > 0);
162	>	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
163	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
164	>	assertTrue(nanosRemaining > timeoutNanos / 2);
165	>	assertTrue(nanosRemaining <= timeoutNanos);
166		break;
167		case awaitUntil:
168		assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
#	Line 424 | Line 425 | public class ReentrantLockTest extends J
425		}
426		for (int i = SIZE; i > 0; i--) {
427		lock.unlock();
428	<	assertEquals(i-1, lock.getHoldCount());
428	>	assertEquals(i - 1, lock.getHoldCount());
429		}
430		}
431

Diff Legend

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