[Mulgara-svn] r1616 - branches/consistency/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast

[pag at mulgara.org]

Author: pag
Date: 2009-03-17 12:50:43 -0700 (Tue, 17 Mar 2009)
New Revision: 1616

Modified:
   branches/consistency/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/CanonicalPredicateTest.java
Log:
Now handling new toString methods from the tested data

Modified: branches/consistency/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/CanonicalPredicateTest.java
===================================================================
--- branches/consistency/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/CanonicalPredicateTest.java	2009-03-17 19:49:59 UTC (rev 1615)
+++ branches/consistency/src/jar/content-rlog/java/org/mulgara/krule/rlog/ast/CanonicalPredicateTest.java	2009-03-17 19:50:43 UTC (rev 1616)
@@ -72,9 +72,9 @@
     BPredicateLabel label = new BPredicateLiteral("foo", "pred", context);
     Predicate p = new BPredicate(label, left, right, context);
     CanonicalPredicate cp = p.getCanonical();
-    assertEquals("[foo:bar, foo:pred, foo:baz]", cp.toString());
+    assertEquals("foo:pred(foo:bar, foo:baz)", cp.toString());
     cp.invert();
-    assertEquals("~[foo:bar, foo:pred, foo:baz]", cp.toString());
+    assertEquals("~foo:pred(foo:bar, foo:baz)", cp.toString());
   }
 
   /**
@@ -87,9 +87,9 @@
     TypeLabel label = new TypeLiteral("foo", "Type", context);
     Predicate p = new TypeStatement(label, left, context);
     CanonicalPredicate cp = p.getCanonical();
-    assertEquals("[foo:Type, foo:bar]", cp.toString());
+    assertEquals("foo:Type(foo:bar)", cp.toString());
     cp.invert();
-    assertEquals("~[foo:Type, foo:bar]", cp.toString());
+    assertEquals("~foo:Type(foo:bar)", cp.toString());
   }
 
   /**
@@ -103,26 +103,26 @@
     BPredicateLabel label = new BPredicateLiteral("foo", "pred", context);
     Predicate p = new BPredicate(label, left, right, context);
     CanonicalPredicate cp = p.getCanonical();
-    assertEquals("[foo:bar, foo:pred, ?X]", cp.toString());
+    assertEquals("foo:pred(foo:bar, ?X)", cp.toString());
     VariableCanonicalizer con = new VariableCanonicalizer();
     cp.renameVariables(con);
-    assertEquals("[foo:bar, foo:pred, ?V1]", cp.toString());
+    assertEquals("foo:pred(foo:bar, ?V1)", cp.toString());
 
     left = new Variable("A");
     right = new Variable("B");
     label = new Variable("C");
     p = new BPredicate(label, left, right, context);
     cp = p.getCanonical();
-    assertEquals("[?A, ?C, ?B]", cp.toString());
+    assertEquals("?C(?A, ?B)", cp.toString());
     con = new VariableCanonicalizer();
     cp.renameVariables(con);
-    assertEquals("[?V1, ?V2, ?V3]", cp.toString());
+    assertEquals("?V2(?V1, ?V3)", cp.toString());
     cp.renameVariables(con);
-    assertEquals("[?V4, ?V5, ?V6]", cp.toString());
+    assertEquals("?V5(?V4, ?V6)", cp.toString());
 
     cp = p.getCanonical();
     cp.renameVariables(con);
-    assertEquals("[?V1, ?V2, ?V3]", cp.toString());
+    assertEquals("?V2(?V1, ?V3)", cp.toString());
   }
 
   /**
@@ -135,26 +135,26 @@
     TypeLabel label = new Variable("X");
     Predicate p = new TypeStatement(label, left, context);
     CanonicalPredicate cp = p.getCanonical();
-    assertEquals("[?X, foo:bar]", cp.toString());
+    assertEquals("?X(foo:bar)", cp.toString());
     VariableCanonicalizer con = new VariableCanonicalizer();
     cp.renameVariables(con);
-    assertEquals("[?V1, foo:bar]", cp.toString());
+    assertEquals("?V1(foo:bar)", cp.toString());
 
     left = new Variable("B");
     label = new Variable("A");
     p = new TypeStatement(label, left, context);
     cp = p.getCanonical();
-    assertEquals("[?A, ?B]", cp.toString());
+    assertEquals("?A(?B)", cp.toString());
     con = new VariableCanonicalizer();
     cp.renameVariables(con);
-    assertEquals("[?V1, ?V2]", cp.toString());
+    assertEquals("?V1(?V2)", cp.toString());
 
     cp.renameVariables(con);
-    assertEquals("[?V3, ?V4]", cp.toString());
+    assertEquals("?V3(?V4)", cp.toString());
 
     cp = p.getCanonical();
     cp.renameVariables(con);
-    assertEquals("[?V1, ?V2]", cp.toString());
+    assertEquals("?V1(?V2)", cp.toString());
   }
 
   /**
@@ -169,7 +169,7 @@
     CanonicalPredicate cp = p.getCanonical();
     VariableCanonicalizer con = new VariableCanonicalizer();
     cp.renameVariables(con);
-    assertEquals("[?V1, foo:bar]", cp.toString());
+    assertEquals("?V1(foo:bar)", cp.toString());
 
     Predicate p2 = new TypeStatement(new Variable("V1"), left, context);
     assertNotSame(p, p2);