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.23 by jsr166, Thu Nov 4 01:04:54 2010 UTC vs.
Revision 1.27 by jsr166, Fri May 27 19:14:39 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 331 | Line 337 | public class LinkedListTest extends JSR1
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 <        assertSame(ints, q.toArray(ints));
342 >        Integer[] array = q.toArray(ints);
343 >        assertSame(ints, array);
344          for (int i = 0; i < ints.length; i++)
345              assertSame(ints[i], q.poll());
346      }
# Line 461 | Line 468 | public class LinkedListTest extends JSR1
468          assertFalse(it.hasNext());
469      }
470  
464 –
471      /**
472       * toString contains toStrings of elements
473       */
# Line 469 | Line 475 | public class LinkedListTest extends JSR1
475          LinkedList q = populatedQueue(SIZE);
476          String s = q.toString();
477          for (int i = 0; i < SIZE; ++i) {
478 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
478 >            assertTrue(s.contains(String.valueOf(i)));
479          }
480      }
481  
# Line 548 | Line 554 | public class LinkedListTest extends JSR1
554          assertNull(q.peekFirst());
555      }
556  
551 –
557      /**
558       * peekLast returns next element, or null if empty
559       */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines