[GR-15506] Removed non needed setup methods.

physicsfamily · May 10, 2019 · 1f7a6ba · 1f7a6ba
1 parent f58b6fc
commit 1f7a6ba
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 72 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
@@ -58,12 +58,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.tck.Snippet;
 import org.graalvm.polyglot.tck.TypeDescriptor;
 import org.junit.AfterClass;
 import org.junit.Assume;
-import org.junit.Before;
 
 @RunWith(Parameterized.class)
 public class ErrorTypeTest {
@@ -94,14 +92,6 @@ public static void afterClass() throws IOException {
         context = null;
     }
 
-    @Before
-    public void setUp() {
-        // JUnit mixes test executions from different classes. There are still tests using the
-        // deprecated PolyglotEngine. For tests executed by Parametrized runner
-        // creating Context as a test parameter we need to ensure that correct SPI is used.
-        Engine.create().close();
-    }
-
     private static void computeSnippets(
                     final String snippetLanguage,
                     final Collection<? extends Snippet> snippets,

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
@@ -50,11 +50,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.tck.Snippet;
 import org.junit.AfterClass;
-import org.junit.Before;
 
 @RunWith(Parameterized.class)
 public class ExpressionTest {
@@ -90,14 +88,6 @@ public static void afterClass() throws IOException {
         context = null;
     }
 
-    @Before
-    public void setUp() {
-        // JUnit mixes test executions from different classes. There are still tests using the
-        // deprecated PolyglotEngine. For tests executed by Parametrized runner
-        // creating Context as a test parameter we need to ensure that correct SPI is used.
-        Engine.create().close();
-    }
-
     public ExpressionTest(final TestRun testRun) {
         Objects.requireNonNull(testRun);
         this.testRun = testRun;

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
@@ -56,7 +56,6 @@
 import java.util.Objects;
 import java.util.function.Function;
 
-import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.tck.LanguageProvider;
@@ -65,7 +64,6 @@
 import org.graalvm.polyglot.tck.TypeDescriptor;
 import org.junit.AfterClass;
 import org.junit.Assume;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -134,14 +132,6 @@ public static void afterClass() throws IOException {
         context = null;
     }
 
-    @Before
-    public void setUp() {
-        // JUnit mixes test executions from different classes. There are still tests using the
-        // deprecated PolyglotEngine. For tests executed by Parametrized runner
-        // creating Context as a test parameter we need to ensure that correct SPI is used.
-        Engine.create().close();
-    }
-
     public IdentityFunctionTest(final TestRun testRun) {
         Objects.requireNonNull(testRun);
         this.testRun = testRun;

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,12 +49,10 @@
 
 import org.junit.AfterClass;
 import org.junit.Assume;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.tck.InlineSnippet;
@@ -83,14 +81,6 @@ public static void afterClass() throws IOException {
         context = null;
     }
 
-    @Before
-    public void setUp() {
-        // JUnit mixes test executions from different classes. There are still tests using the
-        // deprecated PolyglotEngine. For tests executed by Parametrized runner
-        // creating Context as a test parameter we need to ensure that correct SPI is used.
-        Engine.create().close();
-    }
-
     public InlineExecutionTest(final InlineTestRun testRun) {
         Objects.requireNonNull(testRun);
         this.testRun = testRun;

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
@@ -51,9 +51,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.graalvm.polyglot.Engine;
 import org.junit.Assume;
-import org.junit.Before;
 
 @RunWith(Parameterized.class)
 public class InvalidSyntaxTest {
@@ -82,14 +80,6 @@ public static void afterClass() throws IOException {
         context = null;
     }
 
-    @Before
-    public void setUp() {
-        // JUnit mixes test executions from different classes. There are still tests using the
-        // deprecated PolyglotEngine. For tests executed by Parametrized runner
-        // creating Context as a test parameter we need to ensure that correct SPI is used.
-        Engine.create().close();
-    }
-
     public InvalidSyntaxTest(final String testName, final Source source) {
         Objects.requireNonNull(testName);
         Objects.requireNonNull(source);

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
@@ -49,12 +49,10 @@
 import org.graalvm.polyglot.Value;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.tck.Snippet;
 import org.junit.AfterClass;
 import org.junit.Assume;
-import org.junit.Before;
 import org.junit.Test;
 
 @RunWith(Parameterized.class)
@@ -81,14 +79,6 @@ public static void afterClass() throws IOException {
         context = null;
     }
 
-    @Before
-    public void setUp() {
-        // JUnit mixes test executions from different classes. There are still tests using the
-        // deprecated PolyglotEngine. For tests executed by Parametrized runner
-        // creating Context as a test parameter we need to ensure that correct SPI is used.
-        Engine.create().close();
-    }
-
     public ScriptTest(final TestRun testRun) {
         Objects.requireNonNull(testRun);
         this.testRun = testRun;

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
@@ -48,12 +48,10 @@
 import org.graalvm.polyglot.Value;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.tck.Snippet;
 import org.junit.AfterClass;
 import org.junit.Assume;
-import org.junit.Before;
 import org.junit.Test;
 
 @RunWith(Parameterized.class)
@@ -90,14 +88,6 @@ public static void afterClass() throws IOException {
         context = null;
     }
 
-    @Before
-    public void setUp() {
-        // JUnit mixes test executions from different classes. There are still tests using the
-        // deprecated PolyglotEngine. For tests executed by Parametrized runner
-        // creating Context as a test parameter we need to ensure that correct SPI is used.
-        Engine.create().close();
-    }
-
     public StatementTest(final TestRun testRun) {
         Objects.requireNonNull(testRun);
         this.testRun = testRun;

diff --git a/...src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/TypeDescriptorTest.java b/...src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/TypeDescriptorTest.java
@@ -45,7 +45,6 @@
 import java.util.List;
 import java.util.function.Function;
 import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.HostAccess;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyArray;
 import org.graalvm.polyglot.proxy.ProxyObject;
@@ -615,7 +614,7 @@ public void testInstantiablesWithExecutables() {
 
     @Test
     public void testForValue() {
-        try (Context ctx = Context.newBuilder().allowHostAccess(HostAccess.ALL).build()) {
+        try (Context ctx = Context.newBuilder().allowAllAccess(true).build()) {
             Value v = ctx.asValue(1);
             Assert.assertTrue(TypeDescriptor.NUMBER.isAssignable(TypeDescriptor.forValue(v)));
             v = ctx.asValue(true);