Mercurial > hg > truffle
diff truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SourceSectionTest.java @ 22241:14e6dfb1ef05
Truffle/Testing: massive rework of tests to accommodate recent instrumentation change with respect to "applyInstrumentation"
- Caused by lack of a "vm" known to the Accessor during most testing, making the Instrumenter unavailable, which is now required to create a CallTarget
- Modified the Instrumenter/Accessor with a static field that can be reflectively "poked" with a vm value for testing
- Create a pair of methods to globally enable/disable testing mode to modify that static field and restore it when tests complete.
| author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
|---|---|
| date | Tue, 22 Sep 2015 20:31:19 -0700 |
| parents | dc83cc1f94f2 |
| children | 0d36601f233e |
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SourceSectionTest.java Tue Sep 22 20:25:58 2015 -0700 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SourceSectionTest.java Tue Sep 22 20:31:19 2015 -0700 @@ -22,6 +22,22 @@ */ package com.oracle.truffle.api.dsl.test; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; +import static com.oracle.truffle.api.dsl.test.TestHelper.createRootPrefix; +import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.sameInstance; +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; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; + import com.oracle.truffle.api.dsl.CreateCast; import com.oracle.truffle.api.dsl.Fallback; import com.oracle.truffle.api.dsl.NodeChild; @@ -29,29 +45,28 @@ import com.oracle.truffle.api.dsl.internal.SpecializationNode; import com.oracle.truffle.api.dsl.test.SourceSectionTestFactory.SourceSection0Factory; import com.oracle.truffle.api.dsl.test.SourceSectionTestFactory.SourceSection1Factory; -import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot; -import static com.oracle.truffle.api.dsl.test.TestHelper.createRootPrefix; -import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith; 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; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.sameInstance; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; -import org.junit.Test; -import org.junit.experimental.theories.DataPoints; -import org.junit.experimental.theories.Theories; -import org.junit.experimental.theories.Theory; -import org.junit.runner.RunWith; @RunWith(Theories.class) public class SourceSectionTest { @DataPoints public static final int[] data = new int[]{1, 2, 3, 4}; + @Before + public void before() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { + InstrumentationTestMode.set(true); + } + + @After + public void after() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { + InstrumentationTestMode.set(false); + } + @Theory public void testSourceSections(int value0, int value1, int value2) { TestRootNode<SourceSection0> root = createRoot(SourceSection0Factory.getInstance());