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.44 by jsr166, Sat Feb 28 18:27:31 2015 UTC vs.
Revision 1.46 by jsr166, Sun May 24 01:23:17 2015 UTC

#	Line 22 | Line 22 | import junit.framework.TestSuite;
22
23		public class ConcurrentHashMapTest 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(ConcurrentHashMapTest.class);
#	Line 45 | Line 45 | public class ConcurrentHashMapTest exten
45		}
46
47		/** Re-implement Integer.compare for old java versions */
48	<	static int compare(int x, int y) { return x < y ? -1 : x > y ? 1 : 0; }
48	>	static int compare(int x, int y) {
49	>	return (x < y) ? -1 : (x > y) ? 1 : 0;
50	>	}
51
52		// classes for testing Comparable fallbacks
53		static class BI implements Comparable<BI> {

Diff Legend

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