Mercurial > hg > truffle
changeset 14632:5f5e2711dc24
fix TruffleDSL tests
author | Andreas Woess <andreas.woess@jku.at> |
---|---|
date | Thu, 20 Mar 2014 03:14:12 +0100 |
parents | 97321295c974 |
children | da2431cc1506 |
files | graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImplicitCastTest.java graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java |
diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImplicitCastTest.java Thu Mar 20 02:22:16 2014 +0100 +++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImplicitCastTest.java Thu Mar 20 03:14:12 2014 +0100 @@ -71,6 +71,7 @@ public void testImplicitCast0() { ImplicitCast0Node node = ImplicitCast0NodeFactory.create(null); TestRootNode<ImplicitCast0Node> root = new TestRootNode<>(node); + root.adoptChildren(); Assert.assertEquals("2", root.getNode().executeEvaluated(null, "2")); Assert.assertEquals(true, root.getNode().executeEvaluated(null, 1)); Assert.assertEquals("1", root.getNode().executeEvaluated(null, "1")); @@ -106,6 +107,7 @@ public void testImplicitCast1() { ImplicitCast1Node node = ImplicitCast1NodeFactory.create(null); TestRootNode<ImplicitCast1Node> root = new TestRootNode<>(node); + root.adoptChildren(); Assert.assertEquals("2", root.getNode().executeEvaluated(null, "2")); Assert.assertEquals(true, root.getNode().executeEvaluated(null, 1)); Assert.assertEquals("1", root.getNode().executeEvaluated(null, "1")); @@ -146,6 +148,7 @@ public void testImplicitCast2() { ImplicitCast2Node node = ImplicitCast2NodeFactory.create(null, null); TestRootNode<ImplicitCast2Node> root = new TestRootNode<>(node); + root.adoptChildren(); Assert.assertEquals("42", root.getNode().executeEvaluated(null, "4", "2")); Assert.assertEquals(true, root.getNode().executeEvaluated(null, 1, 1)); Assert.assertEquals("42", root.getNode().executeEvaluated(null, "4", "2"));
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java Thu Mar 20 02:22:16 2014 +0100 +++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java Thu Mar 20 03:14:12 2014 +0100 @@ -76,11 +76,15 @@ } static <E extends ValueNode> TestRootNode<E> createRoot(NodeFactory<E> factory, Object... constants) { - return new TestRootNode<>(createNode(factory, constants)); + TestRootNode<E> rootNode = new TestRootNode<>(createNode(factory, constants)); + rootNode.adoptChildren(); + return rootNode; } static <E extends ValueNode> TestRootNode<E> createGenericRoot(NodeFactory<E> factory, Object... constants) { - return new TestRootNode<>(createGenericNode(factory, constants)); + TestRootNode<E> rootNode = new TestRootNode<>(createGenericNode(factory, constants)); + rootNode.adoptChildren(); + return rootNode; } static CallTarget createCallTarget(ValueNode node) {