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.9 by jsr166, Sat Nov 21 10:29:50 2009 UTC vs.
Revision 1.10 by jsr166, Sun Nov 22 18:57:17 2009 UTC

# Line 19 | Line 19 | public class TreeSubSetTest extends JSR1
19  
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 104 | Line 100 | public class TreeSubSetTest extends JSR1
100      public void testEmpty() {
101          NavigableSet q = set0();
102          assertTrue(q.isEmpty());
103 <        q.add(new Integer(1));
103 >        assertTrue(q.add(new Integer(1)));
104          assertFalse(q.isEmpty());
105 <        q.add(new Integer(2));
105 >        assertTrue(q.add(new Integer(2)));
106          q.pollFirst();
107          q.pollFirst();
108          assertTrue(q.isEmpty());
# Line 226 | Line 222 | public class TreeSubSetTest extends JSR1
222      public void testPoll() {
223          NavigableSet q = populatedSet(SIZE);
224          for (int i = 0; i < SIZE; ++i) {
225 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
225 >            assertEquals(i, q.pollFirst());
226          }
227          assertNull(q.pollFirst());
228      }
# Line 266 | Line 262 | public class TreeSubSetTest extends JSR1
262          q.clear();
263          assertTrue(q.isEmpty());
264          assertEquals(0, q.size());
265 <        q.add(new Integer(1));
265 >        assertTrue(q.add(new Integer(1)));
266          assertFalse(q.isEmpty());
267          q.clear();
268          assertTrue(q.isEmpty());
# Line 464 | Line 460 | public class TreeSubSetTest extends JSR1
460          it.remove();
461  
462          it = q.iterator();
463 <        assertEquals(it.next(), new Integer(2));
464 <        assertEquals(it.next(), new Integer(3));
463 >        assertEquals(it.next(), 2);
464 >        assertEquals(it.next(), 3);
465          assertFalse(it.hasNext());
466      }
467  
# Line 721 | Line 717 | public class TreeSubSetTest extends JSR1
717      public void testDescendingPoll() {
718          NavigableSet q = populatedSet(SIZE);
719          for (int i = 0; i < SIZE; ++i) {
720 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
720 >            assertEquals(i, q.pollFirst());
721          }
722          assertNull(q.pollFirst());
723      }
# Line 761 | Line 757 | public class TreeSubSetTest extends JSR1
757          q.clear();
758          assertTrue(q.isEmpty());
759          assertEquals(0, q.size());
760 <        q.add(new Integer(1));
760 >        assertTrue(q.add(new Integer(1)));
761          assertFalse(q.isEmpty());
762          q.clear();
763          assertTrue(q.isEmpty());
# Line 959 | Line 955 | public class TreeSubSetTest extends JSR1
955          it.remove();
956  
957          it = q.iterator();
958 <        assertEquals(it.next(), new Integer(2));
959 <        assertEquals(it.next(), new Integer(3));
958 >        assertEquals(it.next(), 2);
959 >        assertEquals(it.next(), 3);
960          assertFalse(it.hasNext());
961      }
962  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines