--- jsr166/src/test/tck/ConcurrentLinkedDequeTest.java	2010/11/04 01:04:54	1.4
+++ jsr166/src/test/tck/ConcurrentLinkedDequeTest.java	2011/05/27 19:47:55	1.8
@@ -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 Andrew Wright, Jeffrey Hayes,
  * Pat Fisher, Mike Judd.
  */
@@ -25,8 +25,8 @@ public class ConcurrentLinkedDequeTest e
      * Create a deque of given size containing consecutive
      * Integers 0 ... n.
      */
-    private ConcurrentLinkedDeque populatedDeque(int n) {
-        ConcurrentLinkedDeque q = new ConcurrentLinkedDeque();
+    private ConcurrentLinkedDeque<Integer> populatedDeque(int n) {
+        ConcurrentLinkedDeque<Integer> q = new ConcurrentLinkedDeque<Integer>();
         assertTrue(q.isEmpty());
         for (int i = 0; i < n; ++i)
             assertTrue(q.offer(new Integer(i)));
@@ -431,11 +431,17 @@ public class ConcurrentLinkedDequeTest e
     public void testRemoveElement() {
         ConcurrentLinkedDeque q = populatedDeque(SIZE);
         for (int i = 1; i < SIZE; i+=2) {
-            assertTrue(q.remove(new Integer(i)));
+            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) {
-            assertTrue(q.remove(new Integer(i)));
-            assertFalse(q.remove(new Integer(i+1)));
+            assertTrue(q.contains(i));
+            assertTrue(q.remove(i));
+            assertFalse(q.contains(i));
+            assertFalse(q.remove(i+1));
+            assertFalse(q.contains(i+1));
         }
         assertTrue(q.isEmpty());
     }
@@ -648,9 +654,10 @@ public class ConcurrentLinkedDequeTest e
      * toArray(a) contains all elements in FIFO order
      */
     public void testToArray2() {
-        ConcurrentLinkedDeque q = populatedDeque(SIZE);
+        ConcurrentLinkedDeque<Integer> q = populatedDeque(SIZE);
         Integer[] ints = new Integer[SIZE];
-        assertSame(ints, q.toArray(ints));
+        Integer[] array = q.toArray(ints);
+        assertSame(ints, array);
         for (int i = 0; i < ints.length; i++)
             assertSame(ints[i], q.poll());
     }
@@ -828,7 +835,7 @@ public class ConcurrentLinkedDequeTest e
         ConcurrentLinkedDeque q = populatedDeque(SIZE);
         String s = q.toString();
         for (int i = 0; i < SIZE; ++i) {
-            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+            assertTrue(s.contains(String.valueOf(i)));
         }
     }