Split unit tests into embedding and internal tests

eregon · eregon · commit 1353407f56b9 · 2023-08-21T12:10:22.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -28,7 +28,8 @@
 /src/main/c/truffleposix/Makefile linguist-vendored
 /lib/gems/gems/*/bin/setup linguist-vendored
 /lib/truffle/post_install_hook.sh linguist-vendored
-/src/test/* linguist-vendored
+/src/test-embedding/* linguist-vendored
+/src/test-internal/* linguist-vendored
 /src/processor/* linguist-vendored
 
 # Generated code
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -17,7 +17,7 @@ AllCops:
     - 'lib/truffle/socket/mri.rb' # taken from MRI
     - 'lib/truffle/ffi/**/*.rb' # taken from FFI gem
     - 'src/main/ruby/truffleruby/core/truffle/ffi/pointer_extra.rb' # taken from FFI gem
-    - 'src/test/ruby/types.rb' # deliberately strange code for debugging purposes
+    - 'src/test-internal/ruby/types.rb' # deliberately strange code for debugging purposes
     - 'src/tck/ruby/lexical-context.rb' # deliberately strange code for debugging purposes
 
 # Type 'Layout' (166):
diff --git a/doc/contributor/using-eclipse.md b/doc/contributor/using-eclipse.md
@@ -37,11 +37,7 @@ We can now import the projects:
 * Select this repository as root directory
 * Click `Finish`
 
-There should be now 4 projects in your workspace:
-* `truffleruby`
-* `truffleruby-test`
-* `TRUFFLERUBY-TEST.dist`
-* `TRUFFLERUBY.dist`
+There should be now some projects in your workspace, like `truffleruby` and `TRUFFLERUBY.dist`.
 
 ## Advanced Setup
 
diff --git a/mx.truffleruby/mx_truffleruby.py b/mx.truffleruby/mx_truffleruby.py
@@ -143,14 +143,14 @@ def build_truffleruby(args):
 
 def ruby_check_heap_dump(input_args, out=None):
     print("mx ruby_check_heap_dump " + " ".join(input_args))
-    dists = ['TRUFFLERUBY', 'TRUFFLE_NFI', 'SULONG_NATIVE', 'TRUFFLERUBY-TEST']
+    dists = ['TRUFFLERUBY', 'TRUFFLE_NFI', 'SULONG_NATIVE', 'TRUFFLERUBY-TEST-INTERNAL']
     mx.command_function('build')(['--dependencies', ','.join(dists)])
     args = input_args
     args.insert(0, "--experimental-options")
     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.test.LeakTest")
+    vm_args.append("org.truffleruby.test.internal.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:
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -320,15 +320,31 @@
             "license": ["EPL-2.0"],
         },
 
