--- jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2014/12/31 19:05:42	1.47
+++ jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2015/07/03 01:56:38	1.51
@@ -21,7 +21,7 @@ import junit.framework.TestSuite;
 
 public class AbstractQueuedSynchronizerTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AbstractQueuedSynchronizerTest.class);
@@ -228,6 +228,8 @@ public class AbstractQueuedSynchronizerT
         case awaitUntil:
             assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
             break;
+        default:
+            throw new AssertionError();
         }
     }
 
@@ -247,6 +249,7 @@ public class AbstractQueuedSynchronizerT
                 long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
                 long nanosRemaining = c.awaitNanos(nanosTimeout);
                 assertTrue(nanosRemaining <= 0);
+                assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS));
                 break;
             case awaitUntil:
                 assertFalse(c.awaitUntil(delayedDate(timeoutMillis)));
@@ -1198,7 +1201,6 @@ public class AbstractQueuedSynchronizerT
     public void testTryAcquireSharedNanos_Timeout() {
         final BooleanLatch l = new BooleanLatch();
         final BooleanLatch observedQueued = new BooleanLatch();
-        final long timeoutMillis = timeoutMillis();
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 assertFalse(l.isSignalled());