--- jsr166/src/test/tck/ConcurrentLinkedDequeTest.java 2015/01/17 22:55:06 1.17 +++ jsr166/src/test/tck/ConcurrentLinkedDequeTest.java 2017/10/10 05:54:41 1.30 @@ -13,32 +13,44 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Queue; import java.util.Random; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.atomic.LongAdder; import junit.framework.Test; -import junit.framework.TestSuite; public class ConcurrentLinkedDequeTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); + main(suite(), args); } public static Test suite() { - return new TestSuite(ConcurrentLinkedDequeTest.class); + class Implementation implements CollectionImplementation { + public Class klazz() { return ConcurrentLinkedDeque.class; } + public Collection emptyCollection() { return new ConcurrentLinkedDeque(); } + public Object makeElement(int i) { return i; } + public boolean isConcurrent() { return true; } + public boolean permitsNulls() { return false; } + } + return newTestSuite(ConcurrentLinkedDequeTest.class, + CollectionTest.testSuite(new Implementation())); } /** * Returns a new deque of given size containing consecutive - * Integers 0 ... n. + * Integers 0 ... n - 1. */ - private ConcurrentLinkedDeque populatedDeque(int n) { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); + private static ConcurrentLinkedDeque populatedDeque(int n) { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque<>(); assertTrue(q.isEmpty()); for (int i = 0; i < n; ++i) assertTrue(q.offer(new Integer(i))); assertFalse(q.isEmpty()); assertEquals(n, q.size()); + assertEquals((Integer) 0, q.peekFirst()); + assertEquals((Integer) (n - 1), q.peekLast()); return q; } @@ -55,7 +67,7 @@ public class ConcurrentLinkedDequeTest e */ public void testConstructor3() { try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque((Collection)null); + new ConcurrentLinkedDeque((Collection)null); shouldThrow(); } catch (NullPointerException success) {} } @@ -65,8 +77,7 @@ public class ConcurrentLinkedDequeTest e */ public void testConstructor4() { try { - Integer[] ints = new Integer[SIZE]; - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(Arrays.asList(ints)); + new ConcurrentLinkedDeque(Arrays.asList(new Integer[SIZE])); shouldThrow(); } catch (NullPointerException success) {} } @@ -75,11 +86,11 @@ public class ConcurrentLinkedDequeTest e * Initializing from Collection with some null elements throws NPE */ public void testConstructor5() { + Integer[] ints = new Integer[SIZE]; + for (int i = 0; i < SIZE - 1; ++i) + ints[i] = new Integer(i); try { - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE-1; ++i) - ints[i] = new Integer(i); - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(Arrays.asList(ints)); + new ConcurrentLinkedDeque(Arrays.asList(ints)); shouldThrow(); } catch (NullPointerException success) {} } @@ -116,7 +127,7 @@ public class ConcurrentLinkedDequeTest e public void testSize() { ConcurrentLinkedDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); q.remove(); } for (int i = 0; i < SIZE; ++i) { @@ -129,8 +140,8 @@ public class ConcurrentLinkedDequeTest e * push(null) throws NPE */ public void testPushNull() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); q.push(null); shouldThrow(); } catch (NullPointerException success) {} @@ -164,8 +175,8 @@ public class ConcurrentLinkedDequeTest e * offer(null) throws NPE */ public void testOfferNull() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); q.offer(null); shouldThrow(); } catch (NullPointerException success) {} @@ -175,8 +186,8 @@ public class ConcurrentLinkedDequeTest e * offerFirst(null) throws NPE */ public void testOfferFirstNull() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); q.offerFirst(null); shouldThrow(); } catch (NullPointerException success) {} @@ -186,8 +197,8 @@ public class ConcurrentLinkedDequeTest e * offerLast(null) throws NPE */ public void testOfferLastNull() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); q.offerLast(null); shouldThrow(); } catch (NullPointerException success) {} @@ -230,8 +241,8 @@ public class ConcurrentLinkedDequeTest e * add(null) throws NPE */ public void testAddNull() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); q.add(null); shouldThrow(); } catch (NullPointerException success) {} @@ -241,8 +252,8 @@ public class ConcurrentLinkedDequeTest e * addFirst(null) throws NPE */ public void testAddFirstNull() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); q.addFirst(null); shouldThrow(); } catch (NullPointerException success) {} @@ -252,8 +263,8 @@ public class ConcurrentLinkedDequeTest e * addLast(null) throws NPE */ public void testAddLastNull() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); q.addLast(null); shouldThrow(); } catch (NullPointerException success) {} @@ -296,19 +307,19 @@ public class ConcurrentLinkedDequeTest e * addAll(null) throws NPE */ public void testAddAll1() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); q.addAll(null); shouldThrow(); } catch (NullPointerException success) {} } /** - * addAll(this) throws IAE + * addAll(this) throws IllegalArgumentException */ public void testAddAllSelf() { + ConcurrentLinkedDeque q = populatedDeque(SIZE); try { - ConcurrentLinkedDeque q = populatedDeque(SIZE); q.addAll(q); shouldThrow(); } catch (IllegalArgumentException success) {} @@ -318,10 +329,9 @@ public class ConcurrentLinkedDequeTest e * addAll of a collection with null elements throws NPE */ public void testAddAll2() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); - Integer[] ints = new Integer[SIZE]; - q.addAll(Arrays.asList(ints)); + q.addAll(Arrays.asList(new Integer[SIZE])); shouldThrow(); } catch (NullPointerException success) {} } @@ -331,11 +341,11 @@ public class ConcurrentLinkedDequeTest e * possibly adding some elements */ public void testAddAll3() { + ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); + Integer[] ints = new Integer[SIZE]; + for (int i = 0; i < SIZE - 1; ++i) + ints[i] = new Integer(i); try { - ConcurrentLinkedDeque q = new ConcurrentLinkedDeque(); - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE-1; ++i) - ints[i] = new Integer(i); q.addAll(Arrays.asList(ints)); shouldThrow(); } catch (NullPointerException success) {} @@ -372,7 +382,7 @@ public class ConcurrentLinkedDequeTest e */ public void testPollLast() { ConcurrentLinkedDeque q = populatedDeque(SIZE); - for (int i = SIZE-1; i >= 0; --i) { + for (int i = SIZE - 1; i >= 0; --i) { assertEquals(i, q.pollLast()); } assertNull(q.pollLast()); @@ -441,14 +451,14 @@ public class ConcurrentLinkedDequeTest e assertTrue(q.contains(i)); assertTrue(q.remove(i)); assertFalse(q.contains(i)); - assertTrue(q.contains(i-1)); + assertTrue(q.contains(i - 1)); } for (int i = 0; i < SIZE; i += 2) { assertTrue(q.contains(i)); assertTrue(q.remove(i)); assertFalse(q.contains(i)); - assertFalse(q.remove(i+1)); - assertFalse(q.contains(i+1)); + assertFalse(q.remove(i + 1)); + assertFalse(q.contains(i + 1)); } assertTrue(q.isEmpty()); } @@ -472,7 +482,7 @@ public class ConcurrentLinkedDequeTest e */ public void testPeekLast() { ConcurrentLinkedDeque q = populatedDeque(SIZE); - for (int i = SIZE-1; i >= 0; --i) { + for (int i = SIZE - 1; i >= 0; --i) { assertEquals(i, q.peekLast()); assertEquals(i, q.pollLast()); assertTrue(q.peekLast() == null || @@ -501,7 +511,7 @@ public class ConcurrentLinkedDequeTest e */ public void testLastElement() { ConcurrentLinkedDeque q = populatedDeque(SIZE); - for (int i = SIZE-1; i >= 0; --i) { + for (int i = SIZE - 1; i >= 0; --i) { assertEquals(i, q.getLast()); assertEquals(i, q.pollLast()); } @@ -552,7 +562,7 @@ public class ConcurrentLinkedDequeTest e } for (int i = 0; i < SIZE; i += 2) { assertTrue(q.removeFirstOccurrence(new Integer(i))); - assertFalse(q.removeFirstOccurrence(new Integer(i+1))); + assertFalse(q.removeFirstOccurrence(new Integer(i + 1))); } assertTrue(q.isEmpty()); } @@ -567,7 +577,7 @@ public class ConcurrentLinkedDequeTest e } for (int i = 0; i < SIZE; i += 2) { assertTrue(q.removeLastOccurrence(new Integer(i))); - assertFalse(q.removeLastOccurrence(new Integer(i+1))); + assertFalse(q.removeLastOccurrence(new Integer(i + 1))); } assertTrue(q.isEmpty()); } @@ -626,7 +636,7 @@ public class ConcurrentLinkedDequeTest e assertTrue(changed); assertTrue(q.containsAll(p)); - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); p.remove(); } } @@ -639,7 +649,7 @@ public class ConcurrentLinkedDequeTest e ConcurrentLinkedDeque q = populatedDeque(SIZE); ConcurrentLinkedDeque p = populatedDeque(i); assertTrue(q.removeAll(p)); - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); for (int j = 0; j < i; ++j) { Integer x = (Integer)(p.remove()); assertFalse(q.contains(x)); @@ -755,18 +765,18 @@ public class ConcurrentLinkedDequeTest e final Random rng = new Random(); for (int iters = 0; iters < 100; ++iters) { int max = rng.nextInt(5) + 2; - int split = rng.nextInt(max-1) + 1; + int split = rng.nextInt(max - 1) + 1; for (int j = 1; j <= max; ++j) q.add(new Integer(j)); Iterator it = q.iterator(); for (int j = 1; j <= split; ++j) assertEquals(it.next(), new Integer(j)); it.remove(); - assertEquals(it.next(), new Integer(split+1)); + assertEquals(it.next(), new Integer(split + 1)); for (int j = 1; j <= split; ++j) q.remove(new Integer(j)); it = q.iterator(); - for (int j = split+1; j <= max; ++j) { + for (int j = split + 1; j <= max; ++j) { assertEquals(it.next(), new Integer(j)); it.remove(); } @@ -823,18 +833,18 @@ public class ConcurrentLinkedDequeTest e final Random rng = new Random(); for (int iters = 0; iters < 100; ++iters) { int max = rng.nextInt(5) + 2; - int split = rng.nextInt(max-1) + 1; + int split = rng.nextInt(max - 1) + 1; for (int j = max; j >= 1; --j) q.add(new Integer(j)); Iterator it = q.descendingIterator(); for (int j = 1; j <= split; ++j) assertEquals(it.next(), new Integer(j)); it.remove(); - assertEquals(it.next(), new Integer(split+1)); + assertEquals(it.next(), new Integer(split + 1)); for (int j = 1; j <= split; ++j) q.remove(new Integer(j)); it = q.descendingIterator(); - for (int j = split+1; j <= max; ++j) { + for (int j = split + 1; j <= max; ++j) { assertEquals(it.next(), new Integer(j)); it.remove(); } @@ -855,7 +865,7 @@ public class ConcurrentLinkedDequeTest e } /** - * A deserialized serialized deque has same elements in same order + * A deserialized/reserialized deque has same elements in same order */ public void testSerialization() throws Exception { Queue x = populatedDeque(SIZE); @@ -898,4 +908,78 @@ public class ConcurrentLinkedDequeTest e } catch (NullPointerException success) {} } } + + /** + * Non-traversing Deque operations are linearizable. + * https://bugs.openjdk.java.net/browse/JDK-8188900 + * ant -Djsr166.expensiveTests=true -Djsr166.tckTestClass=ConcurrentLinkedDequeTest -Djsr166.methodFilter=testBug8188900 tck + */ + public void testBug8188900() { + final ThreadLocalRandom rnd = ThreadLocalRandom.current(); + final LongAdder nulls = new LongAdder(), zeros = new LongAdder(); + for (int n = expensiveTests ? 100_000 : 10; n--> 0; ) { + ConcurrentLinkedDeque d = new ConcurrentLinkedDeque<>(); + + boolean peek = rnd.nextBoolean(); + Runnable getter = () -> { + Integer x = peek ? d.peekFirst() : d.pollFirst(); + if (x == null) nulls.increment(); + else if (x == 0) zeros.increment(); + else + throw new AssertionError( + String.format( + "unexpected value %d after %d nulls and %d zeros", + x, nulls.sum(), zeros.sum())); + }; + + Runnable adder = () -> { + d.addFirst(0); + d.addLast(42); + }; + + boolean b = rnd.nextBoolean(); + Runnable r1 = b ? getter : adder; + Runnable r2 = b ? adder : getter; + CompletableFuture f1 = CompletableFuture.runAsync(r1); + CompletableFuture f2 = CompletableFuture.runAsync(r2); + f1.join(); + f2.join(); + } + } + + /** + * Reverse direction variant of testBug8188900 + */ + public void testBug8188900_reverse() { + final ThreadLocalRandom rnd = ThreadLocalRandom.current(); + final LongAdder nulls = new LongAdder(), zeros = new LongAdder(); + for (int n = expensiveTests ? 100_000 : 10; n--> 0; ) { + ConcurrentLinkedDeque d = new ConcurrentLinkedDeque<>(); + + boolean peek = rnd.nextBoolean(); + Runnable getter = () -> { + Integer x = peek ? d.peekLast() : d.pollLast(); + if (x == null) nulls.increment(); + else if (x == 0) zeros.increment(); + else + throw new AssertionError( + String.format( + "unexpected value %d after %d nulls and %d zeros", + x, nulls.sum(), zeros.sum())); + }; + + Runnable adder = () -> { + d.addLast(0); + d.addFirst(42); + }; + + boolean b = rnd.nextBoolean(); + Runnable r1 = b ? getter : adder; + Runnable r2 = b ? adder : getter; + CompletableFuture f1 = CompletableFuture.runAsync(r1); + CompletableFuture f2 = CompletableFuture.runAsync(r2); + f1.join(); + f2.join(); + } + } }