[GR-34971] New FastRSession that allows sharing of one context for multiple tests.

PullRequest: fastr/2673

Author: steve-s

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 22.0.0
+* In unit tests, use single shared context rather than multiple inner contexts.
+
 # 21.3.0
 * Upgrade of [PCRE](https://www.pcre.org/) to PCRE2 version 10.37.
   * See [GNU-R changelog](https://cran.r-project.org/doc/manuals/r-devel/NEWS.html) (section MIGRATION TO PCRE2) for more details

com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/test/TestBase.java

@@ -47,8 +47,9 @@ public class TestBase {
     @BeforeClass
     public static void setupClass() {
         FastRSession session = FastRSession.create();
-        testVMContext = session.getContext();
         context = session.createContext(ContextKind.SHARE_PARENT_RW);
+        testVMContext = session.getContext();
+        context.reset();
     }
 
     @AfterClass

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test

@@ -175,7 +175,7 @@ public void testObjectValueSemantics() {
     @Test
     public void testActiveBindings() {
         assertEval("someSymbol0 <- 1; makeActiveBinding('someSymbol0', function(x) { x }, .GlobalEnv)");
-        assertEval(Output.IgnoreErrorMessage, "lockEnvironment(.GlobalEnv); makeActiveBinding('someSymbol1', function(x) { x }, .GlobalEnv)");
+        assertEval(Output.IgnoreErrorMessage, Context.NonShared, "lockEnvironment(.GlobalEnv); makeActiveBinding('someSymbol1', function(x) { x }, .GlobalEnv)");
         assertEval("makeActiveBinding('someSymbol2', function(x) { x }, .GlobalEnv); bindingIsActive('someSymbol2', .GlobalEnv)");
         assertEval("bindingIsActive('someSymbol3', .GlobalEnv)");
         assertEval(".Internal(bindingIsActive(as.name('someSymbol4'), .GlobalEnv))");

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/TestS4.java

@@ -111,7 +111,7 @@ public class TestBase {
     public static final Map<String, String> options = new HashMap<>();
 
     /**
-     * See {@link com.oracle.truffle.r.test.builtins.TestTestBase} for examples.
+     * See {@code TestTestBase} for examples.
      */
     public enum Output implements TestTrait {
         ImprovedErrorContext, // FastR provides a more accurate error context
@@ -554,6 +554,10 @@ protected void assertEval(long timeout, TestTrait trait1, TestTrait trait2, Stri
         evalAndCompare(input, timeout, trait1, trait2);
     }
 
+    protected void assertEval(long timeout, TestTrait trait1, TestTrait trait2, TestTrait trait3, String... input) {
+        evalAndCompare(input, timeout, trait1, trait2, trait3);
+    }
+
     protected void assertEval(TestTrait trait1, TestTrait trait2, String... input) {
         evalAndCompare(input, USE_DEFAULT_TIMEOUT, trait1, trait2);
     }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java

@@ -14,7 +14,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Copyright (c) 2012-2014, Purdue University
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates
  *
  * All rights reserved.
  */
@@ -42,7 +42,7 @@ public void testEnvVars() {
         assertEval("{ Sys.setenv(\"a\") } ");
         assertEval("{ Sys.setenv(FASTR_A=\"a\"); Sys.getenv(\"FASTR_A\"); } ");
         assertEval("{ Sys.setenv(FASTR_A=\"a\", FASTR_B=\"b\"); Sys.getenv(c(\"FASTR_A\", \"FASTR_B\"));  } ");
-        assertEval("{ Sys.getenv(\"FASTR_A\") } ");
-        assertEval("{ Sys.getenv(\"FASTR_A\", unset=\"UNSET\") } ");
+        assertEval("{ Sys.getenv(\"FASTR_SHOULD_NOT_BE_DEFINED\") } ");
+        assertEval("{ Sys.getenv(\"FASTR_SHOULD_NOT_BE_DEFINED\", unset=\"UNSET\") } ");
     }
 }