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.24 by jsr166, Sat Nov 26 05:19:17 2011 UTC vs.
Revision 1.30 by jsr166, Wed Dec 31 19:05:43 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 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) {
# 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 536 | Line 538 | public class TreeSetTest extends JSR166T
538          NavigableSet x = populatedSet(SIZE);
539          NavigableSet y = serialClone(x);
540  
541 <        assertTrue(x != y);
541 >        assertNotSame(x, y);
542          assertEquals(x.size(), y.size());
543          assertEquals(x, y);
544          assertEquals(y, x);
# Line 691 | Line 693 | public class TreeSetTest extends JSR166T
693                     0, setSize - 1, true);
694      }
695  
696 +    /**
697 +     * addAll is idempotent
698 +     */
699 +    public void testAddAll_idempotent() throws Exception {
700 +        Set x = populatedSet(SIZE);
701 +        Set y = new TreeSet(x);
702 +        y.addAll(x);
703 +        assertEquals(x, y);
704 +        assertEquals(y, x);
705 +    }
706 +
707      static NavigableSet<Integer> newSet(Class cl) throws Exception {
708          NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
709          assertEquals(0, result.size());
# Line 924 | Line 937 | public class TreeSetTest extends JSR166T
937              if (bsContainsI)
938                  size++;
939          }
940 <        assertEquals(set.size(), size);
940 >        assertEquals(size, set.size());
941  
942          // Test contents using contains elementSet iterator
943          int size2 = 0;

Diff Legend

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