ViewVC Help

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

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

Comparing jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java (file contents):
Revision 1.63 by jsr166, Tue Jan 23 20:44:11 2018 UTC vs.
Revision 1.65 by jsr166, Sun Jul 22 22:13:55 2018 UTC

#	Line 228 | Line 228 | public class AbstractQueuedSynchronizerT
228		assertTrue(c.await(timeoutMillis, MILLISECONDS));
229		break;
230		case awaitNanos:
231	<	long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
232	<	long nanosRemaining = c.awaitNanos(nanosTimeout);
231	>	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
232	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
233		assertTrue(nanosRemaining > 0);
234		break;
235		case awaitUntil:
#	Line 256 | Line 256 | public class AbstractQueuedSynchronizerT
256		break;
257		case awaitNanos:
258		startTime = System.nanoTime();
259	<	long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
260	<	long nanosRemaining = c.awaitNanos(nanosTimeout);
259	>	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
260	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
261		assertTrue(nanosRemaining <= 0);
262		assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS));
263		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
#	Line 1283 | Line 1283 | public class AbstractQueuedSynchronizerT
1283		try {
1284		s.acquireInterruptibly(1);
1285		shouldThrow();
1286	<	} catch (InterruptedException expected) {}
1286	>	} catch (InterruptedException success) {}
1287		};
1288		for (int i = 0; i < 2; i++) {
1289		Thread thread = new Thread(failedAcquire);

Diff Legend

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