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

Comparing jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java (file contents):
Revision 1.11 by jsr166, Sat Nov 21 17:38:05 2009 UTC vs.
Revision 1.12 by jsr166, Tue Dec 1 06:03:49 2009 UTC

# Line 649 | Line 649 | public class ConcurrentSkipListSubMapTes
649          assertEquals(1, sm.size());
650          assertEquals(three, sm.firstKey());
651          assertEquals(three, sm.lastKey());
652 <        assertTrue(sm.remove(three) != null);
652 >        assertEquals("C", sm.remove(three));
653          assertTrue(sm.isEmpty());
654          assertEquals(3, map.size());
655      }
# Line 677 | Line 677 | public class ConcurrentSkipListSubMapTes
677          assertEquals(4, map.size());
678          assertEquals(0, sm.size());
679          assertTrue(sm.isEmpty());
680 <        assertTrue(sm.remove(three) == null);
680 >        assertSame(sm.remove(three), null);
681          assertEquals(4, map.size());
682      }
683  
# Line 749 | Line 749 | public class ConcurrentSkipListSubMapTes
749          SortedMap ssm = sm.tailMap(four);
750          assertEquals(four, ssm.firstKey());
751          assertEquals(five, ssm.lastKey());
752 <        assertTrue(ssm.remove(four) != null);
752 >        assertEquals("D", ssm.remove(four));
753          assertEquals(1, ssm.size());
754          assertEquals(3, sm.size());
755          assertEquals(4, map.size());
# Line 1340 | Line 1340 | public class ConcurrentSkipListSubMapTes
1340          assertEquals(1, sm.size());
1341          assertEquals(m3, sm.firstKey());
1342          assertEquals(m3, sm.lastKey());
1343 <        assertTrue(sm.remove(m3) != null);
1343 >        assertEquals("C", sm.remove(m3));
1344          assertTrue(sm.isEmpty());
1345          assertEquals(3, map.size());
1346      }
# Line 1368 | Line 1368 | public class ConcurrentSkipListSubMapTes
1368          assertEquals(4, map.size());
1369          assertEquals(0, sm.size());
1370          assertTrue(sm.isEmpty());
1371 <        assertTrue(sm.remove(m3) == null);
1371 >        assertSame(sm.remove(m3), null);
1372          assertEquals(4, map.size());
1373      }
1374  
# Line 1440 | Line 1440 | public class ConcurrentSkipListSubMapTes
1440          SortedMap ssm = sm.tailMap(m4);
1441          assertEquals(m4, ssm.firstKey());
1442          assertEquals(m5, ssm.lastKey());
1443 <        assertTrue(ssm.remove(m4) != null);
1443 >        assertEquals("D", ssm.remove(m4));
1444          assertEquals(1, ssm.size());
1445          assertEquals(3, sm.size());
1446          assertEquals(4, map.size());

Diff Legend

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