ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentSkipListMapTest.java (file contents):
Revision 1.33 by jsr166, Wed Dec 31 19:05:42 2014 UTC vs.
Revision 1.37 by jsr166, Sun May 24 01:23:17 2015 UTC

#	Line 22 | Line 22 | import junit.framework.TestSuite;
22
23		public class ConcurrentSkipListMapTest extends JSR166TestCase {
24		public static void main(String[] args) {
25	<	junit.textui.TestRunner.run(suite());
25	>	main(suite(), args);
26		}
27		public static Test suite() {
28		return new TestSuite(ConcurrentSkipListMapTest.class);
#	Line 694 | Line 694 | public class ConcurrentSkipListMapTest e
694		* get(null) of nonempty map throws NPE
695		*/
696		public void testGet_NullPointerException() {
697	+	ConcurrentSkipListMap c = map5();
698		try {
698	–	ConcurrentSkipListMap c = map5();
699		c.get(null);
700		shouldThrow();
701		} catch (NullPointerException success) {}
#	Line 705 | Line 705 | public class ConcurrentSkipListMapTest e
705		* containsKey(null) of nonempty map throws NPE
706		*/
707		public void testContainsKey_NullPointerException() {
708	+	ConcurrentSkipListMap c = map5();
709		try {
709	–	ConcurrentSkipListMap c = map5();
710		c.containsKey(null);
711		shouldThrow();
712		} catch (NullPointerException success) {}
#	Line 716 | Line 716 | public class ConcurrentSkipListMapTest e
716		* containsValue(null) throws NPE
717		*/
718		public void testContainsValue_NullPointerException() {
719	+	ConcurrentSkipListMap c = new ConcurrentSkipListMap();
720		try {
720	–	ConcurrentSkipListMap c = new ConcurrentSkipListMap();
721		c.containsValue(null);
722		shouldThrow();
723		} catch (NullPointerException success) {}
#	Line 727 | Line 727 | public class ConcurrentSkipListMapTest e
727		* put(null,x) throws NPE
728		*/
729		public void testPut1_NullPointerException() {
730	+	ConcurrentSkipListMap c = map5();
731		try {
731	–	ConcurrentSkipListMap c = map5();
732		c.put(null, "whatever");
733		shouldThrow();
734		} catch (NullPointerException success) {}
#	Line 738 | Line 738 | public class ConcurrentSkipListMapTest e
738		* putIfAbsent(null, x) throws NPE
739		*/
740		public void testPutIfAbsent1_NullPointerException() {
741	+	ConcurrentSkipListMap c = map5();
742		try {
742	–	ConcurrentSkipListMap c = map5();
743		c.putIfAbsent(null, "whatever");
744		shouldThrow();
745		} catch (NullPointerException success) {}
#	Line 749 | Line 749 | public class ConcurrentSkipListMapTest e
749		* replace(null, x) throws NPE
750		*/
751		public void testReplace_NullPointerException() {
752	+	ConcurrentSkipListMap c = map5();
753		try {
753	–	ConcurrentSkipListMap c = map5();
754		c.replace(null, "whatever");
755		shouldThrow();
756		} catch (NullPointerException success) {}
#	Line 760 | Line 760 | public class ConcurrentSkipListMapTest e
760		* replace(null, x, y) throws NPE
761		*/
762		public void testReplaceValue_NullPointerException() {
763	+	ConcurrentSkipListMap c = map5();
764		try {
764	–	ConcurrentSkipListMap c = map5();
765		c.replace(null, one, "whatever");
766		shouldThrow();
767		} catch (NullPointerException success) {}
#	Line 771 | Line 771 | public class ConcurrentSkipListMapTest e
771		* remove(null) throws NPE
772		*/
773		public void testRemove1_NullPointerException() {
774	+	ConcurrentSkipListMap c = new ConcurrentSkipListMap();
775	+	c.put("sadsdf", "asdads");
776		try {
775	–	ConcurrentSkipListMap c = new ConcurrentSkipListMap();
776	–	c.put("sadsdf", "asdads");
777		c.remove(null);
778		shouldThrow();
779		} catch (NullPointerException success) {}
#	Line 783 | Line 783 | public class ConcurrentSkipListMapTest e
783		* remove(null, x) throws NPE
784		*/
785		public void testRemove2_NullPointerException() {
786	+	ConcurrentSkipListMap c = new ConcurrentSkipListMap();
787	+	c.put("sadsdf", "asdads");
788		try {
787	–	ConcurrentSkipListMap c = new ConcurrentSkipListMap();
788	–	c.put("sadsdf", "asdads");
789		c.remove(null, "whatever");
790		shouldThrow();
791		} catch (NullPointerException success) {}
#	Line 1030 | Line 1030 | public class ConcurrentSkipListMapTest e
1030		// Add entries till we're back to original size
1031		while (map.size() < size) {
1032		int key = min + rnd.nextInt(rangeSize);
1033	<	assertTrue(key >= min && key<= max);
1033	>	assertTrue(key >= min && key <= max);
1034		put(map, key);
1035		}
1036		}
#	Line 1055 | Line 1055 | public class ConcurrentSkipListMapTest e
1055		// Add entries till we're back to original size
1056		while (map.size() < size) {
1057		int key = min - 5 + rnd.nextInt(rangeSize + 10);
1058	<	if (key >= min && key<= max) {
1058	>	if (key >= min && key <= max) {
1059		put(map, key);
1060		} else {
1061		try {
#	Line 1273 | Line 1273 | public class ConcurrentSkipListMapTest e
1273		}
1274
1275		static boolean eq(Integer i, int j) {
1276	<	return i == null ? j == -1 : i == j;
1276	>	return (i == null) ? j == -1 : i == j;
1277		}
1278
1279		}

Diff Legend

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