Move tests under org.truffleruby.test package

Author: eregon

mx.truffleruby/mx_truffleruby.py

@@ -150,7 +150,7 @@ def ruby_check_heap_dump(input_args, out=None):
     vm_args, truffleruby_args = mx.extract_VM_args(args, useDoubleDash=True, defaultAllVMArgs=False)
     vm_args += mx.get_runtime_jvm_args(dists)
     # vm_args.append("-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=y")
-    vm_args.append("org.truffleruby.LeakTest")
+    vm_args.append("org.truffleruby.test.LeakTest")
     out = mx.OutputCapture() if out is None else out
     retval = mx.run_java(vm_args + truffleruby_args, jdk=jdk, nonZeroIsFatal=False, out=out)
     if retval == 0:

src/main/java/org/truffleruby/language/loader/EmbeddedScript.java

@@ -103,7 +103,7 @@ private boolean isShebangLine(byte[] bytes, int lineStart) {
         return bytes.length - lineStart >= 2 && bytes[lineStart] == '#' && bytes[lineStart + 1] == '!';
     }
 
-    static boolean lineContainsRuby(byte[] bytes, int lineStart, int lineLength) {
+    public static boolean lineContainsRuby(byte[] bytes, int lineStart, int lineLength) {
         if (lineLength < 4) {
             return false;
         }

src/test/java/org/truffleruby/ArrayBuilderTest.java renamed to src/test/java/org/truffleruby/test/ArrayBuilderTest.java

@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby;
+package org.truffleruby.test;
 
 import static org.junit.Assert.assertEquals;
 
@@ -24,6 +24,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayBuilderNode;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.array.ArrayBuilderNode.BuilderState;

src/test/java/org/truffleruby/ArrayStoreTest.java renamed to src/test/java/org/truffleruby/test/ArrayStoreTest.java

@@ -7,12 +7,12 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby;
+package org.truffleruby.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.truffleruby.RubyTest.assertThrows;
+import static org.truffleruby.test.RubyTest.assertThrows;
 
 import org.junit.Test;
 import org.truffleruby.core.array.library.ArrayStoreLibrary;

src/test/java/org/truffleruby/ContextPermissionsTest.java renamed to src/test/java/org/truffleruby/test/ContextPermissionsTest.java

@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby;
+package org.truffleruby.test;
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Value;

src/test/java/org/truffleruby/language/loader/EmbeddedScriptTest.java renamed to src/test/java/org/truffleruby/test/EmbeddedScriptTest.java

@@ -7,20 +7,22 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.language.loader;
+package org.truffleruby.test;
 
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 
+import junit.framework.TestCase;
 import org.junit.Test;
 import org.truffleruby.core.string.StringOperations;
+import org.truffleruby.language.loader.EmbeddedScript;
 
 public class EmbeddedScriptTest {
 
     @Test
     public void testLineContainsRubyFalse() {
         final byte[] bytes = bytes("foo bar baz");
-        assertFalse(EmbeddedScript.lineContainsRuby(bytes, 0, bytes.length));
+        TestCase.assertFalse(EmbeddedScript.lineContainsRuby(bytes, 0, bytes.length));
     }
 
     @Test

src/test/java/org/truffleruby/JSR223InteropTest.java renamed to src/test/java/org/truffleruby/test/JSR223InteropTest.java

@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby;
+package org.truffleruby.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

src/test/java/org/truffleruby/LeakTest.java renamed to src/test/java/org/truffleruby/test/LeakTest.java

@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby;
+package org.truffleruby.test;
 
 import java.io.IOException;
 import java.lang.management.ManagementFactory;

src/test/java/org/truffleruby/MiscTest.java renamed to src/test/java/org/truffleruby/test/MiscTest.java

@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby;
+package org.truffleruby.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

src/test/java/org/truffleruby/PolyglotIOTest.java renamed to src/test/java/org/truffleruby/test/PolyglotIOTest.java

@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby;
+package org.truffleruby.test;
 
 import static org.junit.Assert.assertEquals;