Move tests that require java8 into java8/ Change-Id: Ib26519792d1fd296be6664337a1cd58140d87d8f
diff --git a/user/test/com/google/gwt/emultest/EmulJava8Suite.java b/user/test/com/google/gwt/emultest/EmulJava8Suite.java index fbe0c91..e898b30 100644 --- a/user/test/com/google/gwt/emultest/EmulJava8Suite.java +++ b/user/test/com/google/gwt/emultest/EmulJava8Suite.java
@@ -15,6 +15,10 @@ */ package com.google.gwt.emultest; +import com.google.gwt.emultest.java8.lang.DoubleTest; +import com.google.gwt.emultest.java8.lang.FloatTest; +import com.google.gwt.emultest.java8.lang.MathTest; +import com.google.gwt.emultest.java8.lang.StringTest; import com.google.gwt.emultest.java8.math.BigIntegerConvertTest; import com.google.gwt.emultest.java8.util.ArrayListTest; import com.google.gwt.emultest.java8.util.ArraysTest; @@ -51,6 +55,12 @@ public static Test suite() { GWTTestSuite suite = new GWTTestSuite("Tests for com.google.gwt.emul.java8"); + //-- java.lang + suite.addTestSuite(DoubleTest.class); + suite.addTestSuite(FloatTest.class); + suite.addTestSuite(MathTest.class); + suite.addTestSuite(StringTest.class); + //-- java.math suite.addTestSuite(BigIntegerConvertTest.class);
diff --git a/user/test/com/google/gwt/emultest/EmulSuite.java b/user/test/com/google/gwt/emultest/EmulSuite.java index 1e82a93..285dbbf1 100644 --- a/user/test/com/google/gwt/emultest/EmulSuite.java +++ b/user/test/com/google/gwt/emultest/EmulSuite.java
@@ -26,17 +26,13 @@ import com.google.gwt.emultest.java.lang.ByteTest; import com.google.gwt.emultest.java.lang.CharacterTest; import com.google.gwt.emultest.java.lang.CompilerConstantStringTest; -import com.google.gwt.emultest.java.lang.DoubleTest; -import com.google.gwt.emultest.java.lang.FloatTest; import com.google.gwt.emultest.java.lang.IntegerTest; import com.google.gwt.emultest.java.lang.JsExceptionTest; import com.google.gwt.emultest.java.lang.LongTest; -import com.google.gwt.emultest.java.lang.MathTest; import com.google.gwt.emultest.java.lang.NullPointerExceptionTest; import com.google.gwt.emultest.java.lang.ObjectTest; import com.google.gwt.emultest.java.lang.ShortTest; import com.google.gwt.emultest.java.lang.StringBufferTest; -import com.google.gwt.emultest.java.lang.StringTest; import com.google.gwt.emultest.java.lang.SystemTest; import com.google.gwt.emultest.java.lang.ThrowableStackTraceEmulTest; import com.google.gwt.emultest.java.lang.ThrowableTest; @@ -79,17 +75,13 @@ suite.addTestSuite(ByteTest.class); suite.addTestSuite(CharacterTest.class); suite.addTestSuite(CompilerConstantStringTest.class); - suite.addTestSuite(DoubleTest.class); - suite.addTestSuite(FloatTest.class); suite.addTestSuite(IntegerTest.class); suite.addTestSuite(JsExceptionTest.class); suite.addTestSuite(LongTest.class); - suite.addTestSuite(MathTest.class); suite.addTestSuite(NullPointerExceptionTest.class); suite.addTestSuite(ObjectTest.class); suite.addTestSuite(ShortTest.class); suite.addTestSuite(StringBufferTest.class); - suite.addTestSuite(StringTest.class); suite.addTestSuite(SystemTest.class); suite.addTestSuite(ThrowableTest.class); suite.addTestSuite(ThrowableStackTraceEmulTest.class);
diff --git a/user/test/com/google/gwt/emultest/java/lang/DoubleTest.java b/user/test/com/google/gwt/emultest/java8/lang/DoubleTest.java similarity index 99% rename from user/test/com/google/gwt/emultest/java/lang/DoubleTest.java rename to user/test/com/google/gwt/emultest/java8/lang/DoubleTest.java index 8d84e2d..627b29f 100644 --- a/user/test/com/google/gwt/emultest/java/lang/DoubleTest.java +++ b/user/test/com/google/gwt/emultest/java8/lang/DoubleTest.java
@@ -14,7 +14,7 @@ * the License. */ -package com.google.gwt.emultest.java.lang; +package com.google.gwt.emultest.java8.lang; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.junit.client.GWTTestCase;
diff --git a/user/test/com/google/gwt/emultest/java/lang/FloatTest.java b/user/test/com/google/gwt/emultest/java8/lang/FloatTest.java similarity index 99% rename from user/test/com/google/gwt/emultest/java/lang/FloatTest.java rename to user/test/com/google/gwt/emultest/java8/lang/FloatTest.java index 87dc276..307a949 100644 --- a/user/test/com/google/gwt/emultest/java/lang/FloatTest.java +++ b/user/test/com/google/gwt/emultest/java8/lang/FloatTest.java
@@ -14,7 +14,7 @@ * the License. */ -package com.google.gwt.emultest.java.lang; +package com.google.gwt.emultest.java8.lang; import com.google.gwt.junit.client.GWTTestCase;
diff --git a/user/test/com/google/gwt/emultest/java/lang/MathTest.java b/user/test/com/google/gwt/emultest/java8/lang/MathTest.java similarity index 99% rename from user/test/com/google/gwt/emultest/java/lang/MathTest.java rename to user/test/com/google/gwt/emultest/java8/lang/MathTest.java index 7259c1b..b366caf 100644 --- a/user/test/com/google/gwt/emultest/java/lang/MathTest.java +++ b/user/test/com/google/gwt/emultest/java8/lang/MathTest.java
@@ -14,7 +14,7 @@ * the License. */ -package com.google.gwt.emultest.java.lang; +package com.google.gwt.emultest.java8.lang; import com.google.gwt.junit.DoNotRunWith; import com.google.gwt.junit.Platform;
diff --git a/user/test/com/google/gwt/emultest/java/lang/StringTest.java b/user/test/com/google/gwt/emultest/java8/lang/StringTest.java similarity index 99% rename from user/test/com/google/gwt/emultest/java/lang/StringTest.java rename to user/test/com/google/gwt/emultest/java8/lang/StringTest.java index e897f9d..48ca3d0 100644 --- a/user/test/com/google/gwt/emultest/java/lang/StringTest.java +++ b/user/test/com/google/gwt/emultest/java8/lang/StringTest.java
@@ -13,8 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.gwt.emultest.java.lang; +package com.google.gwt.emultest.java8.lang; +import com.google.gwt.emultest.java.lang.C; import com.google.gwt.junit.client.GWTTestCase; import com.google.gwt.testing.TestUtils;