Mercurial > hg > truffle
diff truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.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 | 5309cc9668e3 |
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java Tue Sep 22 20:25:58 2015 -0700 +++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java Tue Sep 22 20:31:19 2015 -0700 @@ -22,6 +22,15 @@ */ package com.oracle.truffle.api.dsl.test; +import static com.oracle.truffle.api.dsl.test.TestHelper.assertionsEnabled; +import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; +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; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; @@ -39,16 +48,22 @@ import com.oracle.truffle.api.dsl.test.CachedTestFactory.TestGuardWithJustCachedParameterFactory; import com.oracle.truffle.api.dsl.test.CachedTestFactory.TestMultipleCachesFactory; import com.oracle.truffle.api.dsl.test.CachedTestFactory.UnboundCacheFactory; -import static com.oracle.truffle.api.dsl.test.TestHelper.assertionsEnabled; -import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget; import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import org.junit.Test; +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());