ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/LinkedListTest.java
(Generate patch)

Comparing jsr166/src/test/tck/LinkedListTest.java (file contents):
Revision 1.21 by jsr166, Wed Nov 3 07:54:52 2010 UTC vs.
Revision 1.24 by jsr166, Fri Nov 5 00:17:22 2010 UTC

# Line 23 | Line 23 | public class LinkedListTest extends JSR1
23       * Create a queue of given size containing consecutive
24       * Integers 0 ... n.
25       */
26 <    private LinkedList populatedQueue(int n) {
27 <        LinkedList q = new LinkedList();
26 >    private LinkedList<Integer> populatedQueue(int n) {
27 >        LinkedList<Integer> q = new LinkedList<Integer>();
28          assertTrue(q.isEmpty());
29          for (int i = 0; i < n; ++i)
30              assertTrue(q.offer(new Integer(i)));
# Line 318 | Line 318 | public class LinkedListTest extends JSR1
318      }
319  
320      /**
321 <     * toArray contains all elements
321 >     * toArray contains all elements in FIFO order
322       */
323      public void testToArray() {
324          LinkedList q = populatedQueue(SIZE);
325          Object[] o = q.toArray();
326        Arrays.sort(o);
326          for (int i = 0; i < o.length; i++)
327 <            assertEquals(o[i], q.poll());
327 >            assertSame(o[i], q.poll());
328      }
329  
330      /**
331 <     * toArray(a) contains all elements
331 >     * toArray(a) contains all elements in FIFO order
332       */
333      public void testToArray2() {
334 <        LinkedList q = populatedQueue(SIZE);
334 >        LinkedList<Integer> q = populatedQueue(SIZE);
335          Integer[] ints = new Integer[SIZE];
336 <        ints = (Integer[])q.toArray(ints);
337 <        Arrays.sort(ints);
336 >        Integer[] array = q.toArray(ints);
337 >        assertSame(ints, array);
338          for (int i = 0; i < ints.length; i++)
339 <            assertEquals(ints[i], q.poll());
339 >            assertSame(ints[i], q.poll());
340      }
341  
342      /**
343 <     * toArray(null) throws NPE
343 >     * toArray(null) throws NullPointerException
344       */
345 <    public void testToArray_BadArg() {
345 >    public void testToArray_NullArg() {
346          LinkedList l = new LinkedList();
347          l.add(new Object());
348          try {
349 <            Object o[] = l.toArray(null);
349 >            l.toArray(null);
350              shouldThrow();
351          } catch (NullPointerException success) {}
352      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines