--- jsr166/src/test/tck/ArrayDequeTest.java	2016/10/17 01:34:10	1.44
+++ jsr166/src/test/tck/ArrayDequeTest.java	2016/10/17 15:31:19	1.47
@@ -14,6 +14,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Queue;
 import java.util.Random;
+import java.util.Spliterator;
 import java.util.concurrent.ThreadLocalRandom;
 
 import junit.framework.Test;
@@ -27,7 +28,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; }
@@ -40,7 +41,7 @@ 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;
@@ -989,6 +990,33 @@ public class ArrayDequeTest extends JSR1
     }
 
     /**
+     * Spliterator characteristics are as advertised
+     */
+    public void testSpliterator_characteristics() {
+        ArrayDeque q = new ArrayDeque();
+        Spliterator s = q.spliterator();
+        int characteristics = s.characteristics();
+        int required = Spliterator.NONNULL
+            | Spliterator.ORDERED
+            | Spliterator.SIZED
+            | Spliterator.SUBSIZED;
+        assertEquals(required, characteristics & required);
+        assertEquals(0, characteristics
+                     & (Spliterator.CONCURRENT
+                        | Spliterator.DISTINCT
+                        | Spliterator.IMMUTABLE
+                        | Spliterator.SORTED));
+    }
+
+    /**
+     * Spliterator.getComparator always throws IllegalStateException
+     */
+    public void testSpliterator_getComparator() {
+        assertThrows(IllegalStateException.class,
+                     () -> new ArrayDeque().spliterator().getComparator());
+    }
+
+    /**
      * Handle capacities near Integer.MAX_VALUE.
      * ant -Dvmoptions=-Xmx24g -Djsr166.expensiveTests=true -Djsr166.tckTestClass=ArrayDequeTest -Djsr166.methodFilter=testHuge tck
      */