--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/11/18 18:49:44	1.41
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/11/28 08:43:53	1.43
@@ -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
@@ -448,12 +421,18 @@ public class LinkedTransferQueueTest ext
      */
     public void testRemoveElement() throws InterruptedException {
         LinkedTransferQueue q = populatedQueue(SIZE);
-        for (int i = 1; i < SIZE; i += 2) {
+        for (int i = 1; i < SIZE; i+=2) {
+            assertTrue(q.contains(i));
             assertTrue(q.remove(i));
+            assertFalse(q.contains(i));
+            assertTrue(q.contains(i-1));
         }
-        for (int i = 0; i < SIZE; i += 2) {
+        for (int i = 0; i < SIZE; i+=2) {
+            assertTrue(q.contains(i));
             assertTrue(q.remove(i));
-            assertFalse(q.remove(i + 1));
+            assertFalse(q.contains(i));
+            assertFalse(q.remove(i+1));
+            assertFalse(q.contains(i+1));
         }
         checkEmpty(q);
     }