--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/10/28 22:42:05	1.31
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/11/18 18:49:44	1.41
@@ -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,47 @@ 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);
+        Integer[] array = q.toArray(ints);
+        assertSame(ints, array);
         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) {}
     }
@@ -739,6 +743,8 @@ public class LinkedTransferQueueTest ext
         LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
 
         assertEquals(q.size(), r.size());
+        assertEquals(q.toString(), r.toString());
+        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
         while (!q.isEmpty()) {
             assertEquals(q.remove(), r.remove());
         }
@@ -908,15 +914,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);
     }
@@ -930,24 +935,23 @@ public class LinkedTransferQueueTest ext
 
         Thread first = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                Integer i = SIZE + 1;
-                q.transfer(i);
-                assertTrue(!q.contains(i));
+                q.transfer(four);
+                assertTrue(!q.contains(four));
                 assertEquals(1, q.size());
             }});
 
         Thread interruptedThread = newStartedThread(
             new CheckedInterruptedRunnable() {
                 public void realRun() throws InterruptedException {
-                    while (q.size() == 0)
+                    while (q.isEmpty())
                         Thread.yield();
-                    q.transfer(SIZE);
+                    q.transfer(five);
                 }});
 
         while (q.size() < 2)
             Thread.yield();
         assertEquals(2, q.size());
-        assertEquals(SIZE + 1, (int) q.poll());
+        assertSame(four, q.poll());
         first.join();
         assertEquals(1, q.size());
         interruptedThread.interrupt();
@@ -1068,12 +1072,13 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * tryTransfer waits the amount given if interrupted, and
-     * throws interrupted exception
+     * tryTransfer waits the amount given, and throws
+     * InterruptedException when interrupted.
      */
     public void testTryTransfer5() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
         final CountDownLatch threadStarted = new CountDownLatch(1);
+        assertTrue(q.isEmpty());
 
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
@@ -1084,9 +1089,12 @@ public class LinkedTransferQueueTest ext
                     shouldThrow();
                 } catch (InterruptedException success) {}
                 assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
+                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
             }});
 
         threadStarted.await();
+        while (q.isEmpty())
+            Thread.yield();
         Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
         awaitTermination(t, MEDIUM_DELAY_MS);
@@ -1094,7 +1102,7 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * tryTransfer gives up after the timeout and return false
+     * tryTransfer gives up after the timeout and returns false
      */
     public void testTryTransfer6() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
@@ -1105,9 +1113,9 @@ public class LinkedTransferQueueTest ext
                 assertFalse(q.tryTransfer(new Object(),
                                           SHORT_DELAY_MS, MILLISECONDS));
                 assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
+                checkEmpty(q);
             }});
 
-        checkEmpty(q);
         awaitTermination(t, MEDIUM_DELAY_MS);
         checkEmpty(q);
     }
@@ -1126,7 +1134,8 @@ public class LinkedTransferQueueTest ext
                 checkEmpty(q);
             }});
 
-        Thread.sleep(SHORT_DELAY_MS);
+        while (q.size() != 2)
+            Thread.yield();
         assertEquals(2, q.size());
         assertSame(four, q.poll());
         assertSame(five, q.poll());
@@ -1135,14 +1144,16 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * tryTransfer attempts to enqueue into the q and fails returning
-     * false not enqueueing and the successive poll is null
+     * tryTransfer attempts to enqueue into the queue and fails
+     * returning false not enqueueing and the successive poll is null
      */
     public void testTryTransfer8() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
         assertTrue(q.offer(four));
         assertEquals(1, q.size());
+        long t0 = System.nanoTime();
         assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
+        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
         assertEquals(1, q.size());
         assertSame(four, q.poll());
         assertNull(q.poll());