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.2 by dl, Wed Apr 19 15:10:54 2006 UTC vs.
Revision 1.18 by jsr166, Fri Nov 5 00:17:22 2010 UTC

# Line 11 | Line 11 | import java.io.*;
11  
12   public class TreeSetTest extends JSR166TestCase {
13      public static void main(String[] args) {
14 <        junit.textui.TestRunner.run (suite());  
14 >        junit.textui.TestRunner.run(suite());
15      }
16      public static Test suite() {
17 <        return new TestSuite(TreeSetTest.class);
17 >        return new TestSuite(TreeSetTest.class);
18      }
19  
20 <    static class MyReverseComparator implements Comparator {
20 >    static class MyReverseComparator implements Comparator {
21          public int compare(Object x, Object y) {
22 <            int i = ((Integer)x).intValue();
23 <            int j = ((Integer)y).intValue();
24 <            if (i < j) return 1;
25 <            if (i > j) return -1;
26 <            return 0;
22 >            return ((Comparable)y).compareTo(x);
23          }
24      }
25  
# Line 36 | Line 32 | public class TreeSetTest extends JSR166T
32       * Create a set of given size containing consecutive
33       * Integers 0 ... n.
34       */
35 <    private TreeSet populatedSet(int n) {
36 <        TreeSet q = new TreeSet();
35 >    private TreeSet<Integer> populatedSet(int n) {
36 >        TreeSet<Integer> q = new TreeSet<Integer>();
37          assertTrue(q.isEmpty());
38 <        for(int i = n-1; i >= 0; i-=2)
39 <            assertTrue(q.add(new Integer(i)));
40 <        for(int i = (n & 1); i < n; i+=2)
41 <            assertTrue(q.add(new Integer(i)));
38 >        for (int i = n-1; i >= 0; i-=2)
39 >            assertTrue(q.add(new Integer(i)));
40 >        for (int i = (n & 1); i < n; i+=2)
41 >            assertTrue(q.add(new Integer(i)));
42          assertFalse(q.isEmpty());
43 <        assertEquals(n, q.size());
43 >        assertEquals(n, q.size());
44          return q;
45      }
46  
# Line 59 | Line 55 | public class TreeSetTest extends JSR166T
55          q.add(three);
56          q.add(four);
57          q.add(five);
58 <        assertEquals(5, q.size());
58 >        assertEquals(5, q.size());
59          return q;
60      }
61 <
61 >
62      /**
63       * A new set has unbounded capacity
64       */
# Line 77 | Line 73 | public class TreeSetTest extends JSR166T
73          try {
74              TreeSet q = new TreeSet((Collection)null);
75              shouldThrow();
76 <        }
81 <        catch (NullPointerException success) {}
76 >        } catch (NullPointerException success) {}
77      }
78  
79      /**
# Line 89 | Line 84 | public class TreeSetTest extends JSR166T
84              Integer[] ints = new Integer[SIZE];
85              TreeSet q = new TreeSet(Arrays.asList(ints));
86              shouldThrow();
87 <        }
93 <        catch (NullPointerException success) {}
87 >        } catch (NullPointerException success) {}
88      }
89  
90      /**
# Line 103 | Line 97 | public class TreeSetTest extends JSR166T
97                  ints[i] = new Integer(i);
98              TreeSet q = new TreeSet(Arrays.asList(ints));
99              shouldThrow();
100 <        }
107 <        catch (NullPointerException success) {}
100 >        } catch (NullPointerException success) {}
101      }
102  
103      /**
104       * Set contains all elements of collection used to initialize
105       */
106      public void testConstructor6() {
107 <        try {
108 <            Integer[] ints = new Integer[SIZE];
109 <            for (int i = 0; i < SIZE; ++i)
110 <                ints[i] = new Integer(i);
111 <            TreeSet q = new TreeSet(Arrays.asList(ints));
112 <            for (int i = 0; i < SIZE; ++i)
120 <                assertEquals(ints[i], q.pollFirst());
121 <        }
122 <        finally {}
107 >        Integer[] ints = new Integer[SIZE];
108 >        for (int i = 0; i < SIZE; ++i)
109 >            ints[i] = new Integer(i);
110 >        TreeSet q = new TreeSet(Arrays.asList(ints));
111 >        for (int i = 0; i < SIZE; ++i)
112 >            assertEquals(ints[i], q.pollFirst());
113      }
114  
115      /**
116       * The comparator used in constructor is used
117       */
118      public void testConstructor7() {
119 <        try {
120 <            MyReverseComparator cmp = new MyReverseComparator();
121 <            TreeSet q = new TreeSet(cmp);
122 <            assertEquals(cmp, q.comparator());
123 <            Integer[] ints = new Integer[SIZE];
124 <            for (int i = 0; i < SIZE; ++i)
125 <                ints[i] = new Integer(i);
126 <            q.addAll(Arrays.asList(ints));
127 <            for (int i = SIZE-1; i >= 0; --i)
138 <                assertEquals(ints[i], q.pollFirst());
139 <        }
140 <        finally {}
119 >        MyReverseComparator cmp = new MyReverseComparator();
120 >        TreeSet q = new TreeSet(cmp);
121 >        assertEquals(cmp, q.comparator());
122 >        Integer[] ints = new Integer[SIZE];
123 >        for (int i = 0; i < SIZE; ++i)
124 >            ints[i] = new Integer(i);
125 >        q.addAll(Arrays.asList(ints));
126 >        for (int i = SIZE-1; i >= 0; --i)
127 >            assertEquals(ints[i], q.pollFirst());
128      }
129  
130      /**
# Line 173 | Line 160 | public class TreeSetTest extends JSR166T
160       * add(null) throws NPE if nonempty
161       */
162      public void testAddNull() {
163 <        try {
163 >        try {
164              TreeSet q = populatedSet(SIZE);
165              q.add(null);
166              shouldThrow();
167 <        } catch (NullPointerException success) { }  
167 >        } catch (NullPointerException success) {}
168      }
169  
170      /**
# Line 208 | Line 195 | public class TreeSetTest extends JSR166T
195              q.add(new Object());
196              q.add(new Object());
197              shouldThrow();
198 <        }
212 <        catch(ClassCastException success) {}
198 >        } catch (ClassCastException success) {}
199      }
200  
201      /**
# Line 220 | Line 206 | public class TreeSetTest extends JSR166T
206              TreeSet q = new TreeSet();
207              q.addAll(null);
208              shouldThrow();
209 <        }
224 <        catch (NullPointerException success) {}
209 >        } catch (NullPointerException success) {}
210      }
211 +
212      /**
213       * addAll of a collection with null elements throws NPE
214       */
# Line 232 | Line 218 | public class TreeSetTest extends JSR166T
218              Integer[] ints = new Integer[SIZE];
219              q.addAll(Arrays.asList(ints));
220              shouldThrow();
221 <        }
236 <        catch (NullPointerException success) {}
221 >        } catch (NullPointerException success) {}
222      }
223 +
224      /**
225       * addAll of a collection with any null elements throws NPE after
226       * possibly adding some elements
# Line 247 | Line 233 | public class TreeSetTest extends JSR166T
233                  ints[i] = new Integer(i);
234              q.addAll(Arrays.asList(ints));
235              shouldThrow();
236 <        }
251 <        catch (NullPointerException success) {}
236 >        } catch (NullPointerException success) {}
237      }
238  
239      /**
240       * Set contains all elements of successful addAll
241       */
242      public void testAddAll5() {
243 <        try {
244 <            Integer[] empty = new Integer[0];
245 <            Integer[] ints = new Integer[SIZE];
246 <            for (int i = 0; i < SIZE; ++i)
247 <                ints[i] = new Integer(SIZE-1-i);
248 <            TreeSet q = new TreeSet();
249 <            assertFalse(q.addAll(Arrays.asList(empty)));
250 <            assertTrue(q.addAll(Arrays.asList(ints)));
251 <            for (int i = 0; i < SIZE; ++i)
267 <                assertEquals(new Integer(i), q.pollFirst());
268 <        }
269 <        finally {}
243 >        Integer[] empty = new Integer[0];
244 >        Integer[] ints = new Integer[SIZE];
245 >        for (int i = 0; i < SIZE; ++i)
246 >            ints[i] = new Integer(SIZE-1-i);
247 >        TreeSet q = new TreeSet();
248 >        assertFalse(q.addAll(Arrays.asList(empty)));
249 >        assertTrue(q.addAll(Arrays.asList(ints)));
250 >        for (int i = 0; i < SIZE; ++i)
251 >            assertEquals(new Integer(i), q.pollFirst());
252      }
253  
254      /**
# Line 275 | Line 257 | public class TreeSetTest extends JSR166T
257      public void testPollFirst() {
258          TreeSet q = populatedSet(SIZE);
259          for (int i = 0; i < SIZE; ++i) {
260 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
260 >            assertEquals(i, q.pollFirst());
261          }
262 <        assertNull(q.pollFirst());
262 >        assertNull(q.pollFirst());
263      }
264  
265      /**
# Line 286 | Line 268 | public class TreeSetTest extends JSR166T
268      public void testPollLast() {
269          TreeSet q = populatedSet(SIZE);
270          for (int i = SIZE-1; i >= 0; --i) {
271 <            assertEquals(i, ((Integer)q.pollLast()).intValue());
271 >            assertEquals(i, q.pollLast());
272          }
273 <        assertNull(q.pollFirst());
273 >        assertNull(q.pollFirst());
274      }
275  
276  
# Line 306 | Line 288 | public class TreeSetTest extends JSR166T
288          }
289          assertTrue(q.isEmpty());
290      }
291 <        
291 >
292      /**
293       * contains(x) reports true when elements added but not yet removed
294       */
# Line 382 | Line 364 | public class TreeSetTest extends JSR166T
364          }
365      }
366  
367 <    
367 >
368  
369      /**
370       * lower returns preceding element
# Line 400 | Line 382 | public class TreeSetTest extends JSR166T
382  
383          Object e4 = q.lower(zero);
384          assertNull(e4);
403
385      }
386  
387      /**
# Line 419 | Line 400 | public class TreeSetTest extends JSR166T
400  
401          Object e4 = q.higher(six);
402          assertNull(e4);
422
403      }
404  
405      /**
# Line 438 | Line 418 | public class TreeSetTest extends JSR166T
418  
419          Object e4 = q.floor(zero);
420          assertNull(e4);
441
421      }
422  
423      /**
# Line 457 | Line 436 | public class TreeSetTest extends JSR166T
436  
437          Object e4 = q.ceiling(six);
438          assertNull(e4);
460
439      }
440  
441      /**
442 <     * toArray contains all elements
442 >     * toArray contains all elements in sorted order
443       */
444      public void testToArray() {
445          TreeSet q = populatedSet(SIZE);
446 <        Object[] o = q.toArray();
447 <        Arrays.sort(o);
448 <        for(int i = 0; i < o.length; i++)
471 <            assertEquals(o[i], q.pollFirst());
446 >        Object[] o = q.toArray();
447 >        for (int i = 0; i < o.length; i++)
448 >            assertSame(o[i], q.pollFirst());
449      }
450  
451      /**
452 <     * toArray(a) contains all elements
452 >     * toArray(a) contains all elements in sorted order
453       */
454      public void testToArray2() {
455 <        TreeSet q = populatedSet(SIZE);
456 <        Integer[] ints = new Integer[SIZE];
457 <        ints = (Integer[])q.toArray(ints);
458 <        Arrays.sort(ints);
459 <        for(int i = 0; i < ints.length; i++)
460 <            assertEquals(ints[i], q.pollFirst());
455 >        TreeSet<Integer> q = populatedSet(SIZE);
456 >        Integer[] ints = new Integer[SIZE];
457 >        Integer[] array = q.toArray(ints);
458 >        assertSame(ints, array);
459 >        for (int i = 0; i < ints.length; i++)
460 >            assertSame(ints[i], q.pollFirst());
461      }
462 <    
462 >
463      /**
464       * iterator iterates through all elements
465       */
466      public void testIterator() {
467          TreeSet q = populatedSet(SIZE);
468          int i = 0;
469 <        Iterator it = q.iterator();
470 <        while(it.hasNext()) {
469 >        Iterator it = q.iterator();
470 >        while (it.hasNext()) {
471              assertTrue(q.contains(it.next()));
472              ++i;
473          }
# Line 503 | Line 480 | public class TreeSetTest extends JSR166T
480      public void testEmptyIterator() {
481          TreeSet q = new TreeSet();
482          int i = 0;
483 <        Iterator it = q.iterator();
484 <        while(it.hasNext()) {
483 >        Iterator it = q.iterator();
484 >        while (it.hasNext()) {
485              assertTrue(q.contains(it.next()));
486              ++i;
487          }
# Line 514 | Line 491 | public class TreeSetTest extends JSR166T
491      /**
492       * iterator.remove removes current element
493       */
494 <    public void testIteratorRemove () {
494 >    public void testIteratorRemove() {
495          final TreeSet q = new TreeSet();
496          q.add(new Integer(2));
497          q.add(new Integer(1));
# Line 540 | Line 517 | public class TreeSetTest extends JSR166T
517          for (int i = 0; i < SIZE; ++i) {
518              assertTrue(s.indexOf(String.valueOf(i)) >= 0);
519          }
520 <    }        
520 >    }
521  
522      /**
523 <     * A deserialized serialized set has same elements
523 >     * A deserialized serialized set has same elements
524       */
525 <    public void testSerialization() {
525 >    public void testSerialization() throws Exception {
526          TreeSet q = populatedSet(SIZE);
527 <        try {
528 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
529 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
530 <            out.writeObject(q);
531 <            out.close();
532 <
533 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
534 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
535 <            TreeSet r = (TreeSet)in.readObject();
536 <            assertEquals(q.size(), r.size());
537 <            while (!q.isEmpty())
561 <                assertEquals(q.pollFirst(), r.pollFirst());
562 <        } catch(Exception e){
563 <            e.printStackTrace();
564 <            unexpectedException();
565 <        }
527 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
528 >        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
529 >        out.writeObject(q);
530 >        out.close();
531 >
532 >        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
533 >        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
534 >        TreeSet r = (TreeSet)in.readObject();
535 >        assertEquals(q.size(), r.size());
536 >        while (!q.isEmpty())
537 >            assertEquals(q.pollFirst(), r.pollFirst());
538      }
539  
540      /**
# Line 690 | Line 662 | public class TreeSetTest extends JSR166T
662      /**
663       * Subsets of subsets subdivide correctly
664       */
665 <    public void testRecursiveSubSets() {
666 <        int setSize = 1000;
667 <        Class cl = TreeSet.class;
665 >    public void testRecursiveSubSets() throws Exception {
666 >        int setSize = expensiveTests ? 1000 : 100;
667 >        Class cl = TreeSet.class;
668  
669          NavigableSet<Integer> set = newSet(cl);
670          bs = new BitSet(setSize);
# Line 705 | Line 677 | public class TreeSetTest extends JSR166T
677          check(set,                 0, setSize - 1, true);
678          check(set.descendingSet(), 0, setSize - 1, false);
679  
680 <        bashSubSet(set.navigableSubSet(0, true, setSize, false),
680 >        bashSubSet(set.subSet(0, true, setSize, false),
681                     0, setSize - 1, true);
682      }
683  
684 <    static NavigableSet<Integer> newSet(Class cl) {
685 <        NavigableSet<Integer> result = null;
714 <        try {
715 <            result = (NavigableSet<Integer>) cl.newInstance();
716 <        } catch(Exception e) {
717 <            fail();
718 <        }
684 >    static NavigableSet<Integer> newSet(Class cl) throws Exception {
685 >        NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
686          assertEquals(result.size(), 0);
687          assertFalse(result.iterator().hasNext());
688          return result;
# Line 738 | Line 705 | public class TreeSetTest extends JSR166T
705          }
706  
707          // Remove a bunch of entries with iterator
708 <        for(Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
708 >        for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
709              if (rnd.nextBoolean()) {
710                  bs.clear(it.next());
711                  it.remove();
# Line 763 | Line 730 | public class TreeSetTest extends JSR166T
730          }
731  
732          // Remove a bunch of entries with iterator
733 <        for(Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
733 >        for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
734              if (rnd.nextBoolean()) {
735                  bs.clear(it.next());
736                  it.remove();
# Line 778 | Line 745 | public class TreeSetTest extends JSR166T
745              } else {
746                  try {
747                      set.add(element);
748 <                    fail();
749 <                } catch(IllegalArgumentException e) {
783 <                    // expected
784 <                }
748 >                    shouldThrow();
749 >                } catch (IllegalArgumentException success) {}
750              }
751          }
752      }
# Line 812 | Line 777 | public class TreeSetTest extends JSR166T
777  
778          // headSet - pick direction and endpoint inclusion randomly
779          boolean incl = rnd.nextBoolean();
780 <        NavigableSet<Integer> hm = set.navigableHeadSet(midPoint, incl);
780 >        NavigableSet<Integer> hm = set.headSet(midPoint, incl);
781          if (ascending) {
782              if (rnd.nextBoolean())
783                  bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true);
# Line 829 | Line 794 | public class TreeSetTest extends JSR166T
794  
795          // tailSet - pick direction and endpoint inclusion randomly
796          incl = rnd.nextBoolean();
797 <        NavigableSet<Integer> tm = set.navigableTailSet(midPoint,incl);
797 >        NavigableSet<Integer> tm = set.tailSet(midPoint,incl);
798          if (ascending) {
799              if (rnd.nextBoolean())
800                  bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true);
# Line 854 | Line 819 | public class TreeSetTest extends JSR166T
819          boolean lowIncl = rnd.nextBoolean();
820          boolean highIncl = rnd.nextBoolean();
821          if (ascending) {
822 <            NavigableSet<Integer> sm = set.navigableSubSet(
822 >            NavigableSet<Integer> sm = set.subSet(
823                  endpoints[0], lowIncl, endpoints[1], highIncl);
824              if (rnd.nextBoolean())
825                  bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
# Line 863 | Line 828 | public class TreeSetTest extends JSR166T
828                  bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1),
829                             endpoints[1] - (highIncl ? 0 : 1), false);
830          } else {
831 <            NavigableSet<Integer> sm = set.navigableSubSet(
831 >            NavigableSet<Integer> sm = set.subSet(
832                  endpoints[1], highIncl, endpoints[0], lowIncl);
833              if (rnd.nextBoolean())
834                  bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
# Line 914 | Line 879 | public class TreeSetTest extends JSR166T
879                  // BitSet should support this! Test would run much faster
880                  while (element >= min) {
881                      if (bs.get(element))
882 <                        return(element);
882 >                        return element;
883                      element--;
884                  }
885                  return -1;
# Line 980 | Line 945 | public class TreeSetTest extends JSR166T
945              assertEq(rs.last(),  -1);
946              try {
947                  set.first();
948 <                fail();
949 <            } catch(NoSuchElementException e) {
985 <                // expected
986 <            }
948 >                shouldThrow();
949 >            } catch (NoSuchElementException success) {}
950              try {
951                  set.last();
952 <                fail();
953 <            } catch(NoSuchElementException e) {
991 <                // expected
992 <            }
952 >                shouldThrow();
953 >            } catch (NoSuchElementException success) {}
954          }
955      }
956  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines