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.29 by jsr166, Thu May 30 03:28:55 2013 UTC vs.
Revision 1.33 by jsr166, Wed Dec 31 21:45:16 2014 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 – import junit.framework.*;
7   import java.util.Arrays;
8   import java.util.BitSet;
9   import java.util.Collection;
# Line 17 | Line 16 | import java.util.Set;
16   import java.util.SortedSet;
17   import java.util.TreeSet;
18  
19 + import junit.framework.Test;
20 + import junit.framework.TestSuite;
21 +
22   public class TreeSetTest extends JSR166TestCase {
23      public static void main(String[] args) {
24          junit.textui.TestRunner.run(suite());
# Line 43 | Line 45 | public class TreeSetTest extends JSR166T
45      private TreeSet<Integer> populatedSet(int n) {
46          TreeSet<Integer> q = new TreeSet<Integer>();
47          assertTrue(q.isEmpty());
48 <        for (int i = n-1; i >= 0; i-=2)
48 >        for (int i = n-1; i >= 0; i -= 2)
49              assertTrue(q.add(new Integer(i)));
50 <        for (int i = (n & 1); i < n; i+=2)
50 >        for (int i = (n & 1); i < n; i += 2)
51              assertTrue(q.add(new Integer(i)));
52          assertFalse(q.isEmpty());
53          assertEquals(n, q.size());
# Line 286 | Line 288 | public class TreeSetTest extends JSR166T
288       */
289      public void testRemoveElement() {
290          TreeSet q = populatedSet(SIZE);
291 <        for (int i = 1; i < SIZE; i+=2) {
291 >        for (int i = 1; i < SIZE; i += 2) {
292              assertTrue(q.contains(i));
293              assertTrue(q.remove(i));
294              assertFalse(q.contains(i));
295              assertTrue(q.contains(i-1));
296          }
297 <        for (int i = 0; i < SIZE; i+=2) {
297 >        for (int i = 0; i < SIZE; i += 2) {
298              assertTrue(q.contains(i));
299              assertTrue(q.remove(i));
300              assertFalse(q.contains(i));
# Line 371 | Line 373 | public class TreeSetTest extends JSR166T
373              assertTrue(q.removeAll(p));
374              assertEquals(SIZE-i, q.size());
375              for (int j = 0; j < i; ++j) {
376 <                Integer I = (Integer)(p.pollFirst());
377 <                assertFalse(q.contains(I));
376 >                Integer x = (Integer)(p.pollFirst());
377 >                assertFalse(q.contains(x));
378              }
379          }
380      }
# Line 736 | Line 738 | public class TreeSetTest extends JSR166T
738          // Add entries till we're back to original size
739          while (set.size() < size) {
740              int element = min + rnd.nextInt(rangeSize);
741 <            assertTrue(element >= min && element<= max);
741 >            assertTrue(element >= min && element <= max);
742              put(set, element);
743          }
744      }
# Line 761 | Line 763 | public class TreeSetTest extends JSR166T
763          // Add entries till we're back to original size
764          while (set.size() < size) {
765              int element = min - 5 + rnd.nextInt(rangeSize + 10);
766 <            if (element >= min && element<= max) {
766 >            if (element >= min && element <= max) {
767                  put(set, element);
768              } else {
769                  try {

Diff Legend

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