--- jsr166/src/test/tck/ArrayDequeTest.java 2010/11/03 16:46:34 1.18 +++ jsr166/src/test/tck/ArrayDequeTest.java 2021/01/27 02:55:18 1.61 @@ -1,38 +1,82 @@ /* - * Written by Doug Lea with assistance from members of JCP JSR-166 - * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/licenses/publicdomain + * Written by Doug Lea and Martin Buchholz with assistance from + * members of JCP JSR-166 Expert Group and released to the public + * domain, as explained at + * http://creativecommons.org/publicdomain/zero/1.0/ */ -import junit.framework.*; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Arrays; +import java.util.Collection; +import java.util.Deque; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.Queue; +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; + +import junit.framework.Test; public class ArrayDequeTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); + main(suite(), args); } public static Test suite() { - return new TestSuite(ArrayDequeTest.class); + class Implementation implements CollectionImplementation { + public Class klazz() { return ArrayDeque.class; } + public Collection emptyCollection() { return populatedDeque(0); } + public Object makeElement(int i) { return JSR166TestCase.itemFor(i); } + public boolean isConcurrent() { return false; } + public boolean permitsNulls() { return false; } + } + return newTestSuite(ArrayDequeTest.class, + CollectionTest.testSuite(new Implementation())); } /** - * Create a deque of given size containing consecutive - * Integers 0 ... n. - */ - private ArrayDeque populatedDeque(int n) { - ArrayDeque q = new ArrayDeque(); + * Returns a new deque of given size containing consecutive + * Items 0 ... n - 1. + */ + private static ArrayDeque populatedDeque(int n) { + // Randomize various aspects of memory layout, including + // capacity slop and wraparound. + final ArrayDeque q; + ThreadLocalRandom rnd = ThreadLocalRandom.current(); + switch (rnd.nextInt(6)) { + case 0: q = new ArrayDeque<>(); break; + case 1: q = new ArrayDeque<>(0); break; + case 2: q = new ArrayDeque<>(1); break; + case 3: q = new ArrayDeque<>(Math.max(0, n - 1)); break; + case 4: q = new ArrayDeque<>(n); break; + case 5: q = new ArrayDeque<>(n + 1); break; + default: throw new AssertionError(); + } + switch (rnd.nextInt(3)) { + case 0: + q.addFirst(fortytwo); + mustEqual(42, q.removeLast()); + break; + case 1: + q.addLast(fortytwo); + mustEqual(42, q.removeFirst()); + break; + case 2: /* do nothing */ break; + default: throw new AssertionError(); + } assertTrue(q.isEmpty()); - for (int i = 0; i < n; ++i) - assertTrue(q.offerLast(new Integer(i))); - assertFalse(q.isEmpty()); - assertEquals(n, q.size()); + if (rnd.nextBoolean()) + for (int i = 0; i < n; i++) + assertTrue(q.offerLast(itemFor(i))); + else + for (int i = n; --i >= 0; ) + q.addFirst(itemFor(i)); + mustEqual(n, q.size()); + if (n > 0) { + assertFalse(q.isEmpty()); + mustEqual(0, q.peekFirst()); + mustEqual((n - 1), q.peekLast()); + } return q; } @@ -40,7 +84,7 @@ public class ArrayDequeTest extends JSR1 * new deque is empty */ public void testConstructor1() { - assertEquals(0, new ArrayDeque().size()); + mustEqual(0, new ArrayDeque().size()); } /** @@ -48,7 +92,7 @@ public class ArrayDequeTest extends JSR1 */ public void testConstructor3() { try { - ArrayDeque q = new ArrayDeque((Collection)null); + new ArrayDeque((Collection)null); shouldThrow(); } catch (NullPointerException success) {} } @@ -58,8 +102,7 @@ public class ArrayDequeTest extends JSR1 */ public void testConstructor4() { try { - Integer[] ints = new Integer[SIZE]; - ArrayDeque q = new ArrayDeque(Arrays.asList(ints)); + new ArrayDeque(Arrays.asList(new Item[SIZE])); shouldThrow(); } catch (NullPointerException success) {} } @@ -68,11 +111,9 @@ public class ArrayDequeTest extends JSR1 * Initializing from Collection with some null elements throws NPE */ public void testConstructor5() { + Item[] items = new Item[2]; items[0] = zero; try { - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE-1; ++i) - ints[i] = new Integer(i); - ArrayDeque q = new ArrayDeque(Arrays.asList(ints)); + new ArrayDeque(Arrays.asList(items)); shouldThrow(); } catch (NullPointerException success) {} } @@ -81,23 +122,21 @@ public class ArrayDequeTest extends JSR1 * Deque contains all elements of collection used to initialize */ public void testConstructor6() { - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE; ++i) - ints[i] = new Integer(i); - ArrayDeque q = new ArrayDeque(Arrays.asList(ints)); + Item[] items = defaultItems; + ArrayDeque q = new ArrayDeque<>(Arrays.asList(items)); for (int i = 0; i < SIZE; ++i) - assertEquals(ints[i], q.pollFirst()); + mustEqual(items[i], q.pollFirst()); } /** * isEmpty is true before add, false after */ public void testEmpty() { - ArrayDeque q = new ArrayDeque(); + ArrayDeque q = new ArrayDeque<>(); assertTrue(q.isEmpty()); - q.add(new Integer(1)); + q.add(one); assertFalse(q.isEmpty()); - q.add(new Integer(2)); + q.add(two); q.removeFirst(); q.removeFirst(); assertTrue(q.isEmpty()); @@ -107,14 +146,14 @@ public class ArrayDequeTest extends JSR1 * size changes when elements added and removed */ public void testSize() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i, q.size()); + mustEqual(SIZE - i, q.size()); q.removeFirst(); } for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.size()); - q.add(new Integer(i)); + mustEqual(i, q.size()); + mustAdd(q, i); } } @@ -122,8 +161,8 @@ public class ArrayDequeTest extends JSR1 * push(null) throws NPE */ public void testPushNull() { + ArrayDeque q = new ArrayDeque<>(1); try { - ArrayDeque q = new ArrayDeque(1); q.push(null); shouldThrow(); } catch (NullPointerException success) {} @@ -133,7 +172,7 @@ public class ArrayDequeTest extends JSR1 * peekFirst() returns element inserted with push */ public void testPush() { - ArrayDeque q = populatedDeque(3); + ArrayDeque q = populatedDeque(3); q.pollLast(); q.push(four); assertSame(four, q.peekFirst()); @@ -143,9 +182,9 @@ public class ArrayDequeTest extends JSR1 * pop() removes next element, or throws NSEE if empty */ public void testPop() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.pop()); + mustEqual(i, q.pop()); } try { q.pop(); @@ -157,8 +196,8 @@ public class ArrayDequeTest extends JSR1 * offer(null) throws NPE */ public void testOfferNull() { + ArrayDeque q = new ArrayDeque<>(); try { - ArrayDeque q = new ArrayDeque(); q.offer(null); shouldThrow(); } catch (NullPointerException success) {} @@ -168,8 +207,8 @@ public class ArrayDequeTest extends JSR1 * offerFirst(null) throws NPE */ public void testOfferFirstNull() { + ArrayDeque q = new ArrayDeque<>(); try { - ArrayDeque q = new ArrayDeque(); q.offerFirst(null); shouldThrow(); } catch (NullPointerException success) {} @@ -179,8 +218,8 @@ public class ArrayDequeTest extends JSR1 * offerLast(null) throws NPE */ public void testOfferLastNull() { + ArrayDeque q = new ArrayDeque<>(); try { - ArrayDeque q = new ArrayDeque(); q.offerLast(null); shouldThrow(); } catch (NullPointerException success) {} @@ -190,7 +229,7 @@ public class ArrayDequeTest extends JSR1 * offer(x) succeeds */ public void testOffer() { - ArrayDeque q = new ArrayDeque(); + ArrayDeque q = new ArrayDeque<>(); assertTrue(q.offer(zero)); assertTrue(q.offer(one)); assertSame(zero, q.peekFirst()); @@ -201,7 +240,7 @@ public class ArrayDequeTest extends JSR1 * offerFirst(x) succeeds */ public void testOfferFirst() { - ArrayDeque q = new ArrayDeque(); + ArrayDeque q = new ArrayDeque<>(); assertTrue(q.offerFirst(zero)); assertTrue(q.offerFirst(one)); assertSame(one, q.peekFirst()); @@ -212,7 +251,7 @@ public class ArrayDequeTest extends JSR1 * offerLast(x) succeeds */ public void testOfferLast() { - ArrayDeque q = new ArrayDeque(); + ArrayDeque q = new ArrayDeque<>(); assertTrue(q.offerLast(zero)); assertTrue(q.offerLast(one)); assertSame(zero, q.peekFirst()); @@ -223,8 +262,8 @@ public class ArrayDequeTest extends JSR1 * add(null) throws NPE */ public void testAddNull() { + ArrayDeque q = new ArrayDeque<>(); try { - ArrayDeque q = new ArrayDeque(); q.add(null); shouldThrow(); } catch (NullPointerException success) {} @@ -234,8 +273,8 @@ public class ArrayDequeTest extends JSR1 * addFirst(null) throws NPE */ public void testAddFirstNull() { + ArrayDeque q = new ArrayDeque<>(); try { - ArrayDeque q = new ArrayDeque(); q.addFirst(null); shouldThrow(); } catch (NullPointerException success) {} @@ -245,8 +284,8 @@ public class ArrayDequeTest extends JSR1 * addLast(null) throws NPE */ public void testAddLastNull() { + ArrayDeque q = new ArrayDeque<>(); try { - ArrayDeque q = new ArrayDeque(); q.addLast(null); shouldThrow(); } catch (NullPointerException success) {} @@ -256,7 +295,7 @@ public class ArrayDequeTest extends JSR1 * add(x) succeeds */ public void testAdd() { - ArrayDeque q = new ArrayDeque(); + ArrayDeque q = new ArrayDeque<>(); assertTrue(q.add(zero)); assertTrue(q.add(one)); assertSame(zero, q.peekFirst()); @@ -267,7 +306,7 @@ public class ArrayDequeTest extends JSR1 * addFirst(x) succeeds */ public void testAddFirst() { - ArrayDeque q = new ArrayDeque(); + ArrayDeque q = new ArrayDeque<>(); q.addFirst(zero); q.addFirst(one); assertSame(one, q.peekFirst()); @@ -278,7 +317,7 @@ public class ArrayDequeTest extends JSR1 * addLast(x) succeeds */ public void testAddLast() { - ArrayDeque q = new ArrayDeque(); + ArrayDeque q = new ArrayDeque<>(); q.addLast(zero); q.addLast(one); assertSame(zero, q.peekFirst()); @@ -289,8 +328,8 @@ public class ArrayDequeTest extends JSR1 * addAll(null) throws NPE */ public void testAddAll1() { + ArrayDeque q = new ArrayDeque<>(); try { - ArrayDeque q = new ArrayDeque(); q.addAll(null); shouldThrow(); } catch (NullPointerException success) {} @@ -300,10 +339,9 @@ public class ArrayDequeTest extends JSR1 * addAll of a collection with null elements throws NPE */ public void testAddAll2() { + ArrayDeque q = new ArrayDeque<>(); try { - ArrayDeque q = new ArrayDeque(); - Integer[] ints = new Integer[SIZE]; - q.addAll(Arrays.asList(ints)); + q.addAll(Arrays.asList(new Item[SIZE])); shouldThrow(); } catch (NullPointerException success) {} } @@ -313,12 +351,10 @@ public class ArrayDequeTest extends JSR1 * possibly adding some elements */ public void testAddAll3() { + ArrayDeque q = new ArrayDeque<>(); + Item[] items = new Item[2]; items[0] = zero; try { - ArrayDeque q = new ArrayDeque(); - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE-1; ++i) - ints[i] = new Integer(i); - q.addAll(Arrays.asList(ints)); + q.addAll(Arrays.asList(items)); shouldThrow(); } catch (NullPointerException success) {} } @@ -327,24 +363,22 @@ public class ArrayDequeTest extends JSR1 * Deque contains all elements, in traversal order, of successful addAll */ public void testAddAll5() { - Integer[] empty = new Integer[0]; - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE; ++i) - ints[i] = new Integer(i); - ArrayDeque q = new ArrayDeque(); + Item[] empty = new Item[0]; + Item[] items = defaultItems; + ArrayDeque q = new ArrayDeque<>(); assertFalse(q.addAll(Arrays.asList(empty))); - assertTrue(q.addAll(Arrays.asList(ints))); + assertTrue(q.addAll(Arrays.asList(items))); for (int i = 0; i < SIZE; ++i) - assertEquals(ints[i], q.pollFirst()); + mustEqual(items[i], q.pollFirst()); } /** * pollFirst() succeeds unless empty */ public void testPollFirst() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.pollFirst()); + mustEqual(i, q.pollFirst()); } assertNull(q.pollFirst()); } @@ -353,9 +387,9 @@ public class ArrayDequeTest extends JSR1 * pollLast() succeeds unless empty */ public void testPollLast() { - ArrayDeque q = populatedDeque(SIZE); - for (int i = SIZE-1; i >= 0; --i) { - assertEquals(i, q.pollLast()); + ArrayDeque q = populatedDeque(SIZE); + for (int i = SIZE - 1; i >= 0; --i) { + mustEqual(i, q.pollLast()); } assertNull(q.pollLast()); } @@ -364,9 +398,9 @@ public class ArrayDequeTest extends JSR1 * poll() succeeds unless empty */ public void testPoll() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.poll()); + mustEqual(i, q.poll()); } assertNull(q.poll()); } @@ -375,9 +409,9 @@ public class ArrayDequeTest extends JSR1 * remove() removes next element, or throws NSEE if empty */ public void testRemove() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.remove()); + mustEqual(i, q.remove()); } try { q.remove(); @@ -389,13 +423,19 @@ public class ArrayDequeTest extends JSR1 * remove(x) removes x and returns true if present */ public void testRemoveElement() { - ArrayDeque q = populatedDeque(SIZE); - for (int i = 1; i < SIZE; i+=2) { - assertTrue(q.remove(new Integer(i))); - } - for (int i = 0; i < SIZE; i+=2) { - assertTrue(q.remove(new Integer(i))); - assertFalse(q.remove(new Integer(i+1))); + ArrayDeque q = populatedDeque(SIZE); + for (int i = 1; i < SIZE; i += 2) { + mustContain(q, i); + mustRemove(q, i); + mustNotContain(q, i); + mustContain(q, i - 1); + } + for (int i = 0; i < SIZE; i += 2) { + mustContain(q, i); + mustRemove(q, i); + mustNotContain(q, i); + mustNotRemove(q, i + 1); + mustNotContain(q, i + 1); } assertTrue(q.isEmpty()); } @@ -404,10 +444,10 @@ public class ArrayDequeTest extends JSR1 * peekFirst() returns next element, or null if empty */ public void testPeekFirst() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.peekFirst()); - assertEquals(i, q.pollFirst()); + mustEqual(i, q.peekFirst()); + mustEqual(i, q.pollFirst()); assertTrue(q.peekFirst() == null || !q.peekFirst().equals(i)); } @@ -418,10 +458,10 @@ public class ArrayDequeTest extends JSR1 * peek() returns next element, or null if empty */ public void testPeek() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.peek()); - assertEquals(i, q.poll()); + mustEqual(i, q.peek()); + mustEqual(i, q.poll()); assertTrue(q.peek() == null || !q.peek().equals(i)); } @@ -432,10 +472,10 @@ public class ArrayDequeTest extends JSR1 * peekLast() returns next element, or null if empty */ public void testPeekLast() { - ArrayDeque q = populatedDeque(SIZE); - for (int i = SIZE-1; i >= 0; --i) { - assertEquals(i, q.peekLast()); - assertEquals(i, q.pollLast()); + ArrayDeque q = populatedDeque(SIZE); + for (int i = SIZE - 1; i >= 0; --i) { + mustEqual(i, q.peekLast()); + mustEqual(i, q.pollLast()); assertTrue(q.peekLast() == null || !q.peekLast().equals(i)); } @@ -446,10 +486,10 @@ public class ArrayDequeTest extends JSR1 * element() returns first element, or throws NSEE if empty */ public void testElement() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.element()); - assertEquals(i, q.poll()); + mustEqual(i, q.element()); + mustEqual(i, q.poll()); } try { q.element(); @@ -461,10 +501,10 @@ public class ArrayDequeTest extends JSR1 * getFirst() returns first element, or throws NSEE if empty */ public void testFirstElement() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.getFirst()); - assertEquals(i, q.pollFirst()); + mustEqual(i, q.getFirst()); + mustEqual(i, q.pollFirst()); } try { q.getFirst(); @@ -476,10 +516,10 @@ public class ArrayDequeTest extends JSR1 * getLast() returns last element, or throws NSEE if empty */ public void testLastElement() { - ArrayDeque q = populatedDeque(SIZE); - for (int i = SIZE-1; i >= 0; --i) { - assertEquals(i, q.getLast()); - assertEquals(i, q.pollLast()); + ArrayDeque q = populatedDeque(SIZE); + for (int i = SIZE - 1; i >= 0; --i) { + mustEqual(i, q.getLast()); + mustEqual(i, q.pollLast()); } try { q.getLast(); @@ -488,14 +528,13 @@ public class ArrayDequeTest extends JSR1 assertNull(q.peekLast()); } - /** * removeFirst() removes first element, or throws NSEE if empty */ public void testRemoveFirst() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.removeFirst()); + mustEqual(i, q.removeFirst()); } try { q.removeFirst(); @@ -508,9 +547,9 @@ public class ArrayDequeTest extends JSR1 * removeLast() removes last element, or throws NSEE if empty */ public void testRemoveLast() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = SIZE - 1; i >= 0; --i) { - assertEquals(i, q.removeLast()); + mustEqual(i, q.removeLast()); } try { q.removeLast(); @@ -523,41 +562,59 @@ public class ArrayDequeTest extends JSR1 * removeFirstOccurrence(x) removes x and returns true if present */ public void testRemoveFirstOccurrence() { - ArrayDeque q = populatedDeque(SIZE); - for (int i = 1; i < SIZE; i+=2) { - assertTrue(q.removeFirstOccurrence(new Integer(i))); - } - for (int i = 0; i < SIZE; i+=2) { - assertTrue(q.removeFirstOccurrence(new Integer(i))); - assertFalse(q.removeFirstOccurrence(new Integer(i+1))); + Deque q = populatedDeque(SIZE); + assertFalse(q.removeFirstOccurrence(null)); + for (int i = 1; i < SIZE; i += 2) { + assertTrue(q.removeFirstOccurrence(itemFor(i))); + mustNotContain(q, i); + } + for (int i = 0; i < SIZE; i += 2) { + assertTrue(q.removeFirstOccurrence(itemFor(i))); + assertFalse(q.removeFirstOccurrence(itemFor(i + 1))); + mustNotContain(q, i); + mustNotContain(q, i + 1); } assertTrue(q.isEmpty()); + assertFalse(q.removeFirstOccurrence(null)); + assertFalse(q.removeFirstOccurrence(fortytwo)); + q = new ArrayDeque<>(); + assertFalse(q.removeFirstOccurrence(null)); + assertFalse(q.removeFirstOccurrence(fortytwo)); } /** * removeLastOccurrence(x) removes x and returns true if present */ public void testRemoveLastOccurrence() { - ArrayDeque q = populatedDeque(SIZE); - for (int i = 1; i < SIZE; i+=2) { - assertTrue(q.removeLastOccurrence(new Integer(i))); - } - for (int i = 0; i < SIZE; i+=2) { - assertTrue(q.removeLastOccurrence(new Integer(i))); - assertFalse(q.removeLastOccurrence(new Integer(i+1))); + Deque q = populatedDeque(SIZE); + assertFalse(q.removeLastOccurrence(null)); + for (int i = 1; i < SIZE; i += 2) { + assertTrue(q.removeLastOccurrence(itemFor(i))); + mustNotContain(q, i); + } + for (int i = 0; i < SIZE; i += 2) { + assertTrue(q.removeLastOccurrence(itemFor(i))); + assertFalse(q.removeLastOccurrence(itemFor(i + 1))); + mustNotContain(q, i); + mustNotContain(q, i + 1); } assertTrue(q.isEmpty()); + assertFalse(q.removeLastOccurrence(null)); + assertFalse(q.removeLastOccurrence(fortytwo)); + q = new ArrayDeque<>(); + assertFalse(q.removeLastOccurrence(null)); + assertFalse(q.removeLastOccurrence(fortytwo)); } /** * contains(x) reports true when elements added but not yet removed */ public void testContains() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertTrue(q.contains(new Integer(i))); - assertEquals(i, q.pollFirst()); - assertFalse(q.contains(new Integer(i))); + mustContain(q, i); + mustEqual(i, q.pollFirst()); + mustNotContain(q, i); } } @@ -565,11 +622,11 @@ public class ArrayDequeTest extends JSR1 * clear removes all elements */ public void testClear() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); q.clear(); assertTrue(q.isEmpty()); - assertEquals(0, q.size()); - assertTrue(q.add(new Integer(1))); + mustEqual(0, q.size()); + mustAdd(q, one); assertFalse(q.isEmpty()); q.clear(); assertTrue(q.isEmpty()); @@ -579,12 +636,12 @@ public class ArrayDequeTest extends JSR1 * containsAll(c) is true when c contains a subset of elements */ public void testContainsAll() { - ArrayDeque q = populatedDeque(SIZE); - ArrayDeque p = new ArrayDeque(); + ArrayDeque q = populatedDeque(SIZE); + ArrayDeque p = new ArrayDeque<>(); for (int i = 0; i < SIZE; ++i) { assertTrue(q.containsAll(p)); assertFalse(p.containsAll(q)); - assertTrue(p.add(new Integer(i))); + mustAdd(p, i); } assertTrue(p.containsAll(q)); } @@ -593,13 +650,13 @@ public class ArrayDequeTest extends JSR1 * retainAll(c) retains only those elements of c and reports true if changed */ public void testRetainAll() { - ArrayDeque q = populatedDeque(SIZE); - ArrayDeque p = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); + ArrayDeque p = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { boolean changed = q.retainAll(p); - assertEquals(changed, (i > 0)); + mustEqual(changed, (i > 0)); assertTrue(q.containsAll(p)); - assertEquals(SIZE-i, q.size()); + mustEqual(SIZE - i, q.size()); p.removeFirst(); } } @@ -609,47 +666,78 @@ public class ArrayDequeTest extends JSR1 */ public void testRemoveAll() { for (int i = 1; i < SIZE; ++i) { - ArrayDeque q = populatedDeque(SIZE); - ArrayDeque p = populatedDeque(i); + ArrayDeque q = populatedDeque(SIZE); + ArrayDeque p = populatedDeque(i); assertTrue(q.removeAll(p)); - assertEquals(SIZE-i, q.size()); + mustEqual(SIZE - i, q.size()); for (int j = 0; j < i; ++j) { - assertFalse(q.contains(p.removeFirst())); + mustNotContain(q, p.removeFirst()); } } } - /** - * toArray() contains all elements - */ - public void testToArray() { - ArrayDeque q = populatedDeque(SIZE); - Object[] o = q.toArray(); - Arrays.sort(o); - for (int i = 0; i < o.length; i++) - assertEquals(o[i], q.pollFirst()); + void checkToArray(ArrayDeque q) { + int size = q.size(); + Object[] a1 = q.toArray(); + mustEqual(size, a1.length); + Item[] a2 = q.toArray(new Item[0]); + mustEqual(size, a2.length); + Item[] a3 = q.toArray(new Item[Math.max(0, size - 1)]); + mustEqual(size, a3.length); + Item[] a4 = new Item[size]; + assertSame(a4, q.toArray(a4)); + Item[] a5 = new Item[size + 1]; + Arrays.fill(a5, fortytwo); + assertSame(a5, q.toArray(a5)); + Item[] a6 = new Item[size + 2]; + Arrays.fill(a6, fortytwo); + assertSame(a6, q.toArray(a6)); + Object[][] as = { a1, a2, a3, a4, a5, a6 }; + for (Object[] a : as) { + if (a.length > size) assertNull(a[size]); + if (a.length > size + 1) mustEqual(fortytwo, a[size + 1]); + } + Iterator it = q.iterator(); + Item s = q.peekFirst(); + for (int i = 0; i < size; i++) { + Item x = (Item) it.next(); + mustEqual(s.value + i, x); + for (Object[] a : as) + assertSame(a[i], x); + } } /** - * toArray(a) contains all elements - */ - public void testToArray2() { - ArrayDeque q = populatedDeque(SIZE); - Integer[] ints = new Integer[SIZE]; - ints = (Integer[])q.toArray(ints); - Arrays.sort(ints); - for (int i = 0; i < ints.length; i++) - assertEquals(ints[i], q.pollFirst()); + * toArray() and toArray(a) contain all elements in FIFO order + */ + public void testToArray() { + final int size = ThreadLocalRandom.current().nextInt(10); + ArrayDeque q = new ArrayDeque<>(size); + for (int i = 0; i < size; i++) { + checkToArray(q); + q.addLast(itemFor(i)); + } + // Provoke wraparound + int added = size * 2; + for (int i = 0; i < added; i++) { + checkToArray(q); + mustEqual(i, q.poll()); + q.addLast(itemFor(size + i)); + } + for (int i = 0; i < size; i++) { + checkToArray(q); + mustEqual((added + i), q.poll()); + } } /** * toArray(null) throws NullPointerException */ public void testToArray_NullArg() { - ArrayDeque l = new ArrayDeque(); - l.add(new Object()); + ArrayDeque l = new ArrayDeque<>(); + l.add(zero); try { - l.toArray(null); + l.toArray((Object[])null); shouldThrow(); } catch (NullPointerException success) {} } @@ -657,66 +745,79 @@ public class ArrayDequeTest extends JSR1 /** * toArray(incompatible array type) throws ArrayStoreException */ - public void testToArray1_BadArg() { - ArrayDeque l = new ArrayDeque(); - l.add(new Integer(5)); + @SuppressWarnings("CollectionToArraySafeParameter") + public void testToArray_incompatibleArrayType() { + ArrayDeque l = new ArrayDeque<>(); + l.add(five); try { l.toArray(new String[10]); shouldThrow(); } catch (ArrayStoreException success) {} + try { + l.toArray(new String[0]); + shouldThrow(); + } catch (ArrayStoreException success) {} } /** * Iterator iterates through all elements */ public void testIterator() { - ArrayDeque q = populatedDeque(SIZE); - int i = 0; - Iterator it = q.iterator(); - while (it.hasNext()) { - assertTrue(q.contains(it.next())); - ++i; - } - assertEquals(i, SIZE); + ArrayDeque q = populatedDeque(SIZE); + Iterator it = q.iterator(); + int i; + for (i = 0; it.hasNext(); i++) + mustContain(q, it.next()); + mustEqual(i, SIZE); + assertIteratorExhausted(it); + } + + /** + * iterator of empty collection has no elements + */ + public void testEmptyIterator() { + Deque c = new ArrayDeque<>(); + assertIteratorExhausted(c.iterator()); + assertIteratorExhausted(c.descendingIterator()); } /** * Iterator ordering is FIFO */ public void testIteratorOrdering() { - final ArrayDeque q = new ArrayDeque(); + final ArrayDeque q = new ArrayDeque<>(); q.add(one); q.add(two); q.add(three); int k = 0; - for (Iterator it = q.iterator(); it.hasNext();) { - assertEquals(++k, it.next()); + for (Iterator it = q.iterator(); it.hasNext();) { + mustEqual(++k, it.next()); } - assertEquals(3, k); + mustEqual(3, k); } /** * iterator.remove() removes current element */ public void testIteratorRemove() { - final ArrayDeque q = new ArrayDeque(); + final ArrayDeque q = new ArrayDeque<>(); 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(); + mustAdd(q, j); + Iterator it = q.iterator(); for (int j = 1; j <= split; ++j) - assertEquals(it.next(), new Integer(j)); + mustEqual(it.next(), j); it.remove(); - assertEquals(it.next(), new Integer(split+1)); + mustEqual(it.next(), split + 1); for (int j = 1; j <= split; ++j) - q.remove(new Integer(j)); + q.remove(itemFor(j)); it = q.iterator(); - for (int j = split+1; j <= max; ++j) { - assertEquals(it.next(), new Integer(j)); + for (int j = split + 1; j <= max; ++j) { + mustEqual(it.next(), j); it.remove(); } assertFalse(it.hasNext()); @@ -728,14 +829,14 @@ public class ArrayDequeTest extends JSR1 * Descending iterator iterates through all elements */ public void testDescendingIterator() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); int i = 0; - Iterator it = q.descendingIterator(); + Iterator it = q.descendingIterator(); while (it.hasNext()) { - assertTrue(q.contains(it.next())); + mustContain(q, it.next()); ++i; } - assertEquals(i, SIZE); + mustEqual(i, SIZE); assertFalse(it.hasNext()); try { it.next(); @@ -747,17 +848,17 @@ public class ArrayDequeTest extends JSR1 * Descending iterator ordering is reverse FIFO */ public void testDescendingIteratorOrdering() { - final ArrayDeque q = new ArrayDeque(); + final ArrayDeque q = new ArrayDeque<>(); for (int iters = 0; iters < 100; ++iters) { - q.add(new Integer(3)); - q.add(new Integer(2)); - q.add(new Integer(1)); + q.add(three); + q.add(two); + q.add(one); int k = 0; - for (Iterator it = q.descendingIterator(); it.hasNext();) { - assertEquals(++k, it.next()); + for (Iterator it = q.descendingIterator(); it.hasNext();) { + mustEqual(++k, it.next()); } - assertEquals(3, k); + mustEqual(3, k); q.remove(); q.remove(); q.remove(); @@ -768,23 +869,23 @@ public class ArrayDequeTest extends JSR1 * descendingIterator.remove() removes current element */ public void testDescendingIteratorRemove() { - final ArrayDeque q = new ArrayDeque(); + final ArrayDeque q = new ArrayDeque<>(); 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(); + q.add(itemFor(j)); + Iterator it = q.descendingIterator(); for (int j = 1; j <= split; ++j) - assertEquals(it.next(), new Integer(j)); + mustEqual(it.next(), itemFor(j)); it.remove(); - assertEquals(it.next(), new Integer(split+1)); + mustEqual(it.next(), itemFor(split + 1)); for (int j = 1; j <= split; ++j) - q.remove(new Integer(j)); + q.remove(itemFor(j)); it = q.descendingIterator(); - for (int j = split+1; j <= max; ++j) { - assertEquals(it.next(), new Integer(j)); + for (int j = split + 1; j <= max; ++j) { + mustEqual(it.next(), j); it.remove(); } assertFalse(it.hasNext()); @@ -792,34 +893,69 @@ public class ArrayDequeTest extends JSR1 } } - /** * toString() contains toStrings of elements */ public void testToString() { - ArrayDeque q = populatedDeque(SIZE); + ArrayDeque q = populatedDeque(SIZE); String s = q.toString(); for (int i = 0; i < SIZE; ++i) { - assertTrue(s.indexOf(String.valueOf(i)) >= 0); + assertTrue(s.contains(String.valueOf(i))); } } /** - * 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 { - ArrayDeque q = populatedDeque(SIZE); - ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); - ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); - out.writeObject(q); - out.close(); - - ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); - ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); - ArrayDeque r = (ArrayDeque)in.readObject(); - assertEquals(q.size(), r.size()); - while (!q.isEmpty()) - assertEquals(q.remove(), r.remove()); + Queue x = populatedDeque(SIZE); + Queue y = serialClone(x); + + assertNotSame(y, x); + mustEqual(x.size(), y.size()); + mustEqual(x.toString(), y.toString()); + mustEqual(Arrays.toString(x.toArray()), Arrays.toString(y.toArray())); + assertTrue(Arrays.equals(x.toArray(), y.toArray())); + while (!x.isEmpty()) { + assertFalse(y.isEmpty()); + mustEqual(x.remove(), y.remove()); + } + assertTrue(y.isEmpty()); + } + + /** + * A cloned deque has same elements in same order + */ + public void testClone() throws Exception { + ArrayDeque x = populatedDeque(SIZE); + ArrayDeque y = x.clone(); + + assertNotSame(y, x); + mustEqual(x.size(), y.size()); + mustEqual(x.toString(), y.toString()); + assertTrue(Arrays.equals(x.toArray(), y.toArray())); + while (!x.isEmpty()) { + assertFalse(y.isEmpty()); + mustEqual(x.remove(), y.remove()); + } + assertTrue(y.isEmpty()); + } + + /** + * remove(null), contains(null) always return false + */ + public void testNeverContainsNull() { + Deque[] qs = { + new ArrayDeque<>(), + populatedDeque(2), + }; + + for (Deque q : qs) { + assertFalse(q.contains(null)); + assertFalse(q.remove(null)); + assertFalse(q.removeFirstOccurrence(null)); + assertFalse(q.removeLastOccurrence(null)); + } } }