-        "org.truffleruby.test": {
-            "dir": "src/test",
+        "org.truffleruby.test.embedding": {
+            "testProject": True,
+            "dir": "src/test-embedding",
+            "sourceDirs": ["java"],
+            "requires": ["java.scripting"],
+            "dependencies": [
+                # Distributions
+                "TRUFFLERUBY-SERVICES",
+                # Libraries
+                "mx:JUNIT",
+            ],
+            "javaCompliance": "17+",
+            "checkstyle": "org.truffleruby",
+            "license": ["EPL-2.0"],
+        },
+
+        "org.truffleruby.test.internal": {
+            "testProject": True,
+            "dir": "src/test-internal",
             "sourceDirs": ["java", "ruby"],
-            "requires": ["java.scripting", "java.management", "jdk.management"],
+            "requires": ["java.management", "jdk.management"],
             "dependencies": [
                 # Distributions
                 "sdk:LAUNCHER_COMMON",
                 "TRUFFLERUBY",
-                "TRUFFLERUBY-SERVICES",
                 # Libraries
                 "mx:JUNIT",
                 "truffleruby:NETBEANS-LIB-PROFILER",
@@ -675,15 +691,35 @@
             },
         },
 
-        "TRUFFLERUBY-TEST": {
+        "TRUFFLERUBY-TEST-EMBEDDING": {
             "testDistribution": True,
             "dependencies": [
-                "org.truffleruby.test",
+                "org.truffleruby.test.embedding",
+            ],
+            "distDependencies": [
+                "TRUFFLERUBY-SERVICES",
+                # runtime-only dependencies
+                "TRUFFLERUBY",
+            ],
+            "exclude": [
+                "mx:HAMCREST",
+                "mx:JUNIT",
+            ],
+            "javaProperties": {
+                "org.graalvm.language.ruby.home": "<path:TRUFFLERUBY_GRAALVM_SUPPORT>"
+            },
+            "license": ["EPL-2.0"],
+            "maven": False,
+        },
+
+        "TRUFFLERUBY-TEST-INTERNAL": {
+            "testDistribution": True,
+            "dependencies": [
+                "org.truffleruby.test.internal",
             ],
             "distDependencies": [
                 "sdk:LAUNCHER_COMMON",
                 "TRUFFLERUBY",
-                "TRUFFLERUBY-SERVICES",
             ],
             "exclude": [
                 "mx:HAMCREST",
diff --git a/src/test-embedding/java/org/truffleruby/test/embedding/ContextPermissionsTest.java b/src/test-embedding/java/org/truffleruby/test/embedding/ContextPermissionsTest.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.embedding;
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Value;
diff --git a/src/test-embedding/java/org/truffleruby/test/embedding/JSR223InteropTest.java b/src/test-embedding/java/org/truffleruby/test/embedding/JSR223InteropTest.java
@@ -7,9 +7,10 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.embedding;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -25,9 +26,8 @@
 
 import org.junit.After;
 import org.junit.Test;
-import org.truffleruby.fixtures.FluidForce;
+import org.truffleruby.test.embedding.fixtures.FluidForce;
 import org.truffleruby.services.scriptengine.TruffleRubyScriptEngineFactory;
-import org.truffleruby.shared.TruffleRuby;
 
 public class JSR223InteropTest {
 
@@ -51,7 +51,7 @@ private static void close(ScriptEngine scriptEngine) {
 
     @Test
     public void testVersion() {
-        assertEquals(TruffleRuby.getEngineVersion(), new TruffleRubyScriptEngineFactory().getEngineVersion());
+        assertNotNull(new TruffleRubyScriptEngineFactory().getEngineVersion());
     }
 
     @Test
diff --git a/src/test-embedding/java/org/truffleruby/test/embedding/MiscTest.java b/src/test-embedding/java/org/truffleruby/test/embedding/MiscTest.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.embedding;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test-embedding/java/org/truffleruby/test/embedding/PolyglotIOTest.java b/src/test-embedding/java/org/truffleruby/test/embedding/PolyglotIOTest.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.embedding;
 
 import static org.junit.Assert.assertEquals;
 
@@ -17,7 +17,6 @@
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
 import org.junit.Test;
-import org.truffleruby.shared.TruffleRuby;
 
 public class PolyglotIOTest extends RubyTest {
 
@@ -27,7 +26,7 @@ public void testPolyglotIn() {
         final ByteArrayInputStream in = new ByteArrayInputStream("abc".getBytes());
 
         try (Context context = RubyTest.setupContext(Context.newBuilder()).out(out).in(in).build()) {
-            context.eval(Source.create(TruffleRuby.LANGUAGE_ID, "puts STDIN.read(3)"));
+            context.eval(Source.create("ruby", "puts STDIN.read(3)"));
         }
 
         assertEquals("abc\n", out.toString());
@@ -38,7 +37,7 @@ public void testPolyglotOut() {
         final ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         try (Context context = RubyTest.setupContext(Context.newBuilder()).out(out).build()) {
-            context.eval(Source.create(TruffleRuby.LANGUAGE_ID, "puts 'abc'"));
+            context.eval(Source.create("ruby", "puts 'abc'"));
         }
 
         assertEquals("abc\n", out.toString());
@@ -49,7 +48,7 @@ public void testPolyglotErr() {
         final ByteArrayOutputStream err = new ByteArrayOutputStream();
 
         try (Context context = RubyTest.setupContext(Context.newBuilder()).err(err).build()) {
-            context.eval(Source.create(TruffleRuby.LANGUAGE_ID, "STDERR.puts 'abc'"));
+            context.eval(Source.create("ruby", "STDERR.puts 'abc'"));
         }
 
         assertEquals("abc\n", err.toString());
diff --git a/src/test-embedding/java/org/truffleruby/test/embedding/PolyglotInteropTest.java b/src/test-embedding/java/org/truffleruby/test/embedding/PolyglotInteropTest.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.embedding;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -22,15 +22,14 @@
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
 import org.junit.Test;
-import org.truffleruby.fixtures.FluidForce;
-import org.truffleruby.shared.TruffleRuby;
+import org.truffleruby.test.embedding.fixtures.FluidForce;
 
 public class PolyglotInteropTest {
 
     @Test
     public void testCreateContext() {
         try (Context polyglot = Context.create()) {
-            assertEquals(14, polyglot.eval(TruffleRuby.LANGUAGE_ID, "14").asInt());
+            assertEquals(14, polyglot.eval("ruby", "14").asInt());
         }
     }
 
diff --git a/src/test-embedding/java/org/truffleruby/test/embedding/RubyTest.java b/src/test-embedding/java/org/truffleruby/test/embedding/RubyTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2016, 2023 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.test.embedding;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.function.Consumer;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.PolyglotException;
+
+public abstract class RubyTest {
+
+    public static void assertThrows(Runnable test, Consumer<PolyglotException> exceptionVerifier) {
+        PolyglotException e = assertThrows(test, PolyglotException.class);
+        assertTrue(e.isGuestException());
+        exceptionVerifier.accept(e);
+    }
+
+    public static <E> E assertThrows(Runnable test, Class<E> exceptionClass) {
+        try {
+            test.run();
+        } catch (Throwable e) {
+            if (!exceptionClass.isInstance(e)) {
+                throw e;
+            }
+            return exceptionClass.cast(e);
+        }
+
+        fail("should have thrown");
+        throw new Error("unreachable");
+    }
+
+    public static Context.Builder setupContext(Context.Builder builder) {
+        return builder
+                .allowAllAccess(true)
+                .option("ruby.basic-ops-inline", "false");
+    }
+
+    public static Context createContext() {
+        return setupContext(Context.newBuilder()).build();
+    }
+
+}
diff --git a/src/test-embedding/java/org/truffleruby/test/embedding/TestingThread.java b/src/test-embedding/java/org/truffleruby/test/embedding/TestingThread.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.embedding;
 
 /** If the Thread dies from an exception, rethrow it on join(). This Thread can then be used for assert*(). */
 public class TestingThread {
diff --git a/src/test-embedding/java/org/truffleruby/test/embedding/fixtures/FluidForce.java b/src/test-embedding/java/org/truffleruby/test/embedding/fixtures/FluidForce.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.fixtures;
+package org.truffleruby.test.embedding.fixtures;
 
 import org.graalvm.polyglot.HostAccess;
 
diff --git a/src/test-internal/java/org/truffleruby/test/internal/ArrayBuilderTest.java b/src/test-internal/java/org/truffleruby/test/internal/ArrayBuilderTest.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -243,7 +243,7 @@ private static Source getSource(String path) {
     @Before
     public void before() {
         context = RubyTest.setupContext(Context.newBuilder()).out(out).err(err).build();
-        context.eval(getSource("init.rb"));
+        context.eval("ruby", ":init");
     }
 
     @After
diff --git a/src/test-internal/java/org/truffleruby/test/internal/ArrayStoreTest.java b/src/test-internal/java/org/truffleruby/test/internal/ArrayStoreTest.java
@@ -7,12 +7,12 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.truffleruby.test.RubyTest.assertThrows;
+import static org.truffleruby.test.internal.RubyTest.assertThrows;
 
 import org.junit.Test;
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
diff --git a/src/test-internal/java/org/truffleruby/test/internal/EmbeddedScriptTest.java b/src/test-internal/java/org/truffleruby/test/internal/EmbeddedScriptTest.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.internal;
 
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
diff --git a/src/test-internal/java/org/truffleruby/test/internal/LeakTest.java b/src/test-internal/java/org/truffleruby/test/internal/LeakTest.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.internal;
 
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
diff --git a/src/test-internal/java/org/truffleruby/test/internal/RubyDebugTest.java b/src/test-internal/java/org/truffleruby/test/internal/RubyDebugTest.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -101,7 +101,7 @@ public void before() {
             suspendedEvent = null;
         });
 
-        context.eval(getSource("init.rb"));
+        context.eval("ruby", ":init");
 
         run.clear();
     }
diff --git a/src/test-internal/java/org/truffleruby/test/internal/RubyFileTypeDetectorTest.java b/src/test-internal/java/org/truffleruby/test/internal/RubyFileTypeDetectorTest.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.test;
+package org.truffleruby.test.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
diff --git a/src/test-internal/java/org/truffleruby/test/internal/RubyTest.java b/src/test-internal/java/org/truffleruby/test/internal/RubyTest.java
diff --git a/src/test-internal/java/org/truffleruby/test/internal/SourceSectionTest.java b/src/test-internal/java/org/truffleruby/test/internal/SourceSectionTest.java
diff --git a/src/test-internal/ruby/factorial.rb b/src/test-internal/ruby/factorial.rb
diff --git a/src/test-internal/ruby/modify.rb b/src/test-internal/ruby/modify.rb
diff --git a/src/test-internal/ruby/raise_ex.rb b/src/test-internal/ruby/raise_ex.rb
diff --git a/src/test-internal/ruby/types.rb b/src/test-internal/ruby/types.rb
diff --git a/src/test/ruby/init.rb b/src/test/ruby/init.rb
diff --git a/tool/jt.rb b/tool/jt.rb
