--- jsr166/src/test/tck/AbstractQueuedLongSynchronizerTest.java	2017/05/14 02:16:56	1.38
+++ jsr166/src/test/tck/AbstractQueuedLongSynchronizerTest.java	2017/07/17 21:01:30	1.41
@@ -19,6 +19,7 @@ import junit.framework.AssertionFailedEr
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+@SuppressWarnings("WaitNotInLoop") // we implement spurious-wakeup freedom
 public class AbstractQueuedLongSynchronizerTest extends JSR166TestCase {
     public static void main(String[] args) {
         main(suite(), args);
@@ -1131,7 +1132,7 @@ public class AbstractQueuedLongSynchroni
 
         waitForQueuedThread(l, t);
         assertFalse(l.isSignalled());
-        assertThreadStaysAlive(t);
+        assertThreadBlocks(t, Thread.State.WAITING);
         assertHasSharedQueuedThreads(l, t);
         assertTrue(l.releaseShared(0));
         assertTrue(l.isSignalled());
@@ -1156,7 +1157,7 @@ public class AbstractQueuedLongSynchroni
 
         waitForQueuedThread(l, t);
         assertFalse(l.isSignalled());
-        assertThreadStaysAlive(t);
+        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
         assertTrue(l.releaseShared(0));
         assertTrue(l.isSignalled());
         awaitTermination(t);