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.39 by jsr166, Tue Sep 24 17:26:27 2013 UTC vs.
Revision 1.42 by jsr166, Sun Feb 22 04:34:44 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
10	<	import java.util.*;
9	>	import java.util.ArrayList;
10	>	import java.util.Arrays;
11	>	import java.util.Collection;
12	>	import java.util.Collections;
13	>	import java.util.Enumeration;
14	>	import java.util.Iterator;
15	>	import java.util.Map;
16	>	import java.util.Random;
17	>	import java.util.Set;
18		import java.util.concurrent.ConcurrentHashMap;
19
20	+	import junit.framework.Test;
21	+	import junit.framework.TestSuite;
22	+
23		public class ConcurrentHashMapTest extends JSR166TestCase {
24		public static void main(String[] args) {
25		junit.textui.TestRunner.run(suite());
#	Line 277 | 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 579 | Line 590 | public class ConcurrentHashMapTest exten
590		assertFalse(map2.equals(map1));
591		}
592
582	–
593		/**
594		* get(null) throws NPE
595		*/

Diff Legend

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