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

Comparing jsr166/src/test/tck/TreeSubSetTest.java (file contents):
Revision 1.15 by jsr166, Thu Nov 4 01:04:54 2010 UTC vs.
Revision 1.19 by jsr166, Fri May 27 19:10:32 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 27 | Line 27 | public class TreeSubSetTest extends JSR1
27       * Create a set of given size containing consecutive
28       * Integers 0 ... n.
29       */
30 <    private NavigableSet populatedSet(int n) {
31 <        TreeSet q = new TreeSet();
30 >    private NavigableSet<Integer> populatedSet(int n) {
31 >        TreeSet<Integer> q = new TreeSet<Integer>();
32          assertTrue(q.isEmpty());
33  
34          for (int i = n-1; i >= 0; i-=2)
# Line 235 | Line 235 | public class TreeSubSetTest extends JSR1
235      public void testRemoveElement() {
236          NavigableSet q = populatedSet(SIZE);
237          for (int i = 1; i < SIZE; i+=2) {
238 <            assertTrue(q.remove(new Integer(i)));
238 >            assertTrue(q.contains(i));
239 >            assertTrue(q.remove(i));
240 >            assertFalse(q.contains(i));
241 >            assertTrue(q.contains(i-1));
242          }
243          for (int i = 0; i < SIZE; i+=2) {
244 <            assertTrue(q.remove(new Integer(i)));
245 <            assertFalse(q.remove(new Integer(i+1)));
244 >            assertTrue(q.contains(i));
245 >            assertTrue(q.remove(i));
246 >            assertFalse(q.contains(i));
247 >            assertFalse(q.remove(i+1));
248 >            assertFalse(q.contains(i+1));
249          }
250          assertTrue(q.isEmpty());
251      }
# Line 407 | Line 413 | public class TreeSubSetTest extends JSR1
413       * toArray(a) contains all elements in sorted order
414       */
415      public void testToArray2() {
416 <        NavigableSet q = populatedSet(SIZE);
416 >        NavigableSet<Integer> q = populatedSet(SIZE);
417          Integer[] ints = new Integer[SIZE];
418 <        assertSame(ints, q.toArray(ints));
418 >        Integer[] array = q.toArray(ints);
419 >        assertSame(ints, array);
420          for (int i = 0; i < ints.length; i++)
421              assertSame(ints[i], q.pollFirst());
422      }
# Line 469 | Line 476 | public class TreeSubSetTest extends JSR1
476          NavigableSet q = populatedSet(SIZE);
477          String s = q.toString();
478          for (int i = 0; i < SIZE; ++i) {
479 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
479 >            assertTrue(s.contains(String.valueOf(i)));
480          }
481      }
482  
# Line 962 | Line 969 | public class TreeSubSetTest extends JSR1
969          NavigableSet q = populatedSet(SIZE);
970          String s = q.toString();
971          for (int i = 0; i < SIZE; ++i) {
972 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
972 >            assertTrue(s.contains(String.valueOf(i)));
973          }
974      }
975  

Diff Legend

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