Merge changes Ib8491242,I695758c4

* changes:
  EnumSet.isEmpty(): Provide test coverage.
  Lists: test coverage for misc corner cases.

6 files changed, 129 insertions, 25 deletions

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java
index 7b3d7d04e3..1959c422e3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.harmony.tests.java.util;
 
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.ConcurrentModificationException;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.Spliterator;
 import java.util.Vector;
+import java.util.function.Supplier;
 
 import libcore.java.util.SpliteratorTester;
 import tests.support.Support_ListTest;
@@ -888,6 +889,23 @@ public class ArrayListTest extends junit.framework.TestCase {
         list.trimToSize();
     }
 
+    /**
+     * Checks that an element can successfully be added to an ArrayList that
+     * was previously {@link ArrayList#trimToSize() trimmed} to the empty size.
+     */
+    public void test_trimToEmpty_add() {
+        ArrayList<String> list = new ArrayList<>();
+        list.trimToSize(); // empty after construction
+        list.add("element");
+        assertEquals(Arrays.asList("element"), list);
+
+        list.remove("element");
+        assertEquals(Collections.emptyList(), list);
+        list.trimToSize(); // empty after all elements have been removed
+        list.add("element");
+        assertEquals(Arrays.asList("element"), list);
+    }
+
     public void test_addAll() {
         ArrayList list = new ArrayList();
         list.add("one");
@@ -1109,8 +1127,12 @@ public class ArrayListTest extends junit.framework.TestCase {
     }
 
     public void test_forEachRemaining_iterator() throws Exception {
-        ForEachRemainingTester.runTests(ArrayList.class, new String[] { "foo", "bar", "baz"});
-        ForEachRemainingTester.runTests(ArrayList.class, new String[] { "foo" });
+        ForEachRemainingTester.runTests(ArrayList::new, new String[] { "foo", "bar", "baz"});
+        ForEachRemainingTester.runTests(ArrayList::new, new String[] { "foo" });
+
+        Supplier<List<String>> sublistSupplier = () -> new ArrayList<String>().subList(0, 0);
+        ForEachRemainingTester.runTests(sublistSupplier, new String[] { "foo", "bar", "baz"});
+        ForEachRemainingTester.runTests(sublistSupplier, new String[] { "foo" });
     }
 
     public void test_spliterator() throws Exception {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java
index fb2cbcb5b9..baaaf71d4f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java
@@ -17,6 +17,7 @@
 package org.apache.harmony.tests.java.util;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.Iterator;
@@ -206,7 +207,6 @@ public class EnumSetTest extends TestCase {
         EnumSet<HugeEnum> anotherHugeSet = EnumSet.allOf(HugeEnum.class);
         assertEquals(hugeEnumSet, anotherHugeSet);
         assertNotSame(hugeEnumSet, anotherHugeSet);
-
     }
 
     /**
@@ -605,16 +605,46 @@ public class EnumSetTest extends TestCase {
      * java.util.EnumSet#size()
      */
     public void test_size() {
-        Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class);
-        set.add(EnumFoo.a);
-        set.add(EnumFoo.b);
-        assertEquals("Size should be 2", 2, set.size());
+        assertEmpty(EnumSet.noneOf(EnumFoo.class));
+        assertSize(2, EnumSet.of(EnumFoo.a, EnumFoo.b));
 
-        // test enum type with more than 64 elements
-        Set<HugeEnum> hugeSet = EnumSet.noneOf(HugeEnum.class);
-        hugeSet.add(HugeEnum.a);
-        hugeSet.add(HugeEnum.bb);
-        assertEquals("Size should be 2", 2, hugeSet.size());
+        // enum type with more than 64 elements
+        assertEmpty(EnumSet.noneOf(HugeEnum.class));
+        assertSize(2, EnumSet.of(HugeEnum.a, HugeEnum.bb));
+        assertSize(65, EnumSet.allOf(HugeEnum.class));
+    }
+
+    public void test_size_modification_regular() {
+        EnumSet<EnumFoo> set = EnumSet.noneOf(EnumFoo.class);
+        assertEmpty(set);
+        set.addAll(Arrays.asList(EnumFoo.a, EnumFoo.b));
+        assertSize(2, set);
+        set.add(EnumFoo.c);
+        assertSize(3, set);
+        set.remove(EnumFoo.d);
+        assertSize(3, set);
+        set.remove(EnumFoo.b);
+        assertSize(2, set);
+        set.clear();
+        assertEmpty(set);
+    }
+
+    public void test_size_modification_jumbo() {
+        EnumSet<HugeEnum> set = EnumSet.allOf(HugeEnum.class);
+        assertSize(65, set);
+        set.remove(HugeEnum.b);
+        assertSize(64, set);
+        set.clear();
+        assertEmpty(set);
+    }
+
+    private static void assertEmpty(EnumSet<?> set) {
+        assertSize(0, set);
+    }
+
+    private static void assertSize(int expectedSize, Set<?> set) {
+        assertEquals(expectedSize, set.size());
+        assertEquals(expectedSize == 0, set.isEmpty());
     }
 
     /**
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java
index ea829c9a90..e0451615cf 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java
@@ -943,8 +943,8 @@ public class LinkedListTest extends junit.framework.TestCase {
     }
 
     public void test_forEachRemaining_iterator() throws Exception {
-        ForEachRemainingTester.runTests(LinkedList.class, new String[]{ "foo", "bar", "baz "});
-        ForEachRemainingTester.runTests(LinkedList.class, new String[] { "foo" });
+        ForEachRemainingTester.runTests(LinkedList::new, new String[]{ "foo", "bar", "baz "});
+        ForEachRemainingTester.runTests(LinkedList::new, new String[] { "foo" });
     }
 
     public void test_spliterator() throws Exception {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
index f889c8e7e9..d0b1f2b4d5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
@@ -1437,8 +1437,8 @@ public class VectorTest extends junit.framework.TestCase {
     }
 
     public void test_forEachRemaining_iterator() throws Exception {
-        ForEachRemainingTester.runTests(Vector.class, new String[] { "foo", "bar", "baz" });
-        ForEachRemainingTester.runTests(Vector.class, new String[] { "foo" });
+        ForEachRemainingTester.runTests(Vector::new, new String[] { "foo", "bar", "baz" });
+        ForEachRemainingTester.runTests(Vector::new, new String[] { "foo" });
     }
 
     public void test_spliterator() throws Exception {
diff --git a/luni/src/test/java/libcore/java/util/ArrayListTest.java b/luni/src/test/java/libcore/java/util/ArrayListTest.java
index 95dd3f3628..a90fb68254 100644
--- a/luni/src/test/java/libcore/java/util/ArrayListTest.java
+++ b/luni/src/test/java/libcore/java/util/ArrayListTest.java
@@ -17,6 +17,8 @@
 package libcore.java.util;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class ArrayListTest extends junit.framework.TestCase {
     public void test_replaceAll() {
@@ -26,4 +28,53 @@ public class ArrayListTest extends junit.framework.TestCase {
     public void test_sort() {
         ListDefaultMethodTester.test_sort(new ArrayList<>());
     }
+
+    public void test_sublist_throws() {
+        ArrayList<String> list = new ArrayList<>(Arrays.asList("zero", "one", "two"));
+
+        // For comparison, a few cases that should not throw
+        list.subList(1, 2);
+        list.subList(0, 3);
+        list.subList(1, 1);
+
+        // Cases that should throw
+        try {
+            list.subList(-1, 1); // fromIndex out of bounds
+            fail();
+        } catch (IndexOutOfBoundsException expected) {
+        }
+
+        try {
+            list.subList(0, 4); // toIndex out of bounds
+            fail();
+        } catch (IndexOutOfBoundsException expected) {
+        }
+
+        try {
+            list.subList(-1, 4); // both fromIndex and toIndex out of bounds
+            fail();
+        } catch (IndexOutOfBoundsException expected) {
+        }
+
+        try {
+            list.subList(1, 0); // fromIndex > toIndex
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+    }
+
+    public void test_sublist_set() {
+        List<String> list = new ArrayList<>(Arrays.asList("zero", "one", "two"));
+        list.subList(1, 2).set(0, "ONE");
+        assertEquals(Arrays.asList("zero", "ONE", "two"), list);
+
+        list.subList(1, 2).subList(0, 1).set(0, "1");
+        assertEquals(Arrays.asList("zero", "1", "two"), list);
+
+        try {
+            list.subList(1, 2).set(2, "out of bounds");
+            fail();
+        } catch (IndexOutOfBoundsException expected) {
+        }
+    }
 }
diff --git a/luni/src/test/java/libcore/java/util/ForEachRemainingTester.java b/luni/src/test/java/libcore/java/util/ForEachRemainingTester.java
index 9387e96594..3bd5b88bc0 100644
--- a/luni/src/test/java/libcore/java/util/ForEachRemainingTester.java
+++ b/luni/src/test/java/libcore/java/util/ForEachRemainingTester.java
@@ -23,6 +23,7 @@ import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.function.Supplier;
 
 import static junit.framework.Assert.*;
 
@@ -32,15 +33,15 @@ import static junit.framework.Assert.*;
  */
 public class ForEachRemainingTester {
 
-    @SuppressWarnings("unchecked")
-    public static <T> void runTests(Class<?> collectionClazz, T[] initialData)
-            throws Exception {
-        test_forEachRemaining((Collection<T>) collectionClazz.newInstance(), initialData);
-        test_forEachRemaining_NPE((Collection<T>) collectionClazz.newInstance(), initialData);
-        test_forEachRemaining_CME((Collection<T>) collectionClazz.newInstance(), initialData);
+    public static <T> void runTests(Supplier<? extends Collection<T>> collectionSupplier,
+            T[] initialData) throws Exception {
+        test_forEachRemaining(collectionSupplier.get(), initialData);
+        test_forEachRemaining_NPE(collectionSupplier.get(), initialData);
+        test_forEachRemaining_CME(collectionSupplier.get(), initialData);
 
-        if (List.class.isAssignableFrom(collectionClazz)) {
-            List<T> asList = (List<T>) collectionClazz.newInstance();
+        Collection<T> collection = collectionSupplier.get();
+        if (collection instanceof List) {
+            List<T> asList = (List<T>) collection;
             test_forEachRemaining_list(asList, initialData);
             test_forEachRemaining_NPE_list(asList, initialData);
             test_forEachRemaining_CME_list(asList, initialData);