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.8 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.9 by jsr166, Sat Nov 21 10:29:50 2009 UTC

# Line 108 | Line 108 | public class TreeSetTest extends JSR166T
108       * Set contains all elements of collection used to initialize
109       */
110      public void testConstructor6() {
111 <        try {
112 <            Integer[] ints = new Integer[SIZE];
113 <            for (int i = 0; i < SIZE; ++i)
114 <                ints[i] = new Integer(i);
115 <            TreeSet q = new TreeSet(Arrays.asList(ints));
116 <            for (int i = 0; i < SIZE; ++i)
117 <                assertEquals(ints[i], q.pollFirst());
118 <        }
119 <        finally {}
111 >        Integer[] ints = new Integer[SIZE];
112 >        for (int i = 0; i < SIZE; ++i)
113 >            ints[i] = new Integer(i);
114 >        TreeSet q = new TreeSet(Arrays.asList(ints));
115 >        for (int i = 0; i < SIZE; ++i)
116 >            assertEquals(ints[i], q.pollFirst());
117      }
118  
119      /**
120       * The comparator used in constructor is used
121       */
122      public void testConstructor7() {
123 <        try {
124 <            MyReverseComparator cmp = new MyReverseComparator();
125 <            TreeSet q = new TreeSet(cmp);
126 <            assertEquals(cmp, q.comparator());
127 <            Integer[] ints = new Integer[SIZE];
128 <            for (int i = 0; i < SIZE; ++i)
129 <                ints[i] = new Integer(i);
130 <            q.addAll(Arrays.asList(ints));
131 <            for (int i = SIZE-1; i >= 0; --i)
135 <                assertEquals(ints[i], q.pollFirst());
136 <        }
137 <        finally {}
123 >        MyReverseComparator cmp = new MyReverseComparator();
124 >        TreeSet q = new TreeSet(cmp);
125 >        assertEquals(cmp, q.comparator());
126 >        Integer[] ints = new Integer[SIZE];
127 >        for (int i = 0; i < SIZE; ++i)
128 >            ints[i] = new Integer(i);
129 >        q.addAll(Arrays.asList(ints));
130 >        for (int i = SIZE-1; i >= 0; --i)
131 >            assertEquals(ints[i], q.pollFirst());
132      }
133  
134      /**
# Line 248 | Line 242 | public class TreeSetTest extends JSR166T
242       * Set contains all elements of successful addAll
243       */
244      public void testAddAll5() {
245 <        try {
246 <            Integer[] empty = new Integer[0];
247 <            Integer[] ints = new Integer[SIZE];
248 <            for (int i = 0; i < SIZE; ++i)
249 <                ints[i] = new Integer(SIZE-1-i);
250 <            TreeSet q = new TreeSet();
251 <            assertFalse(q.addAll(Arrays.asList(empty)));
252 <            assertTrue(q.addAll(Arrays.asList(ints)));
253 <            for (int i = 0; i < SIZE; ++i)
260 <                assertEquals(new Integer(i), q.pollFirst());
261 <        }
262 <        finally {}
245 >        Integer[] empty = new Integer[0];
246 >        Integer[] ints = new Integer[SIZE];
247 >        for (int i = 0; i < SIZE; ++i)
248 >            ints[i] = new Integer(SIZE-1-i);
249 >        TreeSet q = new TreeSet();
250 >        assertFalse(q.addAll(Arrays.asList(empty)));
251 >        assertTrue(q.addAll(Arrays.asList(ints)));
252 >        for (int i = 0; i < SIZE; ++i)
253 >            assertEquals(new Integer(i), q.pollFirst());
254      }
255  
256      /**

Diff Legend

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