[GR-29902] Improve error message when TCK tests are executed with exp…

…licitly entered context. PullRequest: graal/8448
mttcr · Mar 15, 2021 · c77430f · c77430f
2 parents 3abd476 + 3250e24
commit c77430f
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 0 deletions.
diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ErrorTypeTest.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ErrorTypeTest.java
@@ -55,6 +55,7 @@
 import java.util.TreeSet;
 import java.util.function.Function;
 import org.graalvm.polyglot.PolyglotException;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -86,6 +87,11 @@ public static Collection<? extends TestRun> createErrorTypeTests() {
         return testRuns;
     }
 
+    @BeforeClass
+    public static void setUpClass() {
+        TestUtil.assertNoCurrentContext();
+    }
+
     @AfterClass
     public static void afterClass() throws IOException {
         context.close();

diff --git a/...fle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ExpressionTest.java b/...fle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ExpressionTest.java
@@ -47,6 +47,7 @@
 import java.util.function.Function;
 import org.graalvm.polyglot.Value;
 import org.junit.Assume;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -82,6 +83,11 @@ public Collection<? extends Snippet> apply(String lang) {
         return testRuns;
     }
 
+    @BeforeClass
+    public static void setUpClass() {
+        TestUtil.assertNoCurrentContext();
+    }
+
     @AfterClass
     public static void afterClass() throws IOException {
         context.close();

diff --git a/...c/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/IdentityFunctionTest.java b/...c/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/IdentityFunctionTest.java
@@ -53,6 +53,7 @@
 import org.graalvm.polyglot.tck.Snippet;
 import org.junit.AfterClass;
 import org.junit.Assume;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -90,6 +91,11 @@ static Snippet createIdentitySnippet(String lang) {
         return tli.createIdentityFunctionSnippet(context.getContext());
     }
 
+    @BeforeClass
+    public static void setUpClass() {
+        TestUtil.assertNoCurrentContext();
+    }
+
     @AfterClass
     public static void afterClass() throws IOException {
         context.close();

diff --git a/...rc/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/InlineExecutionTest.java b/...rc/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/InlineExecutionTest.java
@@ -49,6 +49,7 @@
 
 import org.junit.AfterClass;
 import org.junit.Assume;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -75,6 +76,11 @@ public static Collection<InlineTestRun> createScriptTests() {
         return res;
     }
 
+    @BeforeClass
+    public static void setUpClass() {
+        TestUtil.assertNoCurrentContext();
+    }
+
     @AfterClass
     public static void afterClass() throws IOException {
         context.close();

diff --git a/.../src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/InvalidSyntaxTest.java b/.../src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/InvalidSyntaxTest.java
@@ -48,6 +48,7 @@
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Source;
 import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -74,6 +75,11 @@ public static Collection<Object[]> createInvalidSyntaxTests() {
         return result;
     }
 
+    @BeforeClass
+    public static void setUpClass() {
+        TestUtil.assertNoCurrentContext();
+    }
+
     @AfterClass
     public static void afterClass() throws IOException {
         context.close();

diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ScriptTest.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ScriptTest.java
@@ -47,6 +47,7 @@
 import java.util.Objects;
 import java.util.TreeSet;
 import org.graalvm.polyglot.Value;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.graalvm.polyglot.PolyglotException;
@@ -73,6 +74,11 @@ public static Collection<TestRun> createScriptTests() {
         return res;
     }
 
+    @BeforeClass
+    public static void setUpClass() {
+        TestUtil.assertNoCurrentContext();
+    }
+
     @AfterClass
     public static void afterClass() throws IOException {
         context.close();

diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/StatementTest.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/StatementTest.java
@@ -46,6 +46,7 @@
 import java.util.Objects;
 import java.util.function.Function;
 import org.graalvm.polyglot.Value;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.graalvm.polyglot.PolyglotException;
@@ -82,6 +83,11 @@ public Collection<? extends Snippet> apply(String lang) {
         return testRuns;
     }
 
+    @BeforeClass
+    public static void setUpClass() {
+        TestUtil.assertNoCurrentContext();
+    }
+
     @AfterClass
     public static void afterClass() throws IOException {
         context.close();

diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/TestUtil.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/TestUtil.java
@@ -54,6 +54,8 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+
+import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.SourceSection;
 import org.graalvm.polyglot.Value;
@@ -72,6 +74,16 @@ private TestUtil() {
         throw new IllegalStateException("No instance allowed.");
     }
 
+    static void assertNoCurrentContext() {
+        try {
+            Context ctx = Context.getCurrent();
+            throw new AssertionError(String.format(
+                            "Context cannot be explicitly entered while running TCK tests. Entered context: 0x%x", ctx.hashCode()));
+        } catch (IllegalStateException e) {
+            // No context entered.
+        }
+    }
+
     static Set<? extends String> getRequiredLanguages(final TestContext context) {
         Set<String> installedProviders = context.getInstalledProviders().keySet();
         if (LANGUAGE != null && !installedProviders.contains(LANGUAGE)) {