Move tests that require java8 into java8/

Change-Id: Ib26519792d1fd296be6664337a1cd58140d87d8f
gwtproject · May 23, 2016 · 766b810 · 766b810
1 parent 29880a7
commit 766b810
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git 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 class EmulJava8Suite {
   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
@@ -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 @@ public static Test suite() {
     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/...le/gwt/emultest/java/lang/DoubleTest.java → ...e/gwt/emultest/java8/lang/DoubleTest.java b/...le/gwt/emultest/java/lang/DoubleTest.java → ...e/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/...gle/gwt/emultest/java/lang/FloatTest.java → ...le/gwt/emultest/java8/lang/FloatTest.java b/...gle/gwt/emultest/java/lang/FloatTest.java → ...le/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/...ogle/gwt/emultest/java/lang/MathTest.java → ...gle/gwt/emultest/java8/lang/MathTest.java b/...ogle/gwt/emultest/java/lang/MathTest.java → ...gle/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/...le/gwt/emultest/java/lang/StringTest.java → ...e/gwt/emultest/java8/lang/StringTest.java b/...le/gwt/emultest/java/lang/StringTest.java → ...e/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;