simplify context enter/leave for tests, use shared engine where possible, and remove a singleton holding on to the context reference

Author: timfel

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

@@ -39,8 +39,6 @@
 import java.io.PrintStream;
 import java.io.Reader;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.JarURLConnection;
 import java.net.URLConnection;
 import java.nio.file.Files;
@@ -50,7 +48,6 @@
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
-import org.junit.BeforeClass;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.runtime.PythonContext;
@@ -82,21 +79,25 @@ public class PythonTests {
     final static ByteArrayOutputStream outArray = new ByteArrayOutputStream();
     final static PrintStream errStream = new PrintStream(errArray);
     final static PrintStream outStream = new PrintStream(outArray);
-    public static Engine engine = Engine.newBuilder().out(PythonTests.outStream).err(PythonTests.errStream).build();
-    public static Context context = null;
 
-    public static void resetContext(String[] args) {
-        if (PythonTests.context != null) {
-            PythonTests.context.close();
-        }
-        org.graalvm.polyglot.Context.Builder ctxBuilder = Context.newBuilder();
-        ctxBuilder.engine(engine);
-        ctxBuilder.allowAllAccess(true);
+    private static Engine engine = Engine.newBuilder().out(PythonTests.outStream).err(PythonTests.errStream).build();
+    private static Context context = null;
+
+    public static void enterContext(String... newArgs) {
         PythonTests.outArray.reset();
         PythonTests.errArray.reset();
-        ctxBuilder.arguments("python", args);
-        PythonTests.context = ctxBuilder.build();
-        PythonTests.context.initialize("python");
+        if (context != null) {
+            context.leave();
+            context.close();
+        }
+        context = Context.newBuilder().engine(engine).allowAllAccess(true).arguments("python", newArgs).build();
+        context.initialize("python");
+        context.enter();
+    }
+
+    public static void closeContext() {
+        context.leave();
+        context.close();
     }
 
     public static void assertBenchNoError(Path scriptName, String[] args) {
@@ -193,22 +194,6 @@ public static VirtualFrame createVirtualFrame() {
         return Truffle.getRuntime().createVirtualFrame(null, new FrameDescriptor());
     }
 
-    public static void ensureContext() {
-        resetContext(new String[0]);
-        // XXX
-        Field field;
-        try {
-            field = PythonTests.context.getClass().getDeclaredField("impl");
-            field.setAccessible(true);
-            Object polyglotContextImpl = field.get(PythonTests.context);
-            Method enterMethod = polyglotContextImpl.getClass().getDeclaredMethod("enter", new Class<?>[0]);
-            enterMethod.setAccessible(true);
-            enterMethod.invoke(polyglotContextImpl);
-        } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-    }
-
     static void flush(OutputStream out, OutputStream err) {
         PythonTests.outStream.flush();
         PythonTests.errStream.flush();
@@ -239,18 +224,6 @@ public static File getBenchFile(Path filename) {
         return file;
     }
 
-    public static PythonContext getContext() {
-        PythonTests.ensureContext();
-        return PythonLanguage.getContextRef().get();
-    }
-
-    static Context getContext(String[] args) {
-        resetContext(args);
-        PythonTests.outArray.reset();
-        PythonTests.errArray.reset();
-        return PythonTests.context;
-    }
-
     private static String getFileContent(File file) {
         String ret = null;
         Reader reader;
@@ -278,7 +251,7 @@ private static String getFileContent(File file) {
     }
 
     public static RootNode getParseResult(com.oracle.truffle.api.source.Source source, PrintStream out, PrintStream err) {
-        PythonTests.ensureContext();
+        PythonTests.enterContext();
         PythonContext ctx = PythonLanguage.getContextRef().get();
         ctx.setOut(out);
         ctx.setErr(err);
@@ -316,7 +289,8 @@ public static File getTestFile(Path filename) {
 
     public static void runScript(String[] args, File path, OutputStream out, OutputStream err) {
         try {
-            PythonTests.getContext(args).eval(org.graalvm.polyglot.Source.newBuilder("python", path).build());
+            enterContext(args);
+            context.eval(org.graalvm.polyglot.Source.newBuilder("python", path).build());
         } catch (IOException e) {
             e.printStackTrace();
             throw new RuntimeException(e);
@@ -327,15 +301,17 @@ public static void runScript(String[] args, File path, OutputStream out, OutputS
 
     public static void runScript(String[] args, String source, OutputStream out, OutputStream err) {
         try {
-            PythonTests.getContext(args).eval(org.graalvm.polyglot.Source.create("python", source));
+            enterContext(args);
+            context.eval(org.graalvm.polyglot.Source.create("python", source));
         } finally {
             flush(out, err);
         }
     }
 
     public static void runScript(String[] args, String source, OutputStream out, OutputStream err, Runnable cb) {
         try {
-            PythonTests.getContext(args).eval(org.graalvm.polyglot.Source.create("python", source));
+            enterContext(args);
+            context.eval(org.graalvm.polyglot.Source.create("python", source));
         } finally {
             cb.run();
             flush(out, err);
@@ -366,10 +342,4 @@ public static void runThrowableScript(String[] args, String source, OutputStream
             }
         }
     }
-
-    @BeforeClass
-    public static void setUp() {
-        PythonTests.resetContext(new String[0]);
-    }
-
 }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/ImportTests.java

@@ -36,7 +36,7 @@
 public class ImportTests {
     @Before
     public void setup() {
-        PythonTests.resetContext(new String[0]);
+        PythonTests.enterContext();
     }
 
     @Test

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/IteratorTests.java

@@ -32,6 +32,6 @@
 public class IteratorTests {
     @Before
     public void setup() {
-        PythonTests.resetContext(new String[0]);
+        PythonTests.enterContext();
     }
 }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/datatype/PRangeTests.java

@@ -44,12 +44,12 @@
 public class PRangeTests {
     @Before
     public void setup() {
-        PythonTests.ensureContext();
+        PythonTests.enterContext();
     }
 
     @Test
     public void loopWithOnlyStop() throws UnexpectedResultException {
-        PRange range = PythonObjectFactory.get().createRange(10);
+        PRange range = PythonObjectFactory.create().createRange(10);
         int index = 0;
         Object iter = GetIteratorNodeGen.create().executeWith(range);
         GetNextNode next = GetNextNode.create();
@@ -69,7 +69,7 @@ public void loopWithOnlyStop() throws UnexpectedResultException {
 
     @Test
     public void loopWithStep() throws UnexpectedResultException {
-        PRange range = PythonObjectFactory.get().createRange(0, 10, 2);
+        PRange range = PythonObjectFactory.create().createRange(0, 10, 2);
         int index = 0;
         Object iter = GetIteratorNodeGen.create().executeWith(range);
         GetNextNode next = GetNextNode.create();
@@ -89,13 +89,13 @@ public void loopWithStep() throws UnexpectedResultException {
 
     @Test
     public void getItem() {
-        PRange range = PythonObjectFactory.get().createRange(10);
+        PRange range = PythonObjectFactory.create().createRange(10);
         assertEquals(3, range.getItem(3));
     }
 
     @Test
     public void getItemNegative() {
-        PRange range = PythonObjectFactory.get().createRange(10);
+        PRange range = PythonObjectFactory.create().createRange(10);
         assertEquals(7, range.getItem(-3));
     }
 

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/TestParserTranslator.java

@@ -112,7 +112,8 @@ public class TestParserTranslator {
     PythonContext context;
 
     public TestParserTranslator() {
-        context = PythonTests.getContext();
+        PythonTests.enterContext();
+        context = PythonLanguage.getContextRef().get();
     }
 
     RootNode parse(String src) {

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/module/AtexitTests.java

@@ -63,7 +63,7 @@ public void atExit() {
         final ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
         final PrintStream printStream = new PrintStream(byteArray);
         PythonTests.runScript(new String[0], source, printStream, System.err, () -> {
-            PythonTests.context.close();
+            PythonTests.closeContext();
         });
         String result = byteArray.toString().replaceAll("\r\n", "\n");
         assertEquals("arg kw\n", result);

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/module/MathTests.java

@@ -32,14 +32,17 @@
 import static com.oracle.graal.python.test.PythonTests.*;
 
 public class MathTests {
+    @Before
+    public void setUp() {
+        PythonTests.enterContext();
+    }
 
     @Test
     public void piAndE() {
         String source = "import math\n" + //
                         "print(math.e)\n" + //
                         "print(math.pi)\n" + //
                         "print(math.e + math.pi)\n";
-        PythonTests.resetContext(new String[0]);
         assertPrints("2.718281828459045\n" + "3.141592653589793\n" + "5.859874482048838\n", source);
     }
 
@@ -50,7 +53,6 @@ public void logAndExp() {
                         "b = 10\n" + //
                         "c = math.exp(b)\n" + //
                         "print(a // c)\n";
-        PythonTests.resetContext(new String[0]);
         assertPrints("0.0\n", source);
     }
 
@@ -60,7 +62,6 @@ public void sinAndCos() {
                         "x = math.pi\n" + //
                         "y = math.sin(x)\n" + //
                         "print(y // math.cos(math.e))\n";
-        PythonTests.resetContext(new String[0]);
         assertPrints("-1.0\n", source);
     }
 

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/module/RandomTests.java

@@ -27,18 +27,22 @@
 
 import static com.oracle.graal.python.test.PythonTests.assertPrints;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import com.oracle.graal.python.test.PythonTests;
 
 public class RandomTests {
+    @Before
+    public void setUp() {
+        PythonTests.enterContext();
+    }
 
     @Test
     public void randomRandom() {
         String source = "import random\n" + //
                         "random.seed(1)\n" + //
                         "print(int(random.random()))\n";
-        PythonTests.resetContext(new String[0]);
         assertPrints("0\n", source);
     }
 
@@ -49,7 +53,6 @@ public void randRange0() {
                         "stop = 10\n" + //
                         "ran = random.randrange(stop)\n" + //
                         "print(ran // stop)\n";
-        PythonTests.resetContext(new String[0]);
         assertPrints("0\n", source);
     }
 
@@ -59,7 +62,6 @@ public void randRange1() {
                         "stop = 9223372036854775807\n" + //
                         "ran = random.randrange(stop)\n" + //
                         "print(ran // stop)\n";
-        PythonTests.resetContext(new String[0]);
         assertPrints("0\n", source);
     }
 

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/GetAttributeDispatchTests.java

@@ -27,19 +27,23 @@
 
 import static com.oracle.graal.python.test.PythonTests.assertPrints;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import com.oracle.graal.python.test.PythonTests;
 
 public class GetAttributeDispatchTests {
+    @Before
+    public void setUp() {
+        PythonTests.enterContext();
+    }
 
     @Test
     public void cachedModuleAttr() {
         String source = "import time\n" + //
                         "for i in range(2):\n" + //
                         "  time.foo = 42\n" + //
                         "  print(time.foo)\n";
-        PythonTests.resetContext(new String[0]);
         assertPrints("42\n42\n", source);
     }
 

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/PythonModuleTests.java

@@ -31,8 +31,10 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__PACKAGE__;
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
@@ -43,10 +45,16 @@
 import com.oracle.graal.python.test.PythonTests;
 
 public class PythonModuleTests {
+    private PythonContext context;
+
+    @Before
+    public void setUp() {
+        PythonTests.enterContext();
+        context = PythonLanguage.getContextRef().get();
+    }
 
     @Test
     public void pythonModuleTest() {
-        final PythonContext context = PythonTests.getContext();
         PythonModule module = context.getCore().factory().createPythonModule("testModule");
 
         assertEquals("testModule", module.getAttribute(__NAME__).toString());
@@ -56,7 +64,6 @@ public void pythonModuleTest() {
 
     @Test
     public void builtinsMinTest() {
-        final PythonContext context = PythonTests.getContext();
         final PythonModule builtins = context.getBuiltins();
         PBuiltinMethod min = (PBuiltinMethod) builtins.getAttribute(BuiltinNames.MIN);
         Object returnValue = InvokeNode.create(min).invoke(createWithUserArguments(builtins, 4, 2, 1));
@@ -65,7 +72,6 @@ public void builtinsMinTest() {
 
     @Test
     public void builtinsIntTest() {
-        final PythonContext context = PythonTests.getContext();
         final PythonModule builtins = context.getBuiltins();
         PythonBuiltinClass intClass = (PythonBuiltinClass) builtins.getAttribute(BuiltinNames.INT);
         Object returnValue = InvokeNode.create(intClass).invoke(createWithUserArguments(intClass, "42"));
@@ -74,7 +80,6 @@ public void builtinsIntTest() {
 
     @Test
     public void mainModuleTest() {
-        final PythonContext context = PythonTests.getContext();
         PythonModule main = context.getMainModule();
         PythonModule builtins = (PythonModule) main.getAttribute(__BUILTINS__);
         PBuiltinMethod abs = (PBuiltinMethod) builtins.getAttribute(BuiltinNames.ABS);