ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/TreeSubSetTest.java
(Generate patch)

Comparing jsr166/src/test/tck/TreeSubSetTest.java (file contents):
Revision 1.11 by jsr166, Tue Dec 1 09:43:19 2009 UTC vs.
Revision 1.17 by jsr166, Thu Nov 18 20:21:54 2010 UTC

# Line 11 | Line 11 | import java.io.*;
11  
12   public class TreeSubSetTest 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(TreeSubSetTest.class);
# Line 27 | Line 27 | public class TreeSubSetTest extends JSR1
27       * Create a set of given size containing consecutive
28       * Integers 0 ... n.
29       */
30 <    private NavigableSet populatedSet(int n) {
31 <        TreeSet q = new TreeSet();
30 >    private NavigableSet<Integer> populatedSet(int n) {
31 >        TreeSet<Integer> q = new TreeSet<Integer>();
32          assertTrue(q.isEmpty());
33  
34          for (int i = n-1; i >= 0; i-=2)
# Line 175 | Line 175 | public class TreeSubSetTest extends JSR1
175              shouldThrow();
176          } catch (NullPointerException success) {}
177      }
178 +
179      /**
180       * addAll of a collection with null elements throws NPE
181       */
# Line 186 | Line 187 | public class TreeSubSetTest extends JSR1
187              shouldThrow();
188          } catch (NullPointerException success) {}
189      }
190 +
191      /**
192       * addAll of a collection with any null elements throws NPE after
193       * possibly adding some elements
# Line 233 | Line 235 | public class TreeSubSetTest extends JSR1
235      public void testRemoveElement() {
236          NavigableSet q = populatedSet(SIZE);
237          for (int i = 1; i < SIZE; i+=2) {
238 <            assertTrue(q.remove(new Integer(i)));
238 >            assertTrue(q.contains(i));
239 >            assertTrue(q.remove(i));
240 >            assertFalse(q.contains(i));
241 >            assertTrue(q.contains(i-1));
242          }
243          for (int i = 0; i < SIZE; i+=2) {
244 <            assertTrue(q.remove(new Integer(i)));
245 <            assertFalse(q.remove(new Integer(i+1)));
244 >            assertTrue(q.contains(i));
245 >            assertTrue(q.remove(i));
246 >            assertFalse(q.contains(i));
247 >            assertFalse(q.remove(i+1));
248 >            assertFalse(q.contains(i+1));
249          }
250          assertTrue(q.isEmpty());
251      }
# Line 392 | Line 400 | public class TreeSubSetTest extends JSR1
400      }
401  
402      /**
403 <     * toArray contains all elements
403 >     * toArray contains all elements in sorted order
404       */
405      public void testToArray() {
406          NavigableSet q = populatedSet(SIZE);
407          Object[] o = q.toArray();
400 –        Arrays.sort(o);
408          for (int i = 0; i < o.length; i++)
409 <            assertEquals(o[i], q.pollFirst());
409 >            assertSame(o[i], q.pollFirst());
410      }
411  
412      /**
413 <     * toArray(a) contains all elements
413 >     * toArray(a) contains all elements in sorted order
414       */
415      public void testToArray2() {
416 <        NavigableSet q = populatedSet(SIZE);
416 >        NavigableSet<Integer> q = populatedSet(SIZE);
417          Integer[] ints = new Integer[SIZE];
418 <        ints = (Integer[])q.toArray(ints);
419 <        Arrays.sort(ints);
418 >        Integer[] array = q.toArray(ints);
419 >        assertSame(ints, array);
420          for (int i = 0; i < ints.length; i++)
421 <            assertEquals(ints[i], q.pollFirst());
421 >            assertSame(ints[i], q.pollFirst());
422      }
423  
424      /**
# Line 445 | Line 452 | public class TreeSubSetTest extends JSR1
452      /**
453       * iterator.remove removes current element
454       */
455 <    public void testIteratorRemove () {
455 >    public void testIteratorRemove() {
456          final NavigableSet q = set0();
457          q.add(new Integer(2));
458          q.add(new Integer(1));
# Line 666 | Line 673 | public class TreeSubSetTest extends JSR1
673              shouldThrow();
674          } catch (NullPointerException success) {}
675      }
676 +
677      /**
678       * addAll of a collection with null elements throws NPE
679       */
# Line 677 | Line 685 | public class TreeSubSetTest extends JSR1
685              shouldThrow();
686          } catch (NullPointerException success) {}
687      }
688 +
689      /**
690       * addAll of a collection with any null elements throws NPE after
691       * possibly adding some elements
# Line 899 | Line 908 | public class TreeSubSetTest extends JSR1
908      public void testDescendingToArray2() {
909          NavigableSet q = populatedSet(SIZE);
910          Integer[] ints = new Integer[SIZE];
911 <        ints = (Integer[])q.toArray(ints);
911 >        assertSame(ints, q.toArray(ints));
912          Arrays.sort(ints);
913          for (int i = 0; i < ints.length; i++)
914              assertEquals(ints[i], q.pollFirst());
# Line 936 | Line 945 | public class TreeSubSetTest extends JSR1
945      /**
946       * iterator.remove removes current element
947       */
948 <    public void testDescendingIteratorRemove () {
948 >    public void testDescendingIteratorRemove() {
949          final NavigableSet q = dset0();
950          q.add(new Integer(2));
951          q.add(new Integer(1));

Diff Legend

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