--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/10/29 06:22:12	1.33
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/11/04 01:04:54	1.38
@@ -354,13 +354,16 @@ public class LinkedTransferQueueTest ext
                 for (int i = 0; i < SIZE; ++i) {
                     long t0 = System.nanoTime();
                     assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
-                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
+                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
                 }
+                long t0 = System.nanoTime();
                 aboutToWait.countDown();
                 try {
                     q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
                     shouldThrow();
-                } catch (InterruptedException success) {}
+                } catch (InterruptedException success) {
+                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
+                }
             }});
 
         aboutToWait.await();
@@ -382,7 +385,7 @@ public class LinkedTransferQueueTest ext
                 for (int i = 0; i < SIZE; ++i) {
                     long t0 = System.nanoTime();
                     assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
-                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
+                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
                 }
                 try {
                     q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
@@ -547,46 +550,46 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * toArray() contains all elements
+     * toArray() contains all elements in FIFO order
      */
-    public void testToArray() throws InterruptedException {
+    public void testToArray() {
         LinkedTransferQueue q = populatedQueue(SIZE);
         Object[] o = q.toArray();
         for (int i = 0; i < o.length; i++) {
-            assertEquals(o[i], q.take());
+            assertSame(o[i], q.poll());
         }
     }
 
     /**
-     * toArray(a) contains all elements
+     * toArray(a) contains all elements in FIFO order
      */
-    public void testToArray2() throws InterruptedException {
+    public void testToArray2() {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
         Integer[] ints = new Integer[SIZE];
-        ints = q.toArray(ints);
+        assertSame(ints, q.toArray(ints));
         for (int i = 0; i < ints.length; i++) {
-            assertEquals(ints[i], q.take());
+            assertSame(ints[i], q.poll());
         }
     }
 
     /**
      * toArray(null) throws NullPointerException
      */
-    public void testToArray_BadArg() {
+    public void testToArray_NullArg() {
         LinkedTransferQueue q = populatedQueue(SIZE);
         try {
-            Object o[] = q.toArray(null);
+            q.toArray(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
 
     /**
-     * toArray(incompatible array type) throws CCE
+     * toArray(incompatible array type) throws ArrayStoreException
      */
     public void testToArray1_BadArg() {
         LinkedTransferQueue q = populatedQueue(SIZE);
         try {
-            Object o[] = q.toArray(new String[10]);
+            q.toArray(new String[10]);
             shouldThrow();
         } catch (ArrayStoreException success) {}
     }
@@ -910,15 +913,14 @@ public class LinkedTransferQueueTest ext
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 threadStarted.countDown();
-                q.transfer(SIZE);
+                q.transfer(five);
                 checkEmpty(q);
             }});
 
         threadStarted.await();
         waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
-        assertTrue(t.isAlive());
         assertEquals(1, q.size());
-        assertEquals(SIZE, (int) q.poll());
+        assertSame(five, q.poll());
         checkEmpty(q);
         awaitTermination(t, MEDIUM_DELAY_MS);
     }