--- jsr166/src/test/tck/LinkedBlockingQueueTest.java	2009/11/21 02:07:26	1.15
+++ jsr166/src/test/tck/LinkedBlockingQueueTest.java	2009/11/21 02:33:20	1.16
@@ -9,6 +9,7 @@
 import junit.framework.*;
 import java.util.*;
 import java.util.concurrent.*;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import java.io.*;
 
 public class LinkedBlockingQueueTest extends JSR166TestCase {
@@ -378,8 +379,8 @@ public class LinkedBlockingQueueTest ext
                     try {
                         q.put(new Object());
                         q.put(new Object());
-                        threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
-                        q.offer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
+                        threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
+                        q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
                         threadShouldThrow();
                     } catch (InterruptedException success) {}
                 }
@@ -478,9 +479,9 @@ public class LinkedBlockingQueueTest ext
         try {
             LinkedBlockingQueue q = populatedQueue(SIZE);
             for (int i = 0; i < SIZE; ++i) {
-                assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
+                assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
             }
-            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
+            assertNull(q.poll(0, MILLISECONDS));
         } catch (InterruptedException e) {
             unexpectedException();
         }
@@ -493,9 +494,9 @@ public class LinkedBlockingQueueTest ext
         try {
             LinkedBlockingQueue q = populatedQueue(SIZE);
             for (int i = 0; i < SIZE; ++i) {
-                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
+                assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
             }
-            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
+            assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
         } catch (InterruptedException e) {
             unexpectedException();
         }
@@ -511,9 +512,9 @@ public class LinkedBlockingQueueTest ext
                     try {
                         LinkedBlockingQueue q = populatedQueue(SIZE);
                         for (int i = 0; i < SIZE; ++i) {
-                            threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
+                            threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
                         }
-                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
+                        threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
                     } catch (InterruptedException success) {
                     }
                 }});
@@ -537,9 +538,9 @@ public class LinkedBlockingQueueTest ext
         Thread t = new Thread(new Runnable() {
                 public void run() {
                     try {
-                        threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
-                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
-                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
+                        threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
+                        q.poll(LONG_DELAY_MS, MILLISECONDS);
+                        q.poll(LONG_DELAY_MS, MILLISECONDS);
                         threadShouldThrow();
                     } catch (InterruptedException success) { }
                 }
@@ -547,7 +548,7 @@ public class LinkedBlockingQueueTest ext
         try {
             t.start();
             Thread.sleep(SMALL_DELAY_MS);
-            assertTrue(q.offer(zero, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
+            assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
             t.interrupt();
             t.join();
         } catch (Exception e) {
@@ -858,7 +859,7 @@ public class LinkedBlockingQueueTest ext
             public void run() {
                 threadAssertFalse(q.offer(three));
                 try {
-                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
+                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
                     threadAssertEquals(0, q.remainingCapacity());
                 }
                 catch (InterruptedException e) {
@@ -892,7 +893,7 @@ public class LinkedBlockingQueueTest ext
             public void run() {
                 threadAssertNull(q.poll());
                 try {
-                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
+                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
                     threadAssertTrue(q.isEmpty());
                 }
                 catch (InterruptedException e) {