diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2016-03-11 15:59:10 +0000 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2016-03-14 15:40:14 +0000 |
| commit | 5328e07d282bef36ac8b757bbee16a761415b2c4 (patch) | |
| tree | d7fd9980442e0d647e1454f54f3d037f4b2280e7 /jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java | |
| parent | 8d28fc1d531b4b39def9598de89311aff112f955 (diff) | |
JSR-166 update
Adapted from sources taken from CVS using:
cvs -d ':pserver:anonymous@gee.cs.oswego.edu/home/jsr166/jsr166' checkout -D "03/03/2016 10:00:00 GMT" jsr166
Bug: 27426599
Change-Id: Ic9ba278929f8747d58b69e7d67ec325064588bff
Diffstat (limited to 'jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java')
| -rw-r--r-- | jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java b/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java index 4650f4140b..f4271279bf 100644 --- a/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java +++ b/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java @@ -30,7 +30,7 @@ public class ConcurrentHashMapTest extends JSR166TestCase { // main(suite(), args); // } // public static Test suite() { - // return new TestSuite(...); + // return new TestSuite(ConcurrentHashMapTest.class); // } /** @@ -50,7 +50,9 @@ public class ConcurrentHashMapTest extends JSR166TestCase { } /** Re-implement Integer.compare for old java versions */ - static int compare(int x, int y) { return x < y ? -1 : x > y ? 1 : 0; } + static int compare(int x, int y) { + return (x < y) ? -1 : (x > y) ? 1 : 0; + } // classes for testing Comparable fallbacks static class BI implements Comparable<BI> { @@ -538,7 +540,7 @@ public class ConcurrentHashMapTest extends JSR166TestCase { /** * Constructor (initialCapacity, loadFactor) throws * IllegalArgumentException if either argument is negative - */ + */ public void testConstructor2() { try { new ConcurrentHashMap(-1, .75f); |