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.42 by jsr166, Sun May 24 01:42:14 2015 UTC vs.
Revision 1.48 by jsr166, Mon May 28 21:51:44 2018 UTC

# Line 40 | Line 40 | public class TreeSetTest extends JSR166T
40  
41      /**
42       * Returns a new set of given size containing consecutive
43 <     * Integers 0 ... n.
43 >     * Integers 0 ... n - 1.
44       */
45 <    private TreeSet<Integer> populatedSet(int n) {
46 <        TreeSet<Integer> q = new TreeSet<Integer>();
45 >    private static TreeSet<Integer> populatedSet(int n) {
46 >        TreeSet<Integer> q = new TreeSet<>();
47          assertTrue(q.isEmpty());
48          for (int i = n - 1; i >= 0; i -= 2)
49              assertTrue(q.add(new Integer(i)));
# Line 57 | Line 57 | public class TreeSetTest extends JSR166T
57      /**
58       * Returns a new set of first 5 ints.
59       */
60 <    private TreeSet set5() {
60 >    private static TreeSet set5() {
61          TreeSet q = new TreeSet();
62          assertTrue(q.isEmpty());
63          q.add(one);
# Line 454 | Line 454 | public class TreeSetTest extends JSR166T
454       */
455      public void testToArray() {
456          TreeSet q = populatedSet(SIZE);
457 <        Object[] o = q.toArray();
458 <        for (int i = 0; i < o.length; i++)
459 <            assertSame(o[i], q.pollFirst());
457 >        Object[] a = q.toArray();
458 >        assertSame(Object[].class, a.getClass());
459 >        for (Object o : a)
460 >            assertSame(o, q.pollFirst());
461 >        assertTrue(q.isEmpty());
462      }
463  
464      /**
# Line 467 | Line 469 | public class TreeSetTest extends JSR166T
469          Integer[] ints = new Integer[SIZE];
470          Integer[] array = q.toArray(ints);
471          assertSame(ints, array);
472 <        for (int i = 0; i < ints.length; i++)
473 <            assertSame(ints[i], q.pollFirst());
472 >        for (Integer o : ints)
473 >            assertSame(o, q.pollFirst());
474 >        assertTrue(q.isEmpty());
475      }
476  
477      /**
# Line 522 | Line 525 | public class TreeSetTest extends JSR166T
525      }
526  
527      /**
528 <     * A deserialized serialized set has same elements
528 >     * A deserialized/reserialized set equals original
529       */
530      public void testSerialization() throws Exception {
531          NavigableSet x = populatedSet(SIZE);
# Line 695 | Line 698 | public class TreeSetTest extends JSR166T
698      }
699  
700      static NavigableSet<Integer> newSet(Class cl) throws Exception {
701 <        NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
701 >        NavigableSet<Integer> result =
702 >            (NavigableSet<Integer>) cl.getConstructor().newInstance();
703          assertEquals(0, result.size());
704          assertFalse(result.iterator().hasNext());
705          return result;

Diff Legend

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