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.23 by jsr166, Tue May 31 16:16:24 2011 UTC vs.
Revision 1.38 by jsr166, Sat Apr 25 04:55:31 2015 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());
24 >        main(suite(), args);
25      }
26      public static Test suite() {
27          return new TestSuite(TreeSetTest.class);
# Line 37 | Line 39 | public class TreeSetTest extends JSR166T
39      static final int SIZE = 20;
40  
41      /**
42 <     * Create a set of given size containing consecutive
42 >     * Returns a new set of given size containing consecutive
43       * Integers 0 ... n.
44       */
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 53 | Line 55 | public class TreeSetTest extends JSR166T
55      }
56  
57      /**
58 <     * Create set of first 5 ints
58 >     * Returns a new set of first 5 ints.
59       */
60      private TreeSet set5() {
61          TreeSet q = new TreeSet();
# Line 79 | Line 81 | public class TreeSetTest extends JSR166T
81       */
82      public void testConstructor3() {
83          try {
84 <            TreeSet q = new TreeSet((Collection)null);
84 >            new TreeSet((Collection)null);
85              shouldThrow();
86          } catch (NullPointerException success) {}
87      }
# Line 90 | Line 92 | public class TreeSetTest extends JSR166T
92      public void testConstructor4() {
93          try {
94              Integer[] ints = new Integer[SIZE];
95 <            TreeSet q = new TreeSet(Arrays.asList(ints));
95 >            new TreeSet(Arrays.asList(ints));
96              shouldThrow();
97          } catch (NullPointerException success) {}
98      }
# Line 103 | Line 105 | public class TreeSetTest extends JSR166T
105              Integer[] ints = new Integer[SIZE];
106              for (int i = 0; i < SIZE-1; ++i)
107                  ints[i] = new Integer(i);
108 <            TreeSet q = new TreeSet(Arrays.asList(ints));
108 >            new TreeSet(Arrays.asList(ints));
109              shouldThrow();
110          } catch (NullPointerException success) {}
111      }
# Line 168 | Line 170 | public class TreeSetTest extends JSR166T
170       * add(null) throws NPE if nonempty
171       */
172      public void testAddNull() {
173 +        TreeSet q = populatedSet(SIZE);
174          try {
172 –            TreeSet q = populatedSet(SIZE);
175              q.add(null);
176              shouldThrow();
177          } catch (NullPointerException success) {}
# Line 197 | Line 199 | public class TreeSetTest extends JSR166T
199       * Add of non-Comparable throws CCE
200       */
201      public void testAddNonComparable() {
202 +        TreeSet q = new TreeSet();
203          try {
201 –            TreeSet q = new TreeSet();
202 –            q.add(new Object());
204              q.add(new Object());
205              q.add(new Object());
206              shouldThrow();
# Line 210 | Line 211 | public class TreeSetTest extends JSR166T
211       * addAll(null) throws NPE
212       */
213      public void testAddAll1() {
214 +        TreeSet q = new TreeSet();
215          try {
214 –            TreeSet q = new TreeSet();
216              q.addAll(null);
217              shouldThrow();
218          } catch (NullPointerException success) {}
# Line 221 | Line 222 | public class TreeSetTest extends JSR166T
222       * addAll of a collection with null elements throws NPE
223       */
224      public void testAddAll2() {
225 +        TreeSet q = new TreeSet();
226 +        Integer[] ints = new Integer[SIZE];
227          try {
225 –            TreeSet q = new TreeSet();
226 –            Integer[] ints = new Integer[SIZE];
228              q.addAll(Arrays.asList(ints));
229              shouldThrow();
230          } catch (NullPointerException success) {}
# Line 234 | Line 235 | public class TreeSetTest extends JSR166T
235       * possibly adding some elements
236       */
237      public void testAddAll3() {
238 +        TreeSet q = new TreeSet();
239 +        Integer[] ints = new Integer[SIZE];
240 +        for (int i = 0; i < SIZE-1; ++i)
241 +            ints[i] = new Integer(i);
242          try {
238 –            TreeSet q = new TreeSet();
239 –            Integer[] ints = new Integer[SIZE];
240 –            for (int i = 0; i < SIZE-1; ++i)
241 –                ints[i] = new Integer(i);
243              q.addAll(Arrays.asList(ints));
244              shouldThrow();
245          } catch (NullPointerException success) {}
# Line 286 | Line 287 | public class TreeSetTest extends JSR166T
287       */
288      public void testRemoveElement() {
289          TreeSet q = populatedSet(SIZE);
290 <        for (int i = 1; i < SIZE; i+=2) {
290 >        for (int i = 1; i < SIZE; i += 2) {
291              assertTrue(q.contains(i));
292              assertTrue(q.remove(i));
293              assertFalse(q.contains(i));
294              assertTrue(q.contains(i-1));
295          }
296 <        for (int i = 0; i < SIZE; i+=2) {
296 >        for (int i = 0; i < SIZE; i += 2) {
297              assertTrue(q.contains(i));
298              assertTrue(q.remove(i));
299              assertFalse(q.contains(i));
# Line 371 | Line 372 | public class TreeSetTest extends JSR166T
372              assertTrue(q.removeAll(p));
373              assertEquals(SIZE-i, q.size());
374              for (int j = 0; j < i; ++j) {
375 <                Integer I = (Integer)(p.pollFirst());
376 <                assertFalse(q.contains(I));
375 >                Integer x = (Integer)(p.pollFirst());
376 >                assertFalse(q.contains(x));
377              }
378          }
379      }
# Line 476 | Line 477 | public class TreeSetTest extends JSR166T
477       */
478      public void testIterator() {
479          TreeSet q = populatedSet(SIZE);
479 –        int i = 0;
480          Iterator it = q.iterator();
481 <        while (it.hasNext()) {
481 >        int i;
482 >        for (i = 0; it.hasNext(); i++)
483              assertTrue(q.contains(it.next()));
483 –            ++i;
484 –        }
484          assertEquals(i, SIZE);
485 +        assertIteratorExhausted(it);
486      }
487  
488      /**
489       * iterator of empty set has no elements
490       */
491      public void testEmptyIterator() {
492 <        TreeSet q = new TreeSet();
493 <        int i = 0;
494 <        Iterator it = q.iterator();
495 <        while (it.hasNext()) {
496 <            assertTrue(q.contains(it.next()));
497 <            ++i;
498 <        }
499 <        assertEquals(i, 0);
492 >        assertIteratorExhausted(new TreeSet().iterator());
493      }
494  
495      /**
# Line 536 | Line 529 | public class TreeSetTest extends JSR166T
529          NavigableSet x = populatedSet(SIZE);
530          NavigableSet y = serialClone(x);
531  
532 <        assertTrue(x != y);
532 >        assertNotSame(x, y);
533          assertEquals(x.size(), y.size());
534          assertEquals(x, y);
535          assertEquals(y, x);
# Line 691 | Line 684 | public class TreeSetTest extends JSR166T
684                     0, setSize - 1, true);
685      }
686  
687 +    /**
688 +     * addAll is idempotent
689 +     */
690 +    public void testAddAll_idempotent() throws Exception {
691 +        Set x = populatedSet(SIZE);
692 +        Set y = new TreeSet(x);
693 +        y.addAll(x);
694 +        assertEquals(x, y);
695 +        assertEquals(y, x);
696 +    }
697 +
698      static NavigableSet<Integer> newSet(Class cl) throws Exception {
699          NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
700 <        assertEquals(result.size(), 0);
700 >        assertEquals(0, result.size());
701          assertFalse(result.iterator().hasNext());
702          return result;
703      }
# Line 725 | Line 729 | public class TreeSetTest extends JSR166T
729          // Add entries till we're back to original size
730          while (set.size() < size) {
731              int element = min + rnd.nextInt(rangeSize);
732 <            assertTrue(element >= min && element<= max);
732 >            assertTrue(element >= min && element <= max);
733              put(set, element);
734          }
735      }
# Line 750 | Line 754 | public class TreeSetTest extends JSR166T
754          // Add entries till we're back to original size
755          while (set.size() < size) {
756              int element = min - 5 + rnd.nextInt(rangeSize + 10);
757 <            if (element >= min && element<= max) {
757 >            if (element >= min && element <= max) {
758                  put(set, element);
759              } else {
760                  try {
# Line 924 | Line 928 | public class TreeSetTest extends JSR166T
928              if (bsContainsI)
929                  size++;
930          }
931 <        assertEquals(set.size(), size);
931 >        assertEquals(size, set.size());
932  
933          // Test contents using contains elementSet iterator
934          int size2 = 0;

Diff Legend

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