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.11 by jsr166, Sun Nov 22 18:57:17 2009 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 39 | Line 35 | public class TreeSetTest extends JSR166T
35      private TreeSet populatedSet(int n) {
36          TreeSet q = new TreeSet();
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       * addAll of a collection with null elements throws NPE
# Line 232 | Line 217 | public class TreeSetTest extends JSR166T
217              Integer[] ints = new Integer[SIZE];
218              q.addAll(Arrays.asList(ints));
219              shouldThrow();
220 <        }
236 <        catch (NullPointerException success) {}
220 >        } catch (NullPointerException success) {}
221      }
222      /**
223       * addAll of a collection with any null elements throws NPE after
# Line 247 | Line 231 | public class TreeSetTest extends JSR166T
231                  ints[i] = new Integer(i);
232              q.addAll(Arrays.asList(ints));
233              shouldThrow();
234 <        }
251 <        catch (NullPointerException success) {}
234 >        } catch (NullPointerException success) {}
235      }
236  
237      /**
238       * Set contains all elements of successful addAll
239       */
240      public void testAddAll5() {
241 <        try {
242 <            Integer[] empty = new Integer[0];
243 <            Integer[] ints = new Integer[SIZE];
244 <            for (int i = 0; i < SIZE; ++i)
245 <                ints[i] = new Integer(SIZE-1-i);
246 <            TreeSet q = new TreeSet();
247 <            assertFalse(q.addAll(Arrays.asList(empty)));
248 <            assertTrue(q.addAll(Arrays.asList(ints)));
249 <            for (int i = 0; i < SIZE; ++i)
267 <                assertEquals(new Integer(i), q.pollFirst());
268 <        }
269 <        finally {}
241 >        Integer[] empty = new Integer[0];
242 >        Integer[] ints = new Integer[SIZE];
243 >        for (int i = 0; i < SIZE; ++i)
244 >            ints[i] = new Integer(SIZE-1-i);
245 >        TreeSet q = new TreeSet();
246 >        assertFalse(q.addAll(Arrays.asList(empty)));
247 >        assertTrue(q.addAll(Arrays.asList(ints)));
248 >        for (int i = 0; i < SIZE; ++i)
249 >            assertEquals(new Integer(i), q.pollFirst());
250      }
251  
252      /**
# Line 275 | Line 255 | public class TreeSetTest extends JSR166T
255      public void testPollFirst() {
256          TreeSet q = populatedSet(SIZE);
257          for (int i = 0; i < SIZE; ++i) {
258 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
258 >            assertEquals(i, q.pollFirst());
259          }
260 <        assertNull(q.pollFirst());
260 >        assertNull(q.pollFirst());
261      }
262  
263      /**
# Line 286 | Line 266 | public class TreeSetTest extends JSR166T
266      public void testPollLast() {
267          TreeSet q = populatedSet(SIZE);
268          for (int i = SIZE-1; i >= 0; --i) {
269 <            assertEquals(i, ((Integer)q.pollLast()).intValue());
269 >            assertEquals(i, q.pollLast());
270          }
271 <        assertNull(q.pollFirst());
271 >        assertNull(q.pollFirst());
272      }
273  
274  
# Line 306 | Line 286 | public class TreeSetTest extends JSR166T
286          }
287          assertTrue(q.isEmpty());
288      }
289 <        
289 >
290      /**
291       * contains(x) reports true when elements added but not yet removed
292       */
# Line 382 | Line 362 | public class TreeSetTest extends JSR166T
362          }
363      }
364  
365 <    
365 >
366  
367      /**
368       * lower returns preceding element
# Line 465 | Line 445 | public class TreeSetTest extends JSR166T
445       */
446      public void testToArray() {
447          TreeSet q = populatedSet(SIZE);
448 <        Object[] o = q.toArray();
448 >        Object[] o = q.toArray();
449          Arrays.sort(o);
450 <        for(int i = 0; i < o.length; i++)
451 <            assertEquals(o[i], q.pollFirst());
450 >        for (int i = 0; i < o.length; i++)
451 >            assertEquals(o[i], q.pollFirst());
452      }
453  
454      /**
# Line 476 | Line 456 | public class TreeSetTest extends JSR166T
456       */
457      public void testToArray2() {
458          TreeSet q = populatedSet(SIZE);
459 <        Integer[] ints = new Integer[SIZE];
460 <        ints = (Integer[])q.toArray(ints);
459 >        Integer[] ints = new Integer[SIZE];
460 >        ints = (Integer[])q.toArray(ints);
461          Arrays.sort(ints);
462 <        for(int i = 0; i < ints.length; i++)
462 >        for (int i = 0; i < ints.length; i++)
463              assertEquals(ints[i], q.pollFirst());
464      }
465 <    
465 >
466      /**
467       * iterator iterates through all elements
468       */
469      public void testIterator() {
470          TreeSet q = populatedSet(SIZE);
471          int i = 0;
472 <        Iterator it = q.iterator();
473 <        while(it.hasNext()) {
472 >        Iterator it = q.iterator();
473 >        while (it.hasNext()) {
474              assertTrue(q.contains(it.next()));
475              ++i;
476          }
# Line 503 | Line 483 | public class TreeSetTest extends JSR166T
483      public void testEmptyIterator() {
484          TreeSet q = new TreeSet();
485          int i = 0;
486 <        Iterator it = q.iterator();
487 <        while(it.hasNext()) {
486 >        Iterator it = q.iterator();
487 >        while (it.hasNext()) {
488              assertTrue(q.contains(it.next()));
489              ++i;
490          }
# Line 540 | Line 520 | public class TreeSetTest extends JSR166T
520          for (int i = 0; i < SIZE; ++i) {
521              assertTrue(s.indexOf(String.valueOf(i)) >= 0);
522          }
523 <    }        
523 >    }
524  
525      /**
526 <     * A deserialized serialized set has same elements
526 >     * A deserialized serialized set has same elements
527       */
528 <    public void testSerialization() {
528 >    public void testSerialization() throws Exception {
529          TreeSet q = populatedSet(SIZE);
530 <        try {
531 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
532 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
533 <            out.writeObject(q);
534 <            out.close();
535 <
536 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
537 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
538 <            TreeSet r = (TreeSet)in.readObject();
539 <            assertEquals(q.size(), r.size());
540 <            while (!q.isEmpty())
561 <                assertEquals(q.pollFirst(), r.pollFirst());
562 <        } catch(Exception e){
563 <            e.printStackTrace();
564 <            unexpectedException();
565 <        }
530 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
531 >        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
532 >        out.writeObject(q);
533 >        out.close();
534 >
535 >        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
536 >        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
537 >        TreeSet r = (TreeSet)in.readObject();
538 >        assertEquals(q.size(), r.size());
539 >        while (!q.isEmpty())
540 >            assertEquals(q.pollFirst(), r.pollFirst());
541      }
542  
543      /**
# Line 690 | Line 665 | public class TreeSetTest extends JSR166T
665      /**
666       * Subsets of subsets subdivide correctly
667       */
668 <    public void testRecursiveSubSets() {
669 <        int setSize = 1000;
670 <        Class cl = TreeSet.class;
668 >    public void testRecursiveSubSets() throws Exception {
669 >        int setSize = 1000;
670 >        Class cl = TreeSet.class;
671  
672          NavigableSet<Integer> set = newSet(cl);
673          bs = new BitSet(setSize);
# Line 705 | Line 680 | public class TreeSetTest extends JSR166T
680          check(set,                 0, setSize - 1, true);
681          check(set.descendingSet(), 0, setSize - 1, false);
682  
683 <        bashSubSet(set.navigableSubSet(0, true, setSize, false),
683 >        bashSubSet(set.subSet(0, true, setSize, false),
684                     0, setSize - 1, true);
685      }
686  
687 <    static NavigableSet<Integer> newSet(Class cl) {
688 <        NavigableSet<Integer> result = null;
714 <        try {
715 <            result = (NavigableSet<Integer>) cl.newInstance();
716 <        } catch(Exception e) {
717 <            fail();
718 <        }
687 >    static NavigableSet<Integer> newSet(Class cl) throws Exception {
688 >        NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
689          assertEquals(result.size(), 0);
690          assertFalse(result.iterator().hasNext());
691          return result;
# Line 738 | Line 708 | public class TreeSetTest extends JSR166T
708          }
709  
710          // Remove a bunch of entries with iterator
711 <        for(Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
711 >        for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
712              if (rnd.nextBoolean()) {
713                  bs.clear(it.next());
714                  it.remove();
# Line 763 | Line 733 | public class TreeSetTest extends JSR166T
733          }
734  
735          // Remove a bunch of entries with iterator
736 <        for(Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
736 >        for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
737              if (rnd.nextBoolean()) {
738                  bs.clear(it.next());
739                  it.remove();
# Line 778 | Line 748 | public class TreeSetTest extends JSR166T
748              } else {
749                  try {
750                      set.add(element);
751 <                    fail();
752 <                } catch(IllegalArgumentException e) {
783 <                    // expected
784 <                }
751 >                    shouldThrow();
752 >                } catch (IllegalArgumentException success) {}
753              }
754          }
755      }
# Line 812 | Line 780 | public class TreeSetTest extends JSR166T
780  
781          // headSet - pick direction and endpoint inclusion randomly
782          boolean incl = rnd.nextBoolean();
783 <        NavigableSet<Integer> hm = set.navigableHeadSet(midPoint, incl);
783 >        NavigableSet<Integer> hm = set.headSet(midPoint, incl);
784          if (ascending) {
785              if (rnd.nextBoolean())
786                  bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true);
# Line 829 | Line 797 | public class TreeSetTest extends JSR166T
797  
798          // tailSet - pick direction and endpoint inclusion randomly
799          incl = rnd.nextBoolean();
800 <        NavigableSet<Integer> tm = set.navigableTailSet(midPoint,incl);
800 >        NavigableSet<Integer> tm = set.tailSet(midPoint,incl);
801          if (ascending) {
802              if (rnd.nextBoolean())
803                  bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true);
# Line 854 | Line 822 | public class TreeSetTest extends JSR166T
822          boolean lowIncl = rnd.nextBoolean();
823          boolean highIncl = rnd.nextBoolean();
824          if (ascending) {
825 <            NavigableSet<Integer> sm = set.navigableSubSet(
825 >            NavigableSet<Integer> sm = set.subSet(
826                  endpoints[0], lowIncl, endpoints[1], highIncl);
827              if (rnd.nextBoolean())
828                  bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
# Line 863 | Line 831 | public class TreeSetTest extends JSR166T
831                  bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1),
832                             endpoints[1] - (highIncl ? 0 : 1), false);
833          } else {
834 <            NavigableSet<Integer> sm = set.navigableSubSet(
834 >            NavigableSet<Integer> sm = set.subSet(
835                  endpoints[1], highIncl, endpoints[0], lowIncl);
836              if (rnd.nextBoolean())
837                  bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
# Line 980 | Line 948 | public class TreeSetTest extends JSR166T
948              assertEq(rs.last(),  -1);
949              try {
950                  set.first();
951 <                fail();
952 <            } catch(NoSuchElementException e) {
985 <                // expected
986 <            }
951 >                shouldThrow();
952 >            } catch (NoSuchElementException success) {}
953              try {
954                  set.last();
955 <                fail();
956 <            } catch(NoSuchElementException e) {
991 <                // expected
992 <            }
955 >                shouldThrow();
956 >            } catch (NoSuchElementException success) {}
957          }
958      }
959  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines