--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2009/11/21 17:38:05	1.15
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2009/11/21 19:45:16	1.17
@@ -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) {}
     }
 
     /**
@@ -354,7 +342,7 @@ public class LinkedTransferQueueTest ext
      */
     public void testInterruptedTimedPoll() throws InterruptedException {
         final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
-        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
+        Thread t = newStartedThread(new CheckedRunnable() {
             void realRun() throws InterruptedException {
                 for (int i = 0; i < SIZE; ++i) {
                     long t0 = System.nanoTime();
@@ -363,8 +351,12 @@ public class LinkedTransferQueueTest ext
                     long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
                     assertTrue(millisElapsed < SMALL_DELAY_MS);
                 }
-                q.poll(LONG_DELAY_MS, MILLISECONDS);
+                try {
+                    q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
             }});
+
         Thread.sleep(SMALL_DELAY_MS);
         t.interrupt();
         t.join();
@@ -416,8 +408,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.element();
             shouldThrow();
-        } catch (NoSuchElementException success) {
-        }
+        } catch (NoSuchElementException success) {}
         checkEmpty(q);
     }
 
@@ -432,8 +423,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.remove();
             shouldThrow();
-        } catch (NoSuchElementException success) {
-        }
+        } catch (NoSuchElementException success) {}
         checkEmpty(q);
     }
 
@@ -574,8 +564,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = populatedQueue(SIZE);
             Object o[] = q.toArray(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -586,8 +575,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = populatedQueue(SIZE);
             Object o[] = q.toArray(new String[10]);
             shouldThrow();
-        } catch (ArrayStoreException success) {
-        }
+        } catch (ArrayStoreException success) {}
     }
 
     /**
@@ -746,8 +734,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -758,8 +745,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(q);
             shouldThrow();
-        } catch (IllegalArgumentException success) {
-        }
+        } catch (IllegalArgumentException success) {}
     }
 
     /**
@@ -815,8 +801,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(null, SIZE);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -827,8 +812,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(q, SIZE);
             shouldThrow();
-        } catch (IllegalArgumentException success) {
-        }
+        } catch (IllegalArgumentException success) {}
     }
 
     /**