--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/11/18 20:21:53	1.42
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2011/05/06 16:43:45	1.45
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  * Other contributors include John Vint
  */
 
@@ -40,33 +40,6 @@ public class LinkedTransferQueueTest ext
                             new Generic().testSuite());
     }
 
-    void checkEmpty(BlockingQueue q) {
-        try {
-            assertTrue(q.isEmpty());
-            assertEquals(0, q.size());
-            assertNull(q.peek());
-            assertNull(q.poll());
-            assertNull(q.poll(0, MILLISECONDS));
-            assertEquals(q.toString(), "[]");
-            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
-            assertFalse(q.iterator().hasNext());
-            try {
-                q.element();
-                shouldThrow();
-            } catch (NoSuchElementException success) {}
-            try {
-                q.iterator().next();
-                shouldThrow();
-            } catch (NoSuchElementException success) {}
-            try {
-                q.remove();
-                shouldThrow();
-            } catch (NoSuchElementException success) {}
-        } catch (InterruptedException ie) {
-            threadUnexpectedException(ie);
-        }
-    }
-
     /**
      * Constructor builds new queue with size being zero and empty
      * being true
@@ -1101,7 +1074,7 @@ public class LinkedTransferQueueTest ext
         threadStarted.await();
         while (q.isEmpty())
             Thread.yield();
-        Thread.sleep(SHORT_DELAY_MS);
+        delay(SHORT_DELAY_MS);
         t.interrupt();
         awaitTermination(t, MEDIUM_DELAY_MS);
         checkEmpty(q);