ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/TreeSubMapTest.java

Comparing jsr166/src/test/tck/TreeSubMapTest.java (file contents):
Revision 1.9 by jsr166, Sat Nov 21 17:38:06 2009 UTC vs.
Revision 1.11 by jsr166, Tue Dec 1 09:44:58 2009 UTC

#	Line 246 | Line 246 | public class TreeSubMapTest extends JSR1
246
247		Map.Entry e4 = map.lowerEntry(zero);
248		assertNull(e4);
249	–
249		}
250
251		/**
#	Line 265 | Line 264 | public class TreeSubMapTest extends JSR1
264
265		Map.Entry e4 = map.higherEntry(six);
266		assertNull(e4);
268	–
267		}
268
269		/**
#	Line 284 | Line 282 | public class TreeSubMapTest extends JSR1
282
283		Map.Entry e4 = map.floorEntry(zero);
284		assertNull(e4);
287	–
285		}
286
287		/**
#	Line 303 | Line 300 | public class TreeSubMapTest extends JSR1
300
301		Map.Entry e4 = map.ceilingEntry(six);
302		assertNull(e4);
306	–
303		}
304
305		/**
#	Line 481 | Line 477 | public class TreeSubMapTest extends JSR1
477		assertEquals(1, sm.size());
478		assertEquals(three, sm.firstKey());
479		assertEquals(three, sm.lastKey());
480	<	assertTrue(sm.remove(three) != null);
480	>	assertEquals("C", sm.remove(three));
481		assertTrue(sm.isEmpty());
482		assertEquals(3, map.size());
483		}
#	Line 509 | Line 505 | public class TreeSubMapTest extends JSR1
505		assertEquals(4, map.size());
506		assertEquals(0, sm.size());
507		assertTrue(sm.isEmpty());
508	<	assertTrue(sm.remove(three) == null);
508	>	assertSame(sm.remove(three), null);
509		assertEquals(4, map.size());
510		}
511
#	Line 581 | Line 577 | public class TreeSubMapTest extends JSR1
577		SortedMap ssm = sm.tailMap(four);
578		assertEquals(four, ssm.firstKey());
579		assertEquals(five, ssm.lastKey());
580	<	assertTrue(ssm.remove(four) != null);
580	>	assertEquals("D", ssm.remove(four));
581		assertEquals(1, ssm.size());
582		assertEquals(3, sm.size());
583		assertEquals(4, map.size());
#	Line 814 | Line 810 | public class TreeSubMapTest extends JSR1
810
811		Map.Entry e4 = map.lowerEntry(zero);
812		assertNull(e4);
817	–
813		}
814
815		/**
#	Line 833 | Line 828 | public class TreeSubMapTest extends JSR1
828
829		Map.Entry e4 = map.higherEntry(m6);
830		assertNull(e4);
836	–
831		}
832
833		/**
#	Line 852 | Line 846 | public class TreeSubMapTest extends JSR1
846
847		Map.Entry e4 = map.floorEntry(zero);
848		assertNull(e4);
855	–
849		}
850
851		/**
#	Line 871 | Line 864 | public class TreeSubMapTest extends JSR1
864
865		Map.Entry e4 = map.ceilingEntry(m6);
866		assertNull(e4);
874	–
867		}
868
869		/**
#	Line 1022 | Line 1014 | public class TreeSubMapTest extends JSR1
1014		assertEquals(1, sm.size());
1015		assertEquals(m3, sm.firstKey());
1016		assertEquals(m3, sm.lastKey());
1017	<	assertTrue(sm.remove(m3) != null);
1017	>	assertEquals("C", sm.remove(m3));
1018		assertTrue(sm.isEmpty());
1019		assertEquals(3, map.size());
1020		}
#	Line 1050 | Line 1042 | public class TreeSubMapTest extends JSR1
1042		assertEquals(4, map.size());
1043		assertEquals(0, sm.size());
1044		assertTrue(sm.isEmpty());
1045	<	assertTrue(sm.remove(m3) == null);
1045	>	assertSame(sm.remove(m3), null);
1046		assertEquals(4, map.size());
1047		}
1048
#	Line 1122 | Line 1114 | public class TreeSubMapTest extends JSR1
1114		SortedMap ssm = sm.tailMap(m4);
1115		assertEquals(m4, ssm.firstKey());
1116		assertEquals(m5, ssm.lastKey());
1117	<	assertTrue(ssm.remove(m4) != null);
1117	>	assertEquals("D", ssm.remove(m4));
1118		assertEquals(1, ssm.size());
1119		assertEquals(3, sm.size());
1120		assertEquals(4, map.size());

Diff Legend

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