ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentHashMapTest.java (file contents):
Revision 1.40 by jsr166, Wed Dec 31 19:05:42 2014 UTC vs.
Revision 1.43 by jsr166, Fri Feb 27 21:43:18 2015 UTC

#	Line 287 | Line 287 | public class ConcurrentHashMapTest exten
287		assertEquals("A", (String)map.get(one));
288		ConcurrentHashMap empty = new ConcurrentHashMap();
289		assertNull(map.get("anything"));
290	+	assertNull(empty.get("anything"));
291		}
292
293		/**
#	Line 537 | Line 538 | public class ConcurrentHashMapTest exten
538		try {
539		new ConcurrentHashMap(-1, .75f);
540		shouldThrow();
541	<	} catch (IllegalArgumentException e) {}
541	>	} catch (IllegalArgumentException success) {}
542
543		try {
544		new ConcurrentHashMap(16, -1);
545		shouldThrow();
546	<	} catch (IllegalArgumentException e) {}
546	>	} catch (IllegalArgumentException success) {}
547		}
548
549		/**
#	Line 553 | Line 554 | public class ConcurrentHashMapTest exten
554		try {
555		new ConcurrentHashMap(-1, .75f, 1);
556		shouldThrow();
557	<	} catch (IllegalArgumentException e) {}
557	>	} catch (IllegalArgumentException success) {}
558
559		try {
560		new ConcurrentHashMap(16, -1, 1);
561		shouldThrow();
562	<	} catch (IllegalArgumentException e) {}
562	>	} catch (IllegalArgumentException success) {}
563
564		try {
565		new ConcurrentHashMap(16, .75f, -1);
566		shouldThrow();
567	<	} catch (IllegalArgumentException e) {}
567	>	} catch (IllegalArgumentException success) {}
568		}
569
570		/**
#	Line 574 | Line 575 | public class ConcurrentHashMapTest exten
575		try {
576		new ConcurrentHashMap(null);
577		shouldThrow();
578	<	} catch (NullPointerException e) {}
578	>	} catch (NullPointerException success) {}
579		}
580
581		/**
#	Line 589 | Line 590 | public class ConcurrentHashMapTest exten
590		assertFalse(map2.equals(map1));
591		}
592
592	–
593		/**
594		* get(null) throws NPE
595		*/

Diff Legend

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