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.48 by jsr166, Mon May 28 21:51:44 2018 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.*;
8 < import java.util.*;
9 < import java.util.concurrent.*;
10 < import java.io.*;
7 > import java.util.Arrays;
8 > import java.util.BitSet;
9 > import java.util.Collection;
10 > import java.util.Comparator;
11 > import java.util.Iterator;
12 > import java.util.NavigableSet;
13 > import java.util.NoSuchElementException;
14 > import java.util.Random;
15 > 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 29 | Line 39 | public class TreeSetTest extends JSR166T
39      static final int SIZE = 20;
40  
41      /**
42 <     * Create a set of given size containing consecutive
43 <     * Integers 0 ... n.
42 >     * Returns a new set of given size containing consecutive
43 >     * Integers 0 ... n - 1.
44       */
45 <    private TreeSet populatedSet(int n) {
46 <        TreeSet q = new TreeSet();
45 >    private static TreeSet<Integer> populatedSet(int n) {
46 >        TreeSet<Integer> q = new TreeSet<>();
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 45 | 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() {
60 >    private static TreeSet set5() {
61          TreeSet q = new TreeSet();
62          assertTrue(q.isEmpty());
63          q.add(one);
# Line 71 | 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 81 | Line 91 | public class TreeSetTest extends JSR166T
91       */
92      public void testConstructor4() {
93          try {
94 <            Integer[] ints = new Integer[SIZE];
85 <            TreeSet q = new TreeSet(Arrays.asList(ints));
94 >            new TreeSet(Arrays.asList(new Integer[SIZE]));
95              shouldThrow();
96          } catch (NullPointerException success) {}
97      }
# Line 91 | Line 100 | public class TreeSetTest extends JSR166T
100       * Initializing from Collection with some null elements throws NPE
101       */
102      public void testConstructor5() {
103 +        Integer[] ints = new Integer[SIZE];
104 +        for (int i = 0; i < SIZE - 1; ++i)
105 +            ints[i] = new Integer(i);
106          try {
107 <            Integer[] ints = new Integer[SIZE];
96 <            for (int i = 0; i < SIZE-1; ++i)
97 <                ints[i] = new Integer(i);
98 <            TreeSet q = new TreeSet(Arrays.asList(ints));
107 >            new TreeSet(Arrays.asList(ints));
108              shouldThrow();
109          } catch (NullPointerException success) {}
110      }
# Line 123 | Line 132 | public class TreeSetTest extends JSR166T
132          for (int i = 0; i < SIZE; ++i)
133              ints[i] = new Integer(i);
134          q.addAll(Arrays.asList(ints));
135 <        for (int i = SIZE-1; i >= 0; --i)
135 >        for (int i = SIZE - 1; i >= 0; --i)
136              assertEquals(ints[i], q.pollFirst());
137      }
138  
# Line 147 | Line 156 | public class TreeSetTest extends JSR166T
156      public void testSize() {
157          TreeSet q = populatedSet(SIZE);
158          for (int i = 0; i < SIZE; ++i) {
159 <            assertEquals(SIZE-i, q.size());
159 >            assertEquals(SIZE - i, q.size());
160              q.pollFirst();
161          }
162          for (int i = 0; i < SIZE; ++i) {
# Line 160 | Line 169 | public class TreeSetTest extends JSR166T
169       * add(null) throws NPE if nonempty
170       */
171      public void testAddNull() {
172 +        TreeSet q = populatedSet(SIZE);
173          try {
164            TreeSet q = populatedSet(SIZE);
174              q.add(null);
175              shouldThrow();
176          } catch (NullPointerException success) {}
# Line 189 | Line 198 | public class TreeSetTest extends JSR166T
198       * Add of non-Comparable throws CCE
199       */
200      public void testAddNonComparable() {
201 +        TreeSet q = new TreeSet();
202          try {
193            TreeSet q = new TreeSet();
194            q.add(new Object());
203              q.add(new Object());
204              q.add(new Object());
205              shouldThrow();
# Line 202 | Line 210 | public class TreeSetTest extends JSR166T
210       * addAll(null) throws NPE
211       */
212      public void testAddAll1() {
213 +        TreeSet q = new TreeSet();
214          try {
206            TreeSet q = new TreeSet();
215              q.addAll(null);
216              shouldThrow();
217          } catch (NullPointerException success) {}
# Line 213 | Line 221 | public class TreeSetTest extends JSR166T
221       * addAll of a collection with null elements throws NPE
222       */
223      public void testAddAll2() {
224 +        TreeSet q = new TreeSet();
225 +        Integer[] ints = new Integer[SIZE];
226          try {
217            TreeSet q = new TreeSet();
218            Integer[] ints = new Integer[SIZE];
227              q.addAll(Arrays.asList(ints));
228              shouldThrow();
229          } catch (NullPointerException success) {}
# Line 226 | Line 234 | public class TreeSetTest extends JSR166T
234       * possibly adding some elements
235       */
236      public void testAddAll3() {
237 +        TreeSet q = new TreeSet();
238 +        Integer[] ints = new Integer[SIZE];
239 +        for (int i = 0; i < SIZE - 1; ++i)
240 +            ints[i] = new Integer(i);
241          try {
230            TreeSet q = new TreeSet();
231            Integer[] ints = new Integer[SIZE];
232            for (int i = 0; i < SIZE-1; ++i)
233                ints[i] = new Integer(i);
242              q.addAll(Arrays.asList(ints));
243              shouldThrow();
244          } catch (NullPointerException success) {}
# Line 243 | Line 251 | public class TreeSetTest extends JSR166T
251          Integer[] empty = new Integer[0];
252          Integer[] ints = new Integer[SIZE];
253          for (int i = 0; i < SIZE; ++i)
254 <            ints[i] = new Integer(SIZE-1-i);
254 >            ints[i] = new Integer(SIZE - 1 - i);
255          TreeSet q = new TreeSet();
256          assertFalse(q.addAll(Arrays.asList(empty)));
257          assertTrue(q.addAll(Arrays.asList(ints)));
# Line 267 | Line 275 | public class TreeSetTest extends JSR166T
275       */
276      public void testPollLast() {
277          TreeSet q = populatedSet(SIZE);
278 <        for (int i = SIZE-1; i >= 0; --i) {
278 >        for (int i = SIZE - 1; i >= 0; --i) {
279              assertEquals(i, q.pollLast());
280          }
281          assertNull(q.pollFirst());
282      }
283  
276
284      /**
285       * remove(x) removes x and returns true if present
286       */
287      public void testRemoveElement() {
288          TreeSet q = populatedSet(SIZE);
289 <        for (int i = 1; i < SIZE; i+=2) {
290 <            assertTrue(q.remove(new Integer(i)));
291 <        }
292 <        for (int i = 0; i < SIZE; i+=2) {
293 <            assertTrue(q.remove(new Integer(i)));
294 <            assertFalse(q.remove(new Integer(i+1)));
289 >        for (int i = 1; i < SIZE; i += 2) {
290 >            assertTrue(q.contains(i));
291 >            assertTrue(q.remove(i));
292 >            assertFalse(q.contains(i));
293 >            assertTrue(q.contains(i - 1));
294 >        }
295 >        for (int i = 0; i < SIZE; i += 2) {
296 >            assertTrue(q.contains(i));
297 >            assertTrue(q.remove(i));
298 >            assertFalse(q.contains(i));
299 >            assertFalse(q.remove(i + 1));
300 >            assertFalse(q.contains(i + 1));
301          }
302          assertTrue(q.isEmpty());
303      }
# Line 343 | Line 356 | public class TreeSetTest extends JSR166T
356                  assertTrue(changed);
357  
358              assertTrue(q.containsAll(p));
359 <            assertEquals(SIZE-i, q.size());
359 >            assertEquals(SIZE - i, q.size());
360              p.pollFirst();
361          }
362      }
# Line 356 | Line 369 | public class TreeSetTest extends JSR166T
369              TreeSet q = populatedSet(SIZE);
370              TreeSet p = populatedSet(i);
371              assertTrue(q.removeAll(p));
372 <            assertEquals(SIZE-i, q.size());
372 >            assertEquals(SIZE - i, q.size());
373              for (int j = 0; j < i; ++j) {
374 <                Integer I = (Integer)(p.pollFirst());
375 <                assertFalse(q.contains(I));
374 >                Integer x = (Integer)(p.pollFirst());
375 >                assertFalse(q.contains(x));
376              }
377          }
378      }
379  
367
368
380      /**
381       * lower returns preceding element
382       */
# Line 439 | Line 450 | public class TreeSetTest extends JSR166T
450      }
451  
452      /**
453 <     * toArray contains all elements
453 >     * toArray contains all elements in sorted order
454       */
455      public void testToArray() {
456          TreeSet q = populatedSet(SIZE);
457 <        Object[] o = q.toArray();
458 <        Arrays.sort(o);
459 <        for (int i = 0; i < o.length; i++)
460 <            assertEquals(o[i], q.pollFirst());
457 >        Object[] a = q.toArray();
458 >        assertSame(Object[].class, a.getClass());
459 >        for (Object o : a)
460 >            assertSame(o, q.pollFirst());
461 >        assertTrue(q.isEmpty());
462      }
463  
464      /**
465 <     * toArray(a) contains all elements
465 >     * toArray(a) contains all elements in sorted order
466       */
467      public void testToArray2() {
468 <        TreeSet q = populatedSet(SIZE);
468 >        TreeSet<Integer> q = populatedSet(SIZE);
469          Integer[] ints = new Integer[SIZE];
470 <        ints = (Integer[])q.toArray(ints);
471 <        Arrays.sort(ints);
472 <        for (int i = 0; i < ints.length; i++)
473 <            assertEquals(ints[i], q.pollFirst());
470 >        Integer[] array = q.toArray(ints);
471 >        assertSame(ints, array);
472 >        for (Integer o : ints)
473 >            assertSame(o, q.pollFirst());
474 >        assertTrue(q.isEmpty());
475      }
476  
477      /**
# Line 466 | Line 479 | public class TreeSetTest extends JSR166T
479       */
480      public void testIterator() {
481          TreeSet q = populatedSet(SIZE);
469        int i = 0;
482          Iterator it = q.iterator();
483 <        while (it.hasNext()) {
483 >        int i;
484 >        for (i = 0; it.hasNext(); i++)
485              assertTrue(q.contains(it.next()));
473            ++i;
474        }
486          assertEquals(i, SIZE);
487 +        assertIteratorExhausted(it);
488      }
489  
490      /**
491       * iterator of empty set has no elements
492       */
493      public void testEmptyIterator() {
494 <        TreeSet q = new TreeSet();
483 <        int i = 0;
484 <        Iterator it = q.iterator();
485 <        while (it.hasNext()) {
486 <            assertTrue(q.contains(it.next()));
487 <            ++i;
488 <        }
489 <        assertEquals(i, 0);
494 >        assertIteratorExhausted(new TreeSet().iterator());
495      }
496  
497      /**
# Line 508 | Line 513 | public class TreeSetTest extends JSR166T
513          assertFalse(it.hasNext());
514      }
515  
511
516      /**
517       * toString contains toStrings of elements
518       */
# Line 516 | Line 520 | public class TreeSetTest extends JSR166T
520          TreeSet q = populatedSet(SIZE);
521          String s = q.toString();
522          for (int i = 0; i < SIZE; ++i) {
523 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
523 >            assertTrue(s.contains(String.valueOf(i)));
524          }
525      }
526  
527      /**
528 <     * A deserialized serialized set has same elements
528 >     * A deserialized/reserialized set equals original
529       */
530      public void testSerialization() throws Exception {
531 <        TreeSet q = populatedSet(SIZE);
532 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
533 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
534 <        out.writeObject(q);
535 <        out.close();
536 <
537 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
538 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
539 <        TreeSet r = (TreeSet)in.readObject();
540 <        assertEquals(q.size(), r.size());
541 <        while (!q.isEmpty())
542 <            assertEquals(q.pollFirst(), r.pollFirst());
531 >        NavigableSet x = populatedSet(SIZE);
532 >        NavigableSet y = serialClone(x);
533 >
534 >        assertNotSame(x, y);
535 >        assertEquals(x.size(), y.size());
536 >        assertEquals(x, y);
537 >        assertEquals(y, x);
538 >        while (!x.isEmpty()) {
539 >            assertFalse(y.isEmpty());
540 >            assertEquals(x.pollFirst(), y.pollFirst());
541 >        }
542 >        assertTrue(y.isEmpty());
543      }
544  
545      /**
# Line 682 | Line 686 | public class TreeSetTest extends JSR166T
686                     0, setSize - 1, true);
687      }
688  
689 +    /**
690 +     * addAll is idempotent
691 +     */
692 +    public void testAddAll_idempotent() throws Exception {
693 +        Set x = populatedSet(SIZE);
694 +        Set y = new TreeSet(x);
695 +        y.addAll(x);
696 +        assertEquals(x, y);
697 +        assertEquals(y, x);
698 +    }
699 +
700      static NavigableSet<Integer> newSet(Class cl) throws Exception {
701 <        NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
702 <        assertEquals(result.size(), 0);
701 >        NavigableSet<Integer> result =
702 >            (NavigableSet<Integer>) cl.getConstructor().newInstance();
703 >        assertEquals(0, result.size());
704          assertFalse(result.iterator().hasNext());
705          return result;
706      }
# Line 716 | Line 732 | public class TreeSetTest extends JSR166T
732          // Add entries till we're back to original size
733          while (set.size() < size) {
734              int element = min + rnd.nextInt(rangeSize);
735 <            assertTrue(element >= min && element<= max);
735 >            assertTrue(element >= min && element <= max);
736              put(set, element);
737          }
738      }
# Line 741 | Line 757 | public class TreeSetTest extends JSR166T
757          // Add entries till we're back to original size
758          while (set.size() < size) {
759              int element = min - 5 + rnd.nextInt(rangeSize + 10);
760 <            if (element >= min && element<= max) {
760 >            if (element >= min && element <= max) {
761                  put(set, element);
762              } else {
763                  try {
# Line 845 | Line 861 | public class TreeSetTest extends JSR166T
861       */
862      void check(NavigableSet<Integer> set,
863                        final int min, final int max, final boolean ascending) {
864 <       class ReferenceSet {
864 >        class ReferenceSet {
865              int lower(int element) {
866                  return ascending ?
867                      lowerAscending(element) : higherAscending(element);
# Line 891 | Line 907 | public class TreeSetTest extends JSR166T
907                  else if (element > max)
908                      return -1;
909                  int result = bs.nextSetBit(element);
910 <                return result > max ? -1 : result;
910 >                return (result > max) ? -1 : result;
911              }
912              int higherAscending(int element) {
913                  return ceilingAscending(element + 1);
914              }
915              private int firstAscending() {
916                  int result = ceilingAscending(min);
917 <                return result > max ? -1 : result;
917 >                return (result > max) ? -1 : result;
918              }
919              private int lastAscending() {
920                  int result = floorAscending(max);
921 <                return result < min ? -1 : result;
921 >                return (result < min) ? -1 : result;
922              }
923          }
924          ReferenceSet rs = new ReferenceSet();
# Line 915 | Line 931 | public class TreeSetTest extends JSR166T
931              if (bsContainsI)
932                  size++;
933          }
934 <        assertEquals(set.size(), size);
934 >        assertEquals(size, set.size());
935  
936          // Test contents using contains elementSet iterator
937          int size2 = 0;
# Line 963 | Line 979 | public class TreeSetTest extends JSR166T
979      }
980  
981      static boolean eq(Integer i, int j) {
982 <        return i == null ? j == -1 : i == j;
982 >        return (i == null) ? j == -1 : i == j;
983      }
984  
985   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines