ViewVC Help

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

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

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.15 by jsr166, Wed Aug 25 00:07:03 2010 UTC

#	Line 11 | Line 11 | import java.io.*;
11
12		public class ConcurrentSkipListSubMapTest extends JSR166TestCase {
13		public static void main(String[] args) {
14	<	junit.textui.TestRunner.run (suite());
14	>	junit.textui.TestRunner.run(suite());
15		}
16		public static Test suite() {
17		return new TestSuite(ConcurrentSkipListSubMapTest.class);
#	Line 343 | Line 343 | public class ConcurrentSkipListSubMapTes
343		map.remove(four, "A");
344		assertEquals(4, map.size());
345		assertTrue(map.containsKey(four));
346	–
346		}
347
348		/**
#	Line 362 | Line 361 | public class ConcurrentSkipListSubMapTes
361
362		Map.Entry e4 = map.lowerEntry(zero);
363		assertNull(e4);
365	–
364		}
365
366		/**
#	Line 381 | Line 379 | public class ConcurrentSkipListSubMapTes
379
380		Map.Entry e4 = map.higherEntry(six);
381		assertNull(e4);
384	–
382		}
383
384		/**
#	Line 400 | Line 397 | public class ConcurrentSkipListSubMapTes
397
398		Map.Entry e4 = map.floorEntry(zero);
399		assertNull(e4);
403	–
400		}
401
402		/**
#	Line 419 | Line 415 | public class ConcurrentSkipListSubMapTes
415
416		Map.Entry e4 = map.ceilingEntry(six);
417		assertNull(e4);
422	–
418		}
419
420		/**
#	Line 649 | Line 644 | public class ConcurrentSkipListSubMapTes
644		assertEquals(1, sm.size());
645		assertEquals(three, sm.firstKey());
646		assertEquals(three, sm.lastKey());
647	<	assertTrue(sm.remove(three) != null);
647	>	assertEquals("C", sm.remove(three));
648		assertTrue(sm.isEmpty());
649		assertEquals(3, map.size());
650		}
#	Line 677 | Line 672 | public class ConcurrentSkipListSubMapTes
672		assertEquals(4, map.size());
673		assertEquals(0, sm.size());
674		assertTrue(sm.isEmpty());
675	<	assertTrue(sm.remove(three) == null);
675	>	assertSame(sm.remove(three), null);
676		assertEquals(4, map.size());
677		}
678
#	Line 749 | Line 744 | public class ConcurrentSkipListSubMapTes
744		SortedMap ssm = sm.tailMap(four);
745		assertEquals(four, ssm.firstKey());
746		assertEquals(five, ssm.lastKey());
747	<	assertTrue(ssm.remove(four) != null);
747	>	assertEquals("D", ssm.remove(four));
748		assertEquals(1, ssm.size());
749		assertEquals(3, sm.size());
750		assertEquals(4, map.size());
#	Line 1035 | Line 1030 | public class ConcurrentSkipListSubMapTes
1030		map.remove(m4, "A");
1031		assertEquals(4, map.size());
1032		assertTrue(map.containsKey(m4));
1038	–
1033		}
1034
1035		/**
#	Line 1054 | Line 1048 | public class ConcurrentSkipListSubMapTes
1048
1049		Map.Entry e4 = map.lowerEntry(zero);
1050		assertNull(e4);
1057	–
1051		}
1052
1053		/**
#	Line 1073 | Line 1066 | public class ConcurrentSkipListSubMapTes
1066
1067		Map.Entry e4 = map.higherEntry(m6);
1068		assertNull(e4);
1076	–
1069		}
1070
1071		/**
#	Line 1092 | Line 1084 | public class ConcurrentSkipListSubMapTes
1084
1085		Map.Entry e4 = map.floorEntry(zero);
1086		assertNull(e4);
1095	–
1087		}
1088
1089		/**
#	Line 1111 | Line 1102 | public class ConcurrentSkipListSubMapTes
1102
1103		Map.Entry e4 = map.ceilingEntry(m6);
1104		assertNull(e4);
1114	–
1105		}
1106
1107		/**
#	Line 1192 | Line 1182 | public class ConcurrentSkipListSubMapTes
1182		// Exception testDescendings
1183
1184		/**
1185	<	* get(null) of nm1mpty map throws NPE
1185	>	* get(null) of empty map throws NPE
1186		*/
1187		public void testDescendingGet_NullPointerException() {
1188		try {
#	Line 1203 | Line 1193 | public class ConcurrentSkipListSubMapTes
1193		}
1194
1195		/**
1196	<	* containsKey(null) of nm1mpty map throws NPE
1196	>	* containsKey(null) of empty map throws NPE
1197		*/
1198		public void testDescendingContainsKey_NullPointerException() {
1199		try {
#	Line 1340 | Line 1330 | public class ConcurrentSkipListSubMapTes
1330		assertEquals(1, sm.size());
1331		assertEquals(m3, sm.firstKey());
1332		assertEquals(m3, sm.lastKey());
1333	<	assertTrue(sm.remove(m3) != null);
1333	>	assertEquals("C", sm.remove(m3));
1334		assertTrue(sm.isEmpty());
1335		assertEquals(3, map.size());
1336		}
#	Line 1368 | Line 1358 | public class ConcurrentSkipListSubMapTes
1358		assertEquals(4, map.size());
1359		assertEquals(0, sm.size());
1360		assertTrue(sm.isEmpty());
1361	<	assertTrue(sm.remove(m3) == null);
1361	>	assertSame(sm.remove(m3), null);
1362		assertEquals(4, map.size());
1363		}
1364
#	Line 1440 | Line 1430 | public class ConcurrentSkipListSubMapTes
1430		SortedMap ssm = sm.tailMap(m4);
1431		assertEquals(m4, ssm.firstKey());
1432		assertEquals(m5, ssm.lastKey());
1433	<	assertTrue(ssm.remove(m4) != null);
1433	>	assertEquals("D", ssm.remove(m4));
1434		assertEquals(1, ssm.size());
1435		assertEquals(3, sm.size());
1436		assertEquals(4, map.size());

Diff Legend

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