Avoid using GraalPy internal classes in tests where possible

(cherry picked from commit 083270f)

Author: steve-s

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java

@@ -49,12 +49,6 @@
 import org.graalvm.polyglot.Value;
 import org.junit.Assert;
 
-import com.oracle.graal.python.runtime.exception.PException;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.frame.FrameDescriptor;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.strings.TruffleString;
 
 public class PythonTests {
@@ -192,10 +186,6 @@ public static Value eval(String code) {
         return PythonTests.runScript(new String[0], code, printStream, System.err);
     }
 
-    public static VirtualFrame createVirtualFrame() {
-        return Truffle.getRuntime().createVirtualFrame(null, new FrameDescriptor());
-    }
-
     static void flush(OutputStream out, OutputStream err) {
         PythonTests.outStream.flush();
         PythonTests.errStream.flush();
@@ -314,24 +304,6 @@ public static void runThrowableScript(String[] args, String source, OutputStream
         }
     }
 
-    /**
-     * This method returns the properly formatted error message of the given Python exception. It
-     * does not use {@code PException.toString} since this method is just meant for debugging an
-     * does not reliably return a properly formatted string. Instead, this method uses the
-     * {@link InteropLibrary} which provides interop messages to get the error message.
-     */
-    public static String getExceptionMessage(PException e) {
-        InteropLibrary interop = InteropLibrary.getUncached();
-        Assert.assertTrue("PException claims to be not an exception", interop.isException(e));
-        try {
-            Object exceptionMessageObject = interop.getExceptionMessage(e);
-            Assert.assertTrue("returned message object is not a string", interop.isString(exceptionMessageObject));
-            return interop.asString(exceptionMessageObject);
-        } catch (UnsupportedMessageException ume) {
-            throw new IllegalStateException("should not be reached");
-        }
-    }
-
     public static TruffleString ts(String s) {
         return TruffleString.fromJavaStringUncached(s, TruffleString.Encoding.UTF_8);
     }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advance/AsyncActionThreadingTest.java

@@ -49,9 +49,9 @@
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
+import org.junit.Assume;
 import org.junit.Test;
 
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.test.PythonTests;
 
 public class AsyncActionThreadingTest extends PythonTests {
@@ -75,9 +75,7 @@ Stream<Thread> pythonThreads() {
 
     @Test
     public void testNoNewThreadsWithoutAutomaticAsyncActions() {
-        if (PythonOptions.AUTOMATIC_ASYNC_ACTIONS) {
-            return;
-        }
+        Assume.assumeTrue("false".equalsIgnoreCase(System.getProperty("python.AutomaticAsyncActions")));
         long threadCount = pythonThreadCount();
         Context c = PythonTests.enterContext();
         try {

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/engine/SharedEngineMultithreadingTestBase.java

@@ -50,14 +50,14 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.junit.Rule;
 
 import com.oracle.graal.python.test.CleanupRule;
 import com.oracle.graal.python.test.PythonTests;
-import com.oracle.graal.python.util.Consumer;
 
 /**
  * Base class for tests that run in multiple context with a shared engine and in parallel.

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java

@@ -73,8 +73,8 @@
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.oracle.graal.python.runtime.interop.InteropArray;
 import com.oracle.graal.python.test.PythonTests;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -856,4 +856,34 @@ public void testSysFlagsReflectContext() {
             }).distinct().count());
         }
     }
+
+    @ExportLibrary(InteropLibrary.class)
+    public static final class InteropArray implements TruffleObject {
+        @CompilationFinal(dimensions = 1) private final Object[] array;
+
+        public InteropArray(Object[] array) {
+            this.array = array;
+        }
+
+        @ExportMessage(name = "readArrayElement")
+        Object get(long idx) {
+            return array[(int) idx];
+        }
+
+        @ExportMessage(name = "getArraySize")
+        int size() {
+            return array.length;
+        }
+
+        @SuppressWarnings("static-method")
+        @ExportMessage
+        boolean hasArrayElements() {
+            return true;
+        }
+
+        @ExportMessage
+        boolean isArrayElementReadable(long idx) {
+            return idx < array.length;
+        }
+    }
 }