--- jsr166/src/test/tck/ArrayDequeTest.java	2016/10/16 22:13:15	1.42
+++ jsr166/src/test/tck/ArrayDequeTest.java	2016/10/25 01:32:55	1.51
@@ -1,12 +1,14 @@
 /*
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
+ * 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 java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -25,7 +27,7 @@ public class ArrayDequeTest extends JSR1
     public static Test suite() {
         class Implementation implements CollectionImplementation {
             public Class<?> klazz() { return ArrayDeque.class; }
-            public Collection emptyCollection() { return new ArrayDeque(); }
+            public Collection emptyCollection() { return populatedDeque(0); }
             public Object makeElement(int i) { return i; }
             public boolean isConcurrent() { return false; }
             public boolean permitsNulls() { return false; }
@@ -38,17 +40,17 @@ public class ArrayDequeTest extends JSR1
      * Returns a new deque of given size containing consecutive
      * Integers 0 ... n - 1.
      */
-    private ArrayDeque<Integer> populatedDeque(int n) {
+    private static ArrayDeque<Integer> populatedDeque(int n) {
         // Randomize various aspects of memory layout, including
         // filled-to-capacity and wraparound.
         final ArrayDeque<Integer> q;
         ThreadLocalRandom rnd = ThreadLocalRandom.current();
         switch (rnd.nextInt(6)) {
-        case 0: q = new ArrayDeque<Integer>(); break;
-        case 1: q = new ArrayDeque<Integer>(0); break;
-        case 2: q = new ArrayDeque<Integer>(1); break;
-        case 3: q = new ArrayDeque<Integer>(n - 1); break;
-        case 4: q = new ArrayDeque<Integer>(n); break;
+        case 0: q = new ArrayDeque<Integer>();      break;
+        case 1: q = new ArrayDeque<Integer>(0);     break;
+        case 2: q = new ArrayDeque<Integer>(1);     break;
+        case 3: q = new ArrayDeque<Integer>(Math.max(0, n - 1)); break;
+        case 4: q = new ArrayDeque<Integer>(n);     break;
         case 5: q = new ArrayDeque<Integer>(n + 1); break;
         default: throw new AssertionError();
         }
@@ -59,7 +61,7 @@ public class ArrayDequeTest extends JSR1
             break;
         case 1:
             q.addLast(42);
-            assertEquals((Integer) 42, q.removeLast());
+            assertEquals((Integer) 42, q.removeFirst());
             break;
         case 2: /* do nothing */ break;
         default: throw new AssertionError();
@@ -71,10 +73,12 @@ public class ArrayDequeTest extends JSR1
         else
             for (int i = n; --i >= 0; )
                 q.addFirst((Integer) i);
-        assertFalse(q.isEmpty());
         assertEquals(n, q.size());
-        assertEquals((Integer) 0, q.peekFirst());
-        assertEquals((Integer) (n - 1), q.peekLast());
+        if (n > 0) {
+            assertFalse(q.isEmpty());
+            assertEquals((Integer) 0, q.peekFirst());
+            assertEquals((Integer) (n - 1), q.peekLast());
+        }
         return q;
     }
 
@@ -940,6 +944,24 @@ public class ArrayDequeTest extends JSR1
 
         assertNotSame(y, x);
         assertEquals(x.size(), y.size());
+        assertEquals(x.toString(), y.toString());
+        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
+        while (!x.isEmpty()) {
+            assertFalse(y.isEmpty());
+            assertEquals(x.remove(), y.remove());
+        }
+        assertTrue(y.isEmpty());
+    }
+
+    /**
+     * A cloned deque has same elements in same order
+     */
+    public void testClone() throws Exception {
+        ArrayDeque<Integer> x = populatedDeque(SIZE);
+        ArrayDeque<Integer> y = x.clone();
+
+        assertNotSame(y, x);
+        assertEquals(x.size(), y.size());
         assertEquals(x.toString(), y.toString());
         assertTrue(Arrays.equals(x.toArray(), y.toArray()));
         while (!x.isEmpty()) {