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

Comparing jsr166/src/test/tck/TreeSetTest.java (file contents):
Revision 1.16 by jsr166, Mon Oct 11 05:40:41 2010 UTC vs.
Revision 1.20 by jsr166, Tue Mar 15 19:47:07 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   */
6  
7   import junit.framework.*;
# Line 32 | Line 32 | public class TreeSetTest extends JSR166T
32       * Create a set of given size containing consecutive
33       * Integers 0 ... n.
34       */
35 <    private TreeSet populatedSet(int n) {
36 <        TreeSet q = new TreeSet();
35 >    private TreeSet<Integer> populatedSet(int n) {
36 >        TreeSet<Integer> q = new TreeSet<Integer>();
37          assertTrue(q.isEmpty());
38          for (int i = n-1; i >= 0; i-=2)
39              assertTrue(q.add(new Integer(i)));
# Line 280 | Line 280 | public class TreeSetTest extends JSR166T
280      public void testRemoveElement() {
281          TreeSet q = populatedSet(SIZE);
282          for (int i = 1; i < SIZE; i+=2) {
283 <            assertTrue(q.remove(new Integer(i)));
283 >            assertTrue(q.contains(i));
284 >            assertTrue(q.remove(i));
285 >            assertFalse(q.contains(i));
286 >            assertTrue(q.contains(i-1));
287          }
288          for (int i = 0; i < SIZE; i+=2) {
289 <            assertTrue(q.remove(new Integer(i)));
290 <            assertFalse(q.remove(new Integer(i+1)));
289 >            assertTrue(q.contains(i));
290 >            assertTrue(q.remove(i));
291 >            assertFalse(q.contains(i));
292 >            assertFalse(q.remove(i+1));
293 >            assertFalse(q.contains(i+1));
294          }
295          assertTrue(q.isEmpty());
296      }
# Line 439 | Line 445 | public class TreeSetTest extends JSR166T
445      }
446  
447      /**
448 <     * toArray contains all elements
448 >     * toArray contains all elements in sorted order
449       */
450      public void testToArray() {
451          TreeSet q = populatedSet(SIZE);
452          Object[] o = q.toArray();
447 –        Arrays.sort(o);
453          for (int i = 0; i < o.length; i++)
454 <            assertEquals(o[i], q.pollFirst());
454 >            assertSame(o[i], q.pollFirst());
455      }
456  
457      /**
458 <     * toArray(a) contains all elements
458 >     * toArray(a) contains all elements in sorted order
459       */
460      public void testToArray2() {
461 <        TreeSet q = populatedSet(SIZE);
461 >        TreeSet<Integer> q = populatedSet(SIZE);
462          Integer[] ints = new Integer[SIZE];
463 <        ints = (Integer[])q.toArray(ints);
464 <        Arrays.sort(ints);
463 >        Integer[] array = q.toArray(ints);
464 >        assertSame(ints, array);
465          for (int i = 0; i < ints.length; i++)
466 <            assertEquals(ints[i], q.pollFirst());
466 >            assertSame(ints[i], q.pollFirst());
467      }
468  
469      /**

Diff Legend

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