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.28 by jsr166, Tue Apr 2 22:18:26 2013 UTC vs.
Revision 1.36 by jsr166, Sat Feb 28 18:18:56 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());
# 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 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();
204              q.add(new Object());
205              q.add(new Object());
206              q.add(new Object());
# Line 210 | Line 212 | public class TreeSetTest extends JSR166T
212       * addAll(null) throws NPE
213       */
214      public void testAddAll1() {
215 +        TreeSet q = new TreeSet();
216          try {
214 –            TreeSet q = new TreeSet();
217              q.addAll(null);
218              shouldThrow();
219          } catch (NullPointerException success) {}
# Line 221 | Line 223 | public class TreeSetTest extends JSR166T
223       * addAll of a collection with null elements throws NPE
224       */
225      public void testAddAll2() {
226 +        TreeSet q = new TreeSet();
227 +        Integer[] ints = new Integer[SIZE];
228          try {
225 –            TreeSet q = new TreeSet();
226 –            Integer[] ints = new Integer[SIZE];
229              q.addAll(Arrays.asList(ints));
230              shouldThrow();
231          } catch (NullPointerException success) {}
# Line 234 | Line 236 | public class TreeSetTest extends JSR166T
236       * possibly adding some elements
237       */
238      public void testAddAll3() {
239 +        TreeSet q = new TreeSet();
240 +        Integer[] ints = new Integer[SIZE];
241 +        for (int i = 0; i < SIZE-1; ++i)
242 +            ints[i] = new Integer(i);
243          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);
244              q.addAll(Arrays.asList(ints));
245              shouldThrow();
246          } catch (NullPointerException success) {}
# 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 476 | Line 478 | public class TreeSetTest extends JSR166T
478       */
479      public void testIterator() {
480          TreeSet q = populatedSet(SIZE);
479 –        int i = 0;
481          Iterator it = q.iterator();
482 <        while (it.hasNext()) {
482 >        int i;
483 >        for (i = 0; it.hasNext(); i++)
484              assertTrue(q.contains(it.next()));
483 –            ++i;
484 –        }
485          assertEquals(i, SIZE);
486 +        assertIteratorExhausted(it);
487      }
488  
489      /**
490       * iterator of empty set has no elements
491       */
492      public void testEmptyIterator() {
493 <        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(0, i);
493 >        assertIteratorExhausted(new TreeSet().iterator());
494      }
495  
496      /**
# Line 536 | Line 530 | public class TreeSetTest extends JSR166T
530          NavigableSet x = populatedSet(SIZE);
531          NavigableSet y = serialClone(x);
532  
533 <        assertTrue(x != y);
533 >        assertNotSame(x, y);
534          assertEquals(x.size(), y.size());
535          assertEquals(x, y);
536          assertEquals(y, x);
# Line 736 | Line 730 | public class TreeSetTest extends JSR166T
730          // Add entries till we're back to original size
731          while (set.size() < size) {
732              int element = min + rnd.nextInt(rangeSize);
733 <            assertTrue(element >= min && element<= max);
733 >            assertTrue(element >= min && element <= max);
734              put(set, element);
735          }
736      }
# Line 761 | Line 755 | public class TreeSetTest extends JSR166T
755          // Add entries till we're back to original size
756          while (set.size() < size) {
757              int element = min - 5 + rnd.nextInt(rangeSize + 10);
758 <            if (element >= min && element<= max) {
758 >            if (element >= min && element <= max) {
759                  put(set, element);
760              } else {
761                  try {

Diff Legend

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