Mercurial > hg > truffle
changeset 22272:5309cc9668e3
Cleanup DSL tests from instrumentation dependencies.
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ArrayTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ArrayTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,9 +22,7 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -37,7 +35,6 @@ import com.oracle.truffle.api.dsl.TypeSystem; import com.oracle.truffle.api.dsl.TypeSystemReference; import com.oracle.truffle.api.dsl.test.ArrayTestFactory.TestNode1NodeGen; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RootNode; @@ -45,16 +42,6 @@ public class ArrayTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testNode1() { final TestNode1 node = TestNode1NodeGen.create(null);
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AssumptionsTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AssumptionsTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -30,8 +30,6 @@ import java.util.HashMap; import java.util.Map; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.Assumption; @@ -49,20 +47,9 @@ import com.oracle.truffle.api.dsl.test.AssumptionsTestFactory.NodeFieldTest2Factory; import com.oracle.truffle.api.dsl.test.AssumptionsTestFactory.StaticFieldTestFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class AssumptionsTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testField() { CallTarget root = createCallTarget(FieldTestFactory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/BadLongOverflowSpecializationTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/BadLongOverflowSpecializationTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -26,8 +26,6 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.NodeChild; @@ -35,20 +33,9 @@ import com.oracle.truffle.api.dsl.test.BadLongOverflowSpecializationTestFactory.ImplicitCastExclusionFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class BadLongOverflowSpecializationTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - /* Regression test for */ @NodeChild
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/BinaryNodeTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/BinaryNodeTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -26,8 +26,6 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.Fallback; @@ -37,20 +35,9 @@ import com.oracle.truffle.api.dsl.test.BinaryNodeTestFactory.AddNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class BinaryNodeTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testAdd() { TestRootNode<AddNode> node = createRoot(AddNodeFactory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -27,8 +27,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -49,21 +47,10 @@ import com.oracle.truffle.api.dsl.test.CachedTestFactory.TestMultipleCachesFactory; import com.oracle.truffle.api.dsl.test.CachedTestFactory.UnboundCacheFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; @SuppressWarnings("unused") public class CachedTest { - @Before - public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(true); - } - - @After - public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(false); - } - @Test public void testUnboundCache() { CallTarget root = createCallTarget(UnboundCacheFactory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CodeFormatTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CodeFormatTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,31 +22,18 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.CodeFormatTestFactory.LineWrappingTestFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; /** * Tests the generated code compiles without warnings for unusual large guard names. */ public class CodeFormatTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void test() { Assert.assertEquals(42, TestHelper.createCallTarget(LineWrappingTestFactory.create()).call());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -29,9 +29,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.NodeChild; @@ -47,22 +45,11 @@ import com.oracle.truffle.api.dsl.test.TestHelper.ExecutionListener; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.nodes.NodeCost; @SuppressWarnings("unused") public class ContainsTest { - @Before - public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(true); - } - - @After - public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(false); - } - /* * Tests a simple monomorphic inclusion. */
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CreateCastTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CreateCastTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,6 +22,9 @@ */ package com.oracle.truffle.api.dsl.test; +import org.junit.Assert; +import org.junit.Test; + import com.oracle.truffle.api.dsl.CreateCast; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.NodeChildren; @@ -33,8 +36,6 @@ import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; import com.oracle.truffle.api.nodes.Node; -import org.junit.Assert; -import org.junit.Test; @SuppressWarnings("unused") public class CreateCastTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteEvaluatedTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteEvaluatedTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,9 +22,7 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -48,23 +46,12 @@ import com.oracle.truffle.api.dsl.test.TypeSystemTest.ChildrenNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.UnexpectedResultException; public class ExecuteEvaluatedTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testSingleEvaluated() { ArgumentNode arg0 = new ArgumentNode(0);
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteGroupingTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ExecuteGroupingTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,6 +22,13 @@ */ package com.oracle.truffle.api.dsl.test; +import static org.junit.Assert.assertEquals; + +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; + import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.NodeChildren; import com.oracle.truffle.api.dsl.Specialization; @@ -29,11 +36,6 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import static org.junit.Assert.assertEquals; -import org.junit.experimental.theories.DataPoints; -import org.junit.experimental.theories.Theories; -import org.junit.experimental.theories.Theory; -import org.junit.runner.RunWith; /* * This test aims to test the reuse of execute methods with evaluated parameters as much as possible.
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -27,9 +27,7 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.Fallback; @@ -42,7 +40,6 @@ import com.oracle.truffle.api.dsl.test.FallbackTestFactory.Fallback4Factory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeUtil; @@ -52,16 +49,6 @@ private static final Object UNKNOWN_OBJECT = new Object() { }; - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testFallback1() { assertRuns(Fallback1Factory.getInstance(), //
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImportGuardsTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImportGuardsTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,8 +25,6 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.array; import static com.oracle.truffle.api.dsl.test.TestHelper.assertRuns; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.ImportStatic; @@ -34,20 +32,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.ImportGuardsTestFactory.ImportGuards6Factory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class ImportGuardsTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @ImportStatic(Imports0.class) @NodeChild("a") static class ImportGuards0 extends ValueNode {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/IntegerLiteralGuardsTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/IntegerLiteralGuardsTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,8 +25,6 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -37,21 +35,10 @@ import com.oracle.truffle.api.dsl.test.IntegerLiteralGuardsTestFactory.HexLiteralTestFactory; import com.oracle.truffle.api.dsl.test.IntegerLiteralGuardsTestFactory.OctalLiteralTestFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; @SuppressWarnings("unused") public class IntegerLiteralGuardsTest { - @Before - public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(true); - } - - @After - public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(false); - } - @Test public void testDecimalLiteral() { CallTarget root = createCallTarget(DecimalLiteralTestFactory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LazyClassLoadingTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LazyClassLoadingTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,9 +25,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.NodeChild; @@ -36,20 +34,9 @@ import com.oracle.truffle.api.dsl.test.LazyClassLoadingTestFactory.TestNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class LazyClassLoadingTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void test() { String factoryName = TestNodeFactory.class.getName();
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LimitTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LimitTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -26,8 +26,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -40,21 +38,10 @@ import com.oracle.truffle.api.dsl.test.LimitTestFactory.LocalLimitTestFactory; import com.oracle.truffle.api.dsl.test.LimitTestFactory.MethodLimitTestFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; @SuppressWarnings("unused") public class LimitTest { - @Before - public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(true); - } - - @After - public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(false); - } - @Test public void testDefaultLimit3() { CallTarget root = createCallTarget(DefaultLimit3TestFactory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MergeSpecializationsTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MergeSpecializationsTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -30,8 +30,6 @@ import java.util.Arrays; import java.util.concurrent.CountDownLatch; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.Cached; @@ -44,23 +42,12 @@ import com.oracle.truffle.api.dsl.test.MergeSpecializationsTestFactory.TestNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.nodes.Node; public class MergeSpecializationsTest { private static final int THREADS = 50; - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @NodeChild @SuppressWarnings("unused") abstract static class TestNode extends ValueNode {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MethodGuardsTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MethodGuardsTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -27,8 +27,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -55,21 +53,10 @@ import com.oracle.truffle.api.dsl.test.MethodGuardsTestFactory.GuardStaticFinalFieldCompareTestFactory; import com.oracle.truffle.api.dsl.test.MethodGuardsTestFactory.GuardUnboundMethodTestFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; @SuppressWarnings("unused") public class MethodGuardsTest { - @Before - public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(true); - } - - @After - public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(false); - } - @Test public void testGuardEqual() { CallTarget root = createCallTarget(GuardEqualTestFactory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MethodGuardsWithArgumentsTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MethodGuardsWithArgumentsTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,9 +25,7 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.NodeChild; @@ -42,20 +40,9 @@ import com.oracle.truffle.api.dsl.test.MethodGuardsWithArgumentsTestFactory.MArgumentsSingle2Factory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class MethodGuardsWithArgumentsTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testMArguments0() { TestRootNode<MArguments0> root = createRoot(MArguments0Factory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NegatedGuardsTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NegatedGuardsTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,29 +25,16 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NegatedGuardsTestFactory.NegatedGuardNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class NegatedGuardsTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testGuardGlobal() { TestRootNode<NegatedGuardNode> root = createRoot(NegatedGuardNodeFactory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NoTypeSystemTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NoTypeSystemTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,6 +22,9 @@ */ package com.oracle.truffle.api.dsl.test; +import org.junit.Assert; +import org.junit.Test; + import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NoTypeSystemTestFactory.JustFrameTestNodeGen; @@ -34,8 +37,6 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import org.junit.Assert; -import org.junit.Test; public class NoTypeSystemTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeChildNoNameTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeChildNoNameTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,6 +22,9 @@ */ package com.oracle.truffle.api.dsl.test; +import org.junit.Assert; +import org.junit.Test; + import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.NodeChildren; import com.oracle.truffle.api.dsl.Specialization; @@ -29,26 +32,10 @@ import com.oracle.truffle.api.dsl.test.NodeChildNoNameTestFactory.ThreeArgsNoNameFactory; import com.oracle.truffle.api.dsl.test.NodeChildNoNameTestFactory.TwoArgsNoNameFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.frame.VirtualFrame; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - public class NodeChildNoNameTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testOneArg() { ValueNode node = new ConstantNode();
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeChildTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeChildTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,8 +25,6 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.NodeChild; @@ -34,20 +32,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.IntFieldTestNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class NodeChildTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testIntField() { assertEquals(42, createCallTarget(IntFieldTestNodeFactory.create(42)).call());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,8 +25,6 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.NodeField; @@ -40,20 +38,9 @@ import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.StringFieldTestNodeFactory; import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.TestContainerFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class NodeFieldTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testIntField() { assertEquals(42, createCallTarget(IntFieldTestNodeFactory.create(42)).call());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NullLiteralGuardsTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NullLiteralGuardsTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,8 +25,6 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -35,21 +33,10 @@ import com.oracle.truffle.api.dsl.test.NullLiteralGuardsTestFactory.CompareObjectsNullNodeFactory; import com.oracle.truffle.api.dsl.test.NullLiteralGuardsTestFactory.CompareStringNullNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ChildrenNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; @SuppressWarnings("unused") public class NullLiteralGuardsTest { - @Before - public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(true); - } - - @After - public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(false); - } - @Test public void testCompareObjectsNull() { CallTarget root = createCallTarget(CompareObjectsNullNodeFactory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NullTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NullTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -26,8 +26,6 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.Fallback; @@ -36,20 +34,9 @@ import com.oracle.truffle.api.dsl.test.NullTestFactory.NullTest1Factory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class NullTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testGuardInvocations() { TestRootNode<NullTest1> root = createRoot(NullTest1Factory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -30,9 +30,7 @@ import java.util.HashSet; import java.util.Set; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.Fallback; @@ -44,21 +42,11 @@ import com.oracle.truffle.api.dsl.test.TestHelper.ExecutionListener; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeCost; import com.oracle.truffle.api.nodes.NodeUtil; public class PolymorphicTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } private static void assertParent(Node expectedParent, Node child) { Node parent = child.getParent();
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest2.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest2.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,29 +25,16 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.BinaryNodeTest.BinaryNode; import com.oracle.truffle.api.dsl.test.PolymorphicTest2Factory.Polymorphic1Factory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.nodes.NodeCost; public class PolymorphicTest2 { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testMultipleTypes() { /* Tests the unexpected polymorphic case. */
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ReachabilityTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ReachabilityTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.truffle.api.dsl.test; +import java.math.BigInteger; + import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.NodeChildren; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.TypeSystemTest.Abstract; import com.oracle.truffle.api.dsl.test.TypeSystemTest.BExtendsAbstract; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import java.math.BigInteger; public class ReachabilityTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ShortCircuitTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ShortCircuitTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -24,8 +24,6 @@ import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -42,20 +40,9 @@ import com.oracle.truffle.api.dsl.test.ShortCircuitTestFactory.VarArgsNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ArgumentNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class ShortCircuitTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testSingleChild1() { ArgumentNode arg0 = new ArgumentNode(0);
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SourceSectionTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SourceSectionTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -30,8 +30,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import org.junit.experimental.theories.DataPoints; import org.junit.experimental.theories.Theories; @@ -48,7 +46,6 @@ import com.oracle.truffle.api.dsl.test.TypeSystemTest.ArgumentNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.source.SourceSection; @@ -57,16 +54,6 @@ @DataPoints public static final int[] data = new int[]{1, 2, 3, 4}; - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Theory public void testSourceSections(int value0, int value1, int value2) { TestRootNode<SourceSection0> root = createRoot(SourceSection0Factory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationFallthroughTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationFallthroughTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -25,9 +25,7 @@ import static com.oracle.truffle.api.dsl.test.TestHelper.array; import static com.oracle.truffle.api.dsl.test.TestHelper.assertRuns; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.Fallback; @@ -43,20 +41,9 @@ import com.oracle.truffle.api.dsl.test.TestHelper.ExecutionListener; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; public class SpecializationFallthroughTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testFallthrough0() { assertRuns(FallthroughTest0Factory.getInstance(), //
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationGroupingTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationGroupingTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,9 +22,7 @@ */ package com.oracle.truffle.api.dsl.test; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -33,7 +31,6 @@ import com.oracle.truffle.api.dsl.test.SpecializationGroupingTestFactory.TestElseConnectionBug1Factory; import com.oracle.truffle.api.dsl.test.SpecializationGroupingTestFactory.TestElseConnectionBug2Factory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.SlowPathException; @@ -44,16 +41,6 @@ */ public class SpecializationGroupingTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testElseConnectionBug1() { CallTarget target = TestHelper.createCallTarget(TestElseConnectionBug1Factory.create(new GenericInt()));
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,6 +22,13 @@ */ package com.oracle.truffle.api.dsl.test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.Truffle; @@ -33,11 +40,6 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RootNode; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; /** * Utility class to provide some test helper functions.
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestSerialization.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestSerialization.java Thu Oct 01 14:00:17 2015 +0200 @@ -26,8 +26,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.NodeChild; @@ -35,21 +33,10 @@ import com.oracle.truffle.api.dsl.test.TestSerializationFactory.SerializedNodeFactory; import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.nodes.NodeCost; public class TestSerialization { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testUpdateRoot() { /* Tests the unexpected polymorphic case. */
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TypeSystemTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TypeSystemTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,6 +22,8 @@ */ package com.oracle.truffle.api.dsl.test; +import java.math.BigInteger; + import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.dsl.GenerateNodeFactory; import com.oracle.truffle.api.dsl.ImplicitCast; @@ -36,7 +38,6 @@ import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.oracle.truffle.api.source.SourceSection; -import java.math.BigInteger; public class TypeSystemTest {
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/UnsupportedSpecializationTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/UnsupportedSpecializationTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -24,9 +24,7 @@ import java.util.List; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.dsl.NodeChild; @@ -38,22 +36,11 @@ import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; import com.oracle.truffle.api.dsl.test.UnsupportedSpecializationTestFactory.Unsupported1Factory; import com.oracle.truffle.api.dsl.test.UnsupportedSpecializationTestFactory.Unsupported2Factory; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeUtil; public class UnsupportedSpecializationTest { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testUnsupported1() { TestRootNode<Unsupported1> root = TestHelper.createRoot(Unsupported1Factory.getInstance());
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/FunctionCall.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/FunctionCall.java Thu Oct 01 14:00:17 2015 +0200 @@ -27,8 +27,6 @@ import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createTarget; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -36,7 +34,6 @@ import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.examples.FunctionCallFactory.FunctionCallNodeGen; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.IndirectCallNode; @@ -51,16 +48,6 @@ @SuppressWarnings("unused") public class FunctionCall { - @Before - public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(true); - } - - @After - public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(false); - } - @Test public void testFunctionCall() { assertEquals(2, FunctionCallNode.CACHE_SIZE);
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/Interop.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/Interop.java Thu Oct 01 14:00:17 2015 +0200 @@ -26,8 +26,6 @@ import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createTarget; import static org.junit.Assert.assertEquals; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.CallTarget; @@ -35,7 +33,6 @@ import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.dsl.test.examples.InteropFactory.UseInteropNodeGen; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; @@ -45,16 +42,6 @@ */ public class Interop { - @Before - public void before() { - InstrumentationTestMode.set(true); - } - - @After - public void after() { - InstrumentationTestMode.set(false); - } - @Test public void testInterop() { UseInterop node = UseInteropNodeGen.create(createArguments(2));
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/MathPow.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/MathPow.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,23 +22,18 @@ */ package com.oracle.truffle.api.dsl.test.examples; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createArguments; +import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createTarget; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; - -import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createArguments; -import static com.oracle.truffle.api.dsl.test.examples.ExampleNode.createTarget; - import com.oracle.truffle.api.dsl.test.examples.MathPowFactory.MathPowNodeGen; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.nodes.Node; -import static org.junit.Assert.assertEquals; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - /** * This example shows possible specializations for a simplified math pow node. It demonstrates how * multiple caches can coexist within in the same node. This example does not show the best possible @@ -49,16 +44,6 @@ @SuppressWarnings("unused") public class MathPow extends Node { - @Before - public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(true); - } - - @After - public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(false); - } - @Test public void testPow() { MathPowNode node = MathPowNodeGen.create(createArguments(2));
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/RubyCall.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/RubyCall.java Thu Oct 01 14:00:17 2015 +0200 @@ -29,8 +29,6 @@ import java.util.HashMap; import java.util.Map; -import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.oracle.truffle.api.Assumption; @@ -43,7 +41,6 @@ import com.oracle.truffle.api.dsl.test.examples.RubyCallFactory.RubyDispatchNodeGen; import com.oracle.truffle.api.dsl.test.examples.RubyCallFactory.RubyHeadNodeGen; import com.oracle.truffle.api.dsl.test.examples.RubyCallFactory.RubyLookupNodeGen; -import com.oracle.truffle.api.dsl.test.utilities.InstrumentationTestMode; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.IndirectCallNode; @@ -57,16 +54,6 @@ @SuppressWarnings("unused") public class RubyCall { - @Before - public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(true); - } - - @After - public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { - InstrumentationTestMode.set(false); - } - @Test public void testCall() { RubyHeadNode node = RubyHeadNodeGen.create(createArguments(4));
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/Compile.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/Compile.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,6 +22,10 @@ */ package com.oracle.truffle.api.dsl.test.processor; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -33,6 +37,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; + import javax.tools.Diagnostic; import javax.tools.DiagnosticListener; import javax.tools.FileObject; @@ -43,9 +48,6 @@ import javax.tools.SimpleJavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; final class Compile implements DiagnosticListener<JavaFileObject> { private final List<Diagnostic<? extends JavaFileObject>> errors = new ArrayList<>();
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/TruffleProcessorTest.java Thu Oct 01 13:38:28 2015 +0200 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/processor/TruffleProcessorTest.java Thu Oct 01 14:00:17 2015 +0200 @@ -22,17 +22,21 @@ */ package com.oracle.truffle.api.dsl.test.processor; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.util.Locale; +import java.util.ServiceLoader; + +import javax.annotation.processing.Processor; +import javax.tools.Diagnostic; +import javax.tools.JavaFileObject; + +import org.junit.Test; + import com.oracle.truffle.api.dsl.test.ExpectError; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.dsl.processor.verify.VerifyTruffleProcessor; -import java.util.Locale; -import java.util.ServiceLoader; -import javax.annotation.processing.Processor; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import org.junit.Test; /** * Verify errors emitted by the processor.