--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java	Wed Jun 17 10:58:08 2015 +0200
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2012, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.api.dsl.test;
+
+import static com.oracle.truffle.api.dsl.test.TestHelper.*;
+import static org.junit.Assert.*;
+
+import org.junit.*;
+
+import com.oracle.truffle.api.dsl.*;
+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 {
+
+    @Test
+    public void testIntField() {
+        assertEquals(42, createCallTarget(IntFieldTestNodeFactory.create(42)).call());
+    }
+
+    @NodeField(name = "field", type = int.class)
+    abstract static class IntFieldTestNode extends ValueNode {
+
+        public abstract int getField();
+
+        @Specialization
+        int intField() {
+            return getField();
+        }
+
+    }
+
+    @Test
+    public void testIntFieldNoGetter() {
+        assertEquals(42, createCallTarget(IntFieldNoGetterTestNodeFactory.create(42)).call());
+    }
+
+    @NodeField(name = "field", type = int.class)
+    abstract static class IntFieldNoGetterTestNode extends ValueNode {
+
+        @Specialization
+        int intField(int field) {
+            return field;
+        }
+
+    }
+
+    @Test
+    public void testMultipleFields() {
+        assertEquals(42, createCallTarget(MultipleFieldsTestNodeFactory.create(21, 21)).call());
+    }
+
+    @NodeFields({@NodeField(name = "field0", type = int.class), @NodeField(name = "field1", type = int.class)})
+    abstract static class MultipleFieldsTestNode extends ValueNode {
+
+        public abstract int getField0();
+
+        public abstract int getField1();
+
+        @Specialization
+        int intField() {
+            return getField0() + getField1();
+        }
+
+    }
+
+    @Test
+    public void testStringField() {
+        assertEquals("42", createCallTarget(StringFieldTestNodeFactory.create("42")).call());
+    }
+
+    @NodeField(name = "field", type = String.class)
+    abstract static class StringFieldTestNode extends ValueNode {
+
+        public abstract String getField();
+
+        @Specialization
+        String stringField() {
+            return getField();
+        }
+
+    }
+
+    @Test
+    public void testRewrite() {
+        assertEquals("42", createCallTarget(RewriteTestNodeFactory.create("42")).call());
+    }
+
+    @NodeField(name = "field", type = String.class)
+    abstract static class RewriteTestNode extends ValueNode {
+
+        public abstract String getField();
+
+        @Specialization(rewriteOn = RuntimeException.class)
+        String alwaysRewrite() {
+            throw new RuntimeException();
+        }
+
+        @Specialization(contains = "alwaysRewrite")
+        Object returnField() {
+            return getField();
+        }
+    }
+
+    @Test
+    public void testStringContainer() {
+        assertEquals(42, createCallTarget(TestContainerFactory.create("42")).call());
+    }
+
+    @NodeField(name = "field", type = int.class)
+    abstract static class IntContainerNode extends ValueNode {
+
+        public abstract int getField();
+
+    }
+
+    @NodeField(name = "anotherField", type = String.class)
+    abstract static class TestContainer extends ValueNode {
+
+        @Specialization
+        int containerField(String field) {
+            return field.equals("42") ? 42 : -1;
+        }
+
+    }
+
+    @Test
+    public void testObjectContainer() {
+        assertEquals("42", createCallTarget(ObjectContainerNodeFactory.create("42")).call());
+    }
+
+    @NodeField(name = "object", type = Object.class)
+    abstract static class ObjectContainerNode extends ValueNode {
+
+        public abstract Object getObject();
+
+        @Specialization
+        Object containerField() {
+            return getObject();
+        }
+
+    }
+
+}