--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2009/11/21 19:11:53	1.16
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2009/11/22 18:57:17	1.20
@@ -44,18 +44,15 @@ public class LinkedTransferQueueTest ext
         try {
             q.element();
             shouldThrow();
-        } catch (NoSuchElementException success) {
-        }
+        } catch (NoSuchElementException success) {}
         try {
             q.iterator().next();
             shouldThrow();
-        } catch (NoSuchElementException success) {
-        }
+        } catch (NoSuchElementException success) {}
         try {
             q.remove();
             shouldThrow();
-        } catch (NoSuchElementException success) {
-        }
+        } catch (NoSuchElementException success) {}
     }
 
     /**
@@ -75,8 +72,7 @@ public class LinkedTransferQueueTest ext
         try {
             new LinkedTransferQueue(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -88,8 +84,7 @@ public class LinkedTransferQueueTest ext
             Integer[] ints = new Integer[SIZE];
             new LinkedTransferQueue(Arrays.asList(ints));
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -104,8 +99,7 @@ public class LinkedTransferQueueTest ext
             }
             new LinkedTransferQueue(Arrays.asList(ints));
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -157,8 +151,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = new LinkedTransferQueue();
             q.offer(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -169,8 +162,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = new LinkedTransferQueue();
             q.add(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -181,8 +173,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = new LinkedTransferQueue();
             q.addAll(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -193,8 +184,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = populatedQueue(SIZE);
             q.addAll(q);
             shouldThrow();
-        } catch (IllegalArgumentException success) {
-        }
+        } catch (IllegalArgumentException success) {}
     }
 
     /**
@@ -206,8 +196,7 @@ public class LinkedTransferQueueTest ext
             Integer[] ints = new Integer[SIZE];
             q.addAll(Arrays.asList(ints));
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -223,8 +212,7 @@ public class LinkedTransferQueueTest ext
             }
             q.addAll(Arrays.asList(ints));
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -296,14 +284,19 @@ public class LinkedTransferQueueTest ext
      */
     public void testBlockingTake() throws InterruptedException {
         final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
-        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
-            void realRun() throws InterruptedException {
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
                 for (int i = 0; i < SIZE; ++i) {
-                    threadAssertEquals(i, (int) q.take());
+                    assertEquals(i, (int) q.take());
                 }
-                q.take();
+                try {
+                    q.take();
+                    shouldThrow();
+                } catch (InterruptedException success) {}
             }});
-        Thread.sleep(SMALL_DELAY_MS);
+
+        t.start();
+        Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
         t.join();
         checkEmpty(q);
@@ -365,8 +358,10 @@ public class LinkedTransferQueueTest ext
                 }
                 try {
                     q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
                 } catch (InterruptedException success) {}
             }});
+
         Thread.sleep(SMALL_DELAY_MS);
         t.interrupt();
         t.join();
@@ -379,12 +374,17 @@ public class LinkedTransferQueueTest ext
      */
     public void testTimedPollWithOffer() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
-        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
+        Thread t = new Thread(new CheckedRunnable() {
             void realRun() throws InterruptedException {
-                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
-                q.poll(LONG_DELAY_MS, MILLISECONDS);
-                q.poll(LONG_DELAY_MS, MILLISECONDS);
+                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
+                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
+                try {
+                    q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
             }});
+
+        t.start();
         Thread.sleep(SMALL_DELAY_MS);
         assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
         t.interrupt();
@@ -418,8 +418,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.element();
             shouldThrow();
-        } catch (NoSuchElementException success) {
-        }
+        } catch (NoSuchElementException success) {}
         checkEmpty(q);
     }
 
@@ -434,8 +433,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.remove();
             shouldThrow();
-        } catch (NoSuchElementException success) {
-        }
+        } catch (NoSuchElementException success) {}
         checkEmpty(q);
     }
 
@@ -572,24 +570,22 @@ public class LinkedTransferQueueTest ext
      * toArray(null) throws NullPointerException
      */
     public void testToArray_BadArg() {
+        LinkedTransferQueue q = populatedQueue(SIZE);
         try {
-            LinkedTransferQueue q = populatedQueue(SIZE);
             Object o[] = q.toArray(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
      * toArray(incompatible array type) throws CCE
      */
     public void testToArray1_BadArg() {
+        LinkedTransferQueue q = populatedQueue(SIZE);
         try {
-            LinkedTransferQueue q = populatedQueue(SIZE);
             Object o[] = q.toArray(new String[10]);
             shouldThrow();
-        } catch (ArrayStoreException success) {
-        }
+        } catch (ArrayStoreException success) {}
     }
 
     /**
@@ -748,8 +744,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -760,8 +755,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(q);
             shouldThrow();
-        } catch (IllegalArgumentException success) {
-        }
+        } catch (IllegalArgumentException success) {}
     }
 
     /**
@@ -817,8 +811,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(null, SIZE);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -829,8 +822,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(q, SIZE);
             shouldThrow();
-        } catch (IllegalArgumentException success) {
-        }
+        } catch (IllegalArgumentException success) {}
     }
 
     /**