--- jsr166/src/test/tck/AbstractQueuedLongSynchronizerTest.java	2014/12/31 19:23:56	1.30
+++ jsr166/src/test/tck/AbstractQueuedLongSynchronizerTest.java	2015/04/25 04:55:30	1.34
@@ -21,7 +21,7 @@ import junit.framework.TestSuite;
 
 public class AbstractQueuedLongSynchronizerTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AbstractQueuedLongSynchronizerTest.class);
@@ -94,7 +94,7 @@ public class AbstractQueuedLongSynchroni
         }
 
         public boolean tryReleaseShared(long ignore) {
-            setState(1 << 62);
+            setState(1L << 62);
             return true;
         }
     }
@@ -225,6 +225,8 @@ public class AbstractQueuedLongSynchroni
         case awaitUntil:
             assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
             break;
+        default:
+            throw new AssertionError();
         }
     }
 
@@ -1195,7 +1197,6 @@ public class AbstractQueuedLongSynchroni
     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());