Move non-collection tests out of CollectionsSuite.
Change-Id: I0cac153c7a9bee2efe2a14241cbc838ee7d9058a
diff --git a/user/test/com/google/gwt/emultest/CollectionsSuite.java b/user/test/com/google/gwt/emultest/CollectionsSuite.java
index e078443..95d76a6 100644
--- a/user/test/com/google/gwt/emultest/CollectionsSuite.java
+++ b/user/test/com/google/gwt/emultest/CollectionsSuite.java
@@ -20,8 +20,6 @@
import com.google.gwt.emultest.java.util.ArraysTest;
import com.google.gwt.emultest.java.util.BitSetTest;
import com.google.gwt.emultest.java.util.CollectionsTest;
-import com.google.gwt.emultest.java.util.ComparatorTest;
-import com.google.gwt.emultest.java.util.DateTest;
import com.google.gwt.emultest.java.util.EnumMapTest;
import com.google.gwt.emultest.java.util.EnumSetTest;
import com.google.gwt.emultest.java.util.HashMapSmokeTest;
@@ -31,9 +29,7 @@
import com.google.gwt.emultest.java.util.LinkedHashMapTest;
import com.google.gwt.emultest.java.util.LinkedHashSetTest;
import com.google.gwt.emultest.java.util.LinkedListTest;
-import com.google.gwt.emultest.java.util.ObjectsTest;
import com.google.gwt.emultest.java.util.PriorityQueueTest;
-import com.google.gwt.emultest.java.util.RandomTest;
import com.google.gwt.emultest.java.util.StackTest;
import com.google.gwt.emultest.java.util.TreeMapIntegerDoubleTest;
import com.google.gwt.emultest.java.util.TreeMapIntegerDoubleWithComparatorTest;
@@ -55,8 +51,6 @@
ArraysTest.class,
BitSetTest.class,
CollectionsTest.class,
- ComparatorTest.class,
- DateTest.class,
EnumMapTest.class,
EnumSetTest.class,
HashMapTest.class,
@@ -65,9 +59,7 @@
LinkedHashMapTest.class,
LinkedHashSetTest.class,
LinkedListTest.class,
- ObjectsTest.class,
PriorityQueueTest.class,
- RandomTest.class,
StackTest.class,
VectorTest.class,
TreeMapStringStringTest.class,
diff --git a/user/test/com/google/gwt/emultest/EmulSuite.java b/user/test/com/google/gwt/emultest/EmulSuite.java
index 632f4b8..f9246e2 100644
--- a/user/test/com/google/gwt/emultest/EmulSuite.java
+++ b/user/test/com/google/gwt/emultest/EmulSuite.java
@@ -52,6 +52,11 @@
import com.google.gwt.emultest.java.sql.SqlDateTest;
import com.google.gwt.emultest.java.sql.SqlTimeTest;
import com.google.gwt.emultest.java.sql.SqlTimestampTest;
+import com.google.gwt.emultest.java.util.ComparatorTest;
+import com.google.gwt.emultest.java.util.DateTest;
+import com.google.gwt.emultest.java.util.ObjectsTest;
+import com.google.gwt.emultest.java.util.RandomTest;
+
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -113,6 +118,12 @@
SqlTimeTest.class,
SqlTimestampTest.class,
+ // -- java.util
+ ComparatorTest.class,
+ DateTest.class,
+ ObjectsTest.class,
+ RandomTest.class,
+
// Put last to reduce number of times the test framework switches modules
MathContextWithObfuscatedEnumsTest.class,
})