--- jsr166/src/test/tck/PriorityQueueTest.java	2010/08/25 01:44:48	1.17
+++ jsr166/src/test/tck/PriorityQueueTest.java	2010/11/05 00:17:22	1.19
@@ -29,8 +29,8 @@ public class PriorityQueueTest extends J
      * Create a queue of given size containing consecutive
      * Integers 0 ... n.
      */
-    private PriorityQueue populatedQueue(int n) {
-        PriorityQueue q = new PriorityQueue(n);
+    private PriorityQueue<Integer> populatedQueue(int n) {
+        PriorityQueue<Integer> q = new PriorityQueue<Integer>(n);
         assertTrue(q.isEmpty());
         for (int i = n-1; i >= 0; i-=2)
             assertTrue(q.offer(new Integer(i)));
@@ -408,19 +408,20 @@ public class PriorityQueueTest extends J
         Object[] o = q.toArray();
         Arrays.sort(o);
         for (int i = 0; i < o.length; i++)
-            assertEquals(o[i], q.poll());
+            assertSame(o[i], q.poll());
     }
 
     /**
      * toArray(a) contains all elements
      */
     public void testToArray2() {
-        PriorityQueue q = populatedQueue(SIZE);
+        PriorityQueue<Integer> q = populatedQueue(SIZE);
         Integer[] ints = new Integer[SIZE];
-        ints = (Integer[])q.toArray(ints);
+        Integer[] array = q.toArray(ints);
+        assertSame(ints, array);
         Arrays.sort(ints);
         for (int i = 0; i < ints.length; i++)
-            assertEquals(ints[i], q.poll());
+            assertSame(ints[i], q.poll());
     }
 
     /**