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.20 by jsr166, Sat Oct 9 19:30:35 2010 UTC vs.
Revision 1.26 by jsr166, Tue Mar 15 19:47:06 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
# 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 233 | Line 233 | public class LinkedListTest extends JSR1
233      public void testRemoveElement() {
234          LinkedList q = populatedQueue(SIZE);
235          for (int i = 1; i < SIZE; i+=2) {
236 <            assertTrue(q.remove(new Integer(i)));
236 >            assertTrue(q.contains(i));
237 >            assertTrue(q.remove((Integer)i));
238 >            assertFalse(q.contains(i));
239 >            assertTrue(q.contains(i-1));
240          }
241          for (int i = 0; i < SIZE; i+=2) {
242 <            assertTrue(q.remove(new Integer(i)));
243 <            assertFalse(q.remove(new Integer(i+1)));
242 >            assertTrue(q.contains(i));
243 >            assertTrue(q.remove((Integer)i));
244 >            assertFalse(q.contains(i));
245 >            assertFalse(q.remove((Integer)(i+1)));
246 >            assertFalse(q.contains(i+1));
247          }
248          assertTrue(q.isEmpty());
249      }
# Line 318 | Line 324 | public class LinkedListTest extends JSR1
324      }
325  
326      /**
327 <     * toArray contains all elements
327 >     * toArray contains all elements in FIFO order
328       */
329      public void testToArray() {
330          LinkedList q = populatedQueue(SIZE);
331          Object[] o = q.toArray();
326        Arrays.sort(o);
332          for (int i = 0; i < o.length; i++)
333 <            assertEquals(o[i], q.poll());
333 >            assertSame(o[i], q.poll());
334      }
335  
336      /**
337 <     * toArray(a) contains all elements
337 >     * toArray(a) contains all elements in FIFO order
338       */
339      public void testToArray2() {
340 <        LinkedList q = populatedQueue(SIZE);
340 >        LinkedList<Integer> q = populatedQueue(SIZE);
341          Integer[] ints = new Integer[SIZE];
342 <        ints = (Integer[])q.toArray(ints);
343 <        Arrays.sort(ints);
342 >        Integer[] array = q.toArray(ints);
343 >        assertSame(ints, array);
344          for (int i = 0; i < ints.length; i++)
345 <            assertEquals(ints[i], q.poll());
345 >            assertSame(ints[i], q.poll());
346      }
347  
348      /**
349 <     * toArray(null) throws NPE
349 >     * toArray(null) throws NullPointerException
350       */
351 <    public void testToArray_BadArg() {
351 >    public void testToArray_NullArg() {
352          LinkedList l = new LinkedList();
353          l.add(new Object());
354          try {
355 <            Object o[] = l.toArray(null);
355 >            l.toArray(null);
356              shouldThrow();
357          } catch (NullPointerException success) {}
358      }
359  
360      /**
361 <     * toArray with incompatible array type throws CCE
361 >     * toArray(incompatible array type) throws ArrayStoreException
362       */
363      public void testToArray1_BadArg() {
364          LinkedList l = new LinkedList();
365          l.add(new Integer(5));
366          try {
367 <            Object o[] = l.toArray(new String[10]);
367 >            l.toArray(new String[10]);
368              shouldThrow();
369          } catch (ArrayStoreException success) {}
370      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines