Mercurial > hg > truffle

changeset 18778:cb3bdd77c809

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle-DSL: fixed class loading test.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Jan 2015 12:39:27 +0100
parents 76cbf5f33f82
children 7ea9a39bd7cc
files graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LazyClassLoadingTest.java
diffstat 2 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java	Mon Jan 05 02:38:44 2015 +0100
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java	Mon Jan 05 12:39:27 2015 +0100
@@ -58,7 +58,7 @@
                                         // assert that the final specialization is always Object
                                         Assert.assertEquals(Object.class, ((DSLNode) node.getNode()).getMetadata0().getSpecializedTypes()[0]);
                                     } else {
-                                        Assert.assertTrue(((SpecializedNode) node.getNode()).getSpecializationNode().toString().startsWith("ObjectNode"));
+                                        Assert.assertTrue(((SpecializedNode) node.getNode()).getSpecializationNode().toString().startsWith("F2Node_"));
                                     }
                                 }
                             }
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LazyClassLoadingTest.java	Mon Jan 05 02:38:44 2015 +0100
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/LazyClassLoadingTest.java	Mon Jan 05 12:39:27 2015 +0100
@@ -42,31 +42,31 @@
         Assert.assertTrue(isLoaded(factoryName));
         Assert.assertTrue(isLoaded(nodeName));
 
-        Assert.assertFalse(isLoaded(nodeName + "$UninitializedNode"));
-        Assert.assertFalse(isLoaded(nodeName + "$BaseNode"));
-        Assert.assertFalse(isLoaded(nodeName + "$DoInt0Node"));
-        Assert.assertFalse(isLoaded(nodeName + "$DoBoolean0Node"));
-        Assert.assertFalse(isLoaded(nodeName + "$PolymorphicNode"));
+        Assert.assertFalse(isLoaded(nodeName + "$UninitializedNode_"));
+        Assert.assertFalse(isLoaded(nodeName + "$BaseNode_"));
+        Assert.assertFalse(isLoaded(nodeName + "$IntNode_"));
+        Assert.assertFalse(isLoaded(nodeName + "$BooleanNode_"));
+        Assert.assertFalse(isLoaded(nodeName + "$PolymorphicNode_"));
 
         TestRootNode<TestNode> root = TestHelper.createRoot(factory);
 
-        Assert.assertTrue(isLoaded(nodeName + "$BaseNode"));
-        Assert.assertTrue(isLoaded(nodeName + "$UninitializedNode"));
-        Assert.assertFalse(isLoaded(nodeName + "$DoInt0Node"));
-        Assert.assertFalse(isLoaded(nodeName + "$DoBoolean0Node"));
-        Assert.assertFalse(isLoaded(nodeName + "$PolymorphicNode"));
+        Assert.assertTrue(isLoaded(nodeName + "$UninitializedNode_"));
+        Assert.assertTrue(isLoaded(nodeName + "$BaseNode_"));
+        Assert.assertFalse(isLoaded(nodeName + "$IntNode_"));
+        Assert.assertFalse(isLoaded(nodeName + "$BooleanNode_"));
+        Assert.assertFalse(isLoaded(nodeName + "$PolymorphicNode_"));
 
         Assert.assertEquals(42, TestHelper.executeWith(root, 42));
 
-        Assert.assertTrue(isLoaded(nodeName + "$DoInt0Node"));
-        Assert.assertFalse(isLoaded(nodeName + "$DoBoolean0Node"));
-        Assert.assertFalse(isLoaded(nodeName + "$PolymorphicNode"));
+        Assert.assertTrue(isLoaded(nodeName + "$IntNode_"));
+        Assert.assertFalse(isLoaded(nodeName + "$BooleanNode_"));
+        Assert.assertFalse(isLoaded(nodeName + "$PolymorphicNode_"));
 
         Assert.assertEquals(true, TestHelper.executeWith(root, true));
 
-        Assert.assertTrue(isLoaded(nodeName + "$DoInt0Node"));
-        Assert.assertTrue(isLoaded(nodeName + "$DoBoolean0Node"));
-        Assert.assertTrue(isLoaded(nodeName + "$PolymorphicNode"));
+        Assert.assertTrue(isLoaded(nodeName + "$IntNode_"));
+        Assert.assertTrue(isLoaded(nodeName + "$BooleanNode_"));
+        Assert.assertTrue(isLoaded(nodeName + "$PolymorphicNode_"));
     }
 
     private boolean isLoaded(String className) {