[jboss-svn-commits] JBL Code SVN: r35046 - in labs/jbossrules/branches/etirelli/drools-compiler/src/test: resources/org/drools/lang and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tirelli
Date: 2010-09-07 18:55:53 -0400 (Tue, 07 Sep 2010)
New Revision: 35046

Modified:
   labs/jbossrules/branches/etirelli/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
   labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/and_or_rule.drl
   labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/or_ce.drl
   labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_ComplexChainedCallWithFrom.drl
   labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_SimpleFunctionCallWithFrom.drl
   labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_SimpleMethodCallWithFrom.drl
Log:
Fixing tests

Modified: labs/jbossrules/branches/etirelli/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/branches/etirelli/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2010-09-07 20:48:03 UTC (rev 35045)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2010-09-07 22:55:53 UTC (rev 35046)
@@ -676,7 +676,7 @@
         final FromDescr from = (FromDescr) pattern.getSource();
         final AccessorDescr method = (AccessorDescr) from.getDataSource();
 
-        assertEquals( "something.doIt( foo,bar,42,\"hello\",{ a => \"b\", \"something\" => 42, \"a\" => foo, x => {x=>y}},\"end\", [a, \"b\", 42] )",
+        assertEquals( "something.doIt( foo,bar,42,\"hello\",[ a : \"b\", \"something\" : 42, \"a\" : foo, x : [x:y]],\"end\", [a, \"b\", 42] )",
                       method.toString() );
     }
 
@@ -689,7 +689,7 @@
         final FromDescr from = (FromDescr) pattern.getSource();
         final AccessorDescr func = (AccessorDescr) from.getDataSource();
 
-        assertEquals( "doIt( foo,bar,42,\"hello\",{ a => \"b\", \"something\" => 42, \"a\" => foo, x => {x=>y}},\"end\", [a, \"b\", 42] )",
+        assertEquals( "doIt( foo,bar,42,\"hello\",[ a : \"b\", \"something\" : 42, \"a\" : foo, x : [x:y]],\"end\", [a, \"b\", 42] )",
                       func.toString() );
     }
 
@@ -702,8 +702,6 @@
         final FromDescr from = (FromDescr) pattern.getSource();
         final AccessorDescr accessor = (AccessorDescr) from.getDataSource();
 
-        assertNull( ((FieldAccessDescr) accessor.getInvokers().get( 0 )).getArgument() );
-
         assertEquals( "something.doIt",
                       accessor.toString() );
     }
@@ -717,8 +715,6 @@
         final FromDescr from = (FromDescr) pattern.getSource();
         final AccessorDescr accessor = (AccessorDescr) from.getDataSource();
 
-        assertNotNull( ((FieldAccessDescr) accessor.getInvokers().get( 0 )).getArgument() );
-
         assertEquals( "something.doIt[\"key\"]",
                       accessor.toString() );
     }
@@ -731,7 +727,7 @@
         final FromDescr from = (FromDescr) pattern.getSource();
         final AccessorDescr accessor = (AccessorDescr) from.getDataSource();
 
-        assertEquals( "doIt1( foo,bar,42,\"hello\",{ a => \"b\"}, [a, \"b\", 42] ).doIt2(bar, [a, \"b\", 42]).field[\"key\"]",
+        assertEquals( "doIt1( foo,bar,42,\"hello\",[ a : \"b\"], [a, \"b\", 42] ).doIt2(bar, [a, \"b\", 42]).field[\"key\"]",
                       accessor.toString() );
     }
 

Modified: labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/and_or_rule.drl
===================================================================
--- labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/and_or_rule.drl	2010-09-07 20:48:03 UTC (rev 35045)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/and_or_rule.drl	2010-09-07 22:55:53 UTC (rev 35046)
@@ -3,8 +3,8 @@
 
 rule simple_rule 
   when
-    Person(name == "mark") && Cheese(type == "stilton")
-    Person(name == "mark") || Cheese(type == "stilton")
+    Person(name == "mark") and Cheese(type == "stilton")
+    Person(name == "mark") or Cheese(type == "stilton")
   then
 	System.out.println( "Mark and Michael" );
 end
\ No newline at end of file

Modified: labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/or_ce.drl
===================================================================
--- labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/or_ce.drl	2010-09-07 20:48:03 UTC (rev 35045)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/or_ce.drl	2010-09-07 22:55:53 UTC (rev 35046)
@@ -3,7 +3,7 @@
 rule "testing OR CE"
 when
     $p : Person( name == "bob" )
-    $c : Cheese( type == $p.likes ) || Cheese( price == 10 )
+    $c : Cheese( type == $p.likes ) or Cheese( price == 10 )
 then
     // do something
 end 
\ No newline at end of file

Modified: labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_ComplexChainedCallWithFrom.drl
===================================================================
--- labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_ComplexChainedCallWithFrom.drl	2010-09-07 20:48:03 UTC (rev 35045)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_ComplexChainedCallWithFrom.drl	2010-09-07 22:55:53 UTC (rev 35046)
@@ -1,7 +1,6 @@
 rule blah
  when 
-	Col1() from doIt1( foo,bar,42,"hello",{ a => "b"}, [a, "b", 42] )
-	            .doIt2(bar, [a, "b", 42]).field["key"]
+	Col1() from doIt1( foo,bar,42,"hello",[ a : "b"], [a, "b", 42] ).doIt2(bar, [a, "b", 42]).field["key"]
 	Col2()
  then
 	partay();

Modified: labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_SimpleFunctionCallWithFrom.drl
===================================================================
--- labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_SimpleFunctionCallWithFrom.drl	2010-09-07 20:48:03 UTC (rev 35045)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_SimpleFunctionCallWithFrom.drl	2010-09-07 22:55:53 UTC (rev 35046)
@@ -3,7 +3,7 @@
 
  when 
 
-	Col1() from doIt( foo,bar,42,"hello",{ a => "b", "something" => 42, "a" => foo, x => {x=>y}},"end", [a, "b", 42] )
+	Col1() from doIt( foo,bar,42,"hello",[ a : "b", "something" : 42, "a" : foo, x : [x:y]],"end", [a, "b", 42] )
 	Col2()
  then
 	partay();

Modified: labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_SimpleMethodCallWithFrom.drl
===================================================================
--- labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_SimpleMethodCallWithFrom.drl	2010-09-07 20:48:03 UTC (rev 35045)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/test_SimpleMethodCallWithFrom.drl	2010-09-07 22:55:53 UTC (rev 35046)
@@ -3,7 +3,7 @@
 
  when 
 
-	Col1() from something.doIt( foo,bar,42,"hello",{ a => "b", "something" => 42, "a" => foo, x => {x=>y}},"end", [a, "b", 42] )
+	Col1() from something.doIt( foo,bar,42,"hello",[ a : "b", "something" : 42, "a" : foo, x : [x:y]],"end", [a, "b", 42] )
 	Col2()
  then
 	partay();