Mercurial > hg > truffle

diff graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java @ 13528:5a0c694ef735

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle-DSL: Removed API classes NodeId, NodeContainer and SpecializationListener.
author Christian Humer <christian.humer@gmail.com>
date Tue, 07 Jan 2014 18:52:32 +0100
parents dcaf879d4a7e
children 5148aab962af
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java	Tue Jan 07 12:22:47 2014 +0100
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java	Tue Jan 07 18:52:32 2014 +0100
@@ -28,8 +28,13 @@
 import org.junit.*;
 
 import com.oracle.truffle.api.dsl.*;
-import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.*;
-import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.TestContainerFactory.TestContainerContainerFieldFactory;
+import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.IntFieldNoGetterTestNodeFactory;
+import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.IntFieldTestNodeFactory;
+import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.MultipleFieldsTestNodeFactory;
+import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.ObjectContainerNodeFactory;
+import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.RewriteTestNodeFactory;
+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;
 
 public class NodeFieldTest {
@@ -125,7 +130,7 @@
 
     @Test
     public void testStringContainer() {
-        assertEquals(42, createCallTarget(TestContainerContainerFieldFactory.create(42, "42")).call());
+        assertEquals(42, createCallTarget(TestContainerFactory.create("42")).call());
     }
 
     @NodeField(name = "field", type = int.class)
@@ -135,13 +140,12 @@
 
     }
 
-    @NodeContainer(IntContainerNode.class)
     @NodeField(name = "anotherField", type = String.class)
-    abstract static class TestContainer {
+    abstract static class TestContainer extends ValueNode {
 
         @Specialization
-        static int containerField(int field, String anotherField) {
-            return anotherField.equals("42") ? field : -1;
+        int containerField(String field) {
+            return field.equals("42") ? 42 : -1;
         }
 
     }