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.13 by jsr166, Wed Aug 25 01:44:48 2010 UTC vs.
Revision 1.16 by jsr166, Fri Nov 5 00:17:22 2010 UTC

# 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 394 | Line 394 | public class TreeSubSetTest extends JSR1
394      }
395  
396      /**
397 <     * toArray contains all elements
397 >     * toArray contains all elements in sorted order
398       */
399      public void testToArray() {
400          NavigableSet q = populatedSet(SIZE);
401          Object[] o = q.toArray();
402 –        Arrays.sort(o);
402          for (int i = 0; i < o.length; i++)
403 <            assertEquals(o[i], q.pollFirst());
403 >            assertSame(o[i], q.pollFirst());
404      }
405  
406      /**
407 <     * toArray(a) contains all elements
407 >     * toArray(a) contains all elements in sorted order
408       */
409      public void testToArray2() {
410 <        NavigableSet q = populatedSet(SIZE);
410 >        NavigableSet<Integer> q = populatedSet(SIZE);
411          Integer[] ints = new Integer[SIZE];
412 <        ints = (Integer[])q.toArray(ints);
413 <        Arrays.sort(ints);
412 >        Integer[] array = q.toArray(ints);
413 >        assertSame(ints, array);
414          for (int i = 0; i < ints.length; i++)
415 <            assertEquals(ints[i], q.pollFirst());
415 >            assertSame(ints[i], q.pollFirst());
416      }
417  
418      /**
# Line 680 | Line 679 | public class TreeSubSetTest extends JSR1
679              shouldThrow();
680          } catch (NullPointerException success) {}
681      }
682 <
682 >
683      /**
684       * addAll of a collection with any null elements throws NPE after
685       * possibly adding some elements
# Line 903 | Line 902 | public class TreeSubSetTest extends JSR1
902      public void testDescendingToArray2() {
903          NavigableSet q = populatedSet(SIZE);
904          Integer[] ints = new Integer[SIZE];
905 <        ints = (Integer[])q.toArray(ints);
905 >        assertSame(ints, q.toArray(ints));
906          Arrays.sort(ints);
907          for (int i = 0; i < ints.length; i++)
908              assertEquals(ints[i], q.pollFirst());

Diff Legend

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