Move testSort to java8 tests and fix List.replaceAll test.

Change-Id: I90f515888fa065eb31502e7b1fe2d6e94c470ec2
gwtproject · May 27, 2016 · 978e3cd · 978e3cd
1 parent c32d7d1
commit 978e3cd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/user/test/com/google/gwt/emultest/java/util/ArrayListTest.java b/user/test/com/google/gwt/emultest/java/util/ArrayListTest.java
@@ -15,11 +15,8 @@
  */
 package com.google.gwt.emultest.java.util;
 
-import static java.util.Arrays.asList;
-
 import java.util.AbstractList;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 
@@ -129,20 +126,6 @@ public void testRemoveRange() {
     assertEquals(0, l.size());
   }
 
-  public void testSort() {
-    ArrayList<String> list = new ArrayList<>();
-    list.sort(null);
-
-    Collections.addAll(list, "b", "a", "c");
-    list.sort(null);
-    assertEquals(asList("a", "b", "c"), list);
-
-    list = new ArrayList<>();
-    Collections.addAll(list, "b", "a", "c");
-    list.sort(Collections.reverseOrder());
-    assertEquals(asList("c", "b", "a"), list);
-  }
-
   @Override
   protected List makeEmptyList() {
     return new ArrayList();

diff --git a/user/test/com/google/gwt/emultest/java8/util/AbstractJava8ListTest.java b/user/test/com/google/gwt/emultest/java8/util/AbstractJava8ListTest.java
@@ -83,7 +83,7 @@ public void testRemoveIf() {
   }
 
   public void testReplaceAll() {
-    ArrayList<String> list = new ArrayList<>();
+    List<String> list = createEmptyList();
 
     try {
       list.replaceAll(null);
@@ -106,6 +106,20 @@ public void testReplaceAll() {
     assertEquals(asList("a01", "b01", "c1"), list);
   }
 
+  public void testSort() {
+    List<String> list = createEmptyList();
+    list.sort(null);
+
+    Collections.addAll(list, "b", "a", "c");
+    list.sort(null);
+    assertEquals(asList("a", "b", "c"), list);
+
+    list = createEmptyList();
+    Collections.addAll(list, "b", "a", "c");
+    list.sort(Collections.reverseOrder());
+    assertEquals(asList("c", "b", "a"), list);
+  }
+
   protected abstract List<String> createEmptyList();
 
 }