[jboss-svn-commits] JBL Code SVN: r7994 - in labs/jbossrules/trunk/drools-compiler/src/test: java/org/drools/lang resources/org/drools/lang

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

Author: mark.proctor at jboss.com
Date: 2006-11-30 15:45:41 -0500 (Thu, 30 Nov 2006)
New Revision: 7994

Added:
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleFunctionCallWithFrom.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleMethodCallWithFrom.drl
Removed:
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/argument_list.drl
Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
Log:
JBRULES-339 'from' support for reasoning over facts not in the working memory
-Added test for imple function calls for jfdi integration

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2006-11-30 20:39:59 UTC (rev 7993)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2006-11-30 20:45:41 UTC (rev 7994)
@@ -482,22 +482,40 @@
 
     }
     
-    public void testArguementList() throws Exception {
+    public void testSimpleMethodCallWithFrom() throws Exception {
         
-        final RuleDescr rule = parseResource( "argument_list.drl" ).rule();
+        final RuleDescr rule = parseResource( "test_SimpleMethodCallWithFrom.drl" ).rule();
         FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
         System.out.println( from.getDataSource() );
-        MethodAccessDescr meth = (MethodAccessDescr) from.getDataSource();
+        MethodAccessDescr method = (MethodAccessDescr) from.getDataSource();
         
         if (parser.hasErrors()) {
             System.err.println(parser.getErrorMessages());
         }
         assertFalse(parser.hasErrors());    
         
-        String string = meth.getVariableName() + "." + meth.getMethodName() + meth.getArguments();
+        String string = method.getVariableName() + "." + method.getMethodName() + method.getArguments();
         
         assertEquals( "something.doIt( foo,bar,42,\"hello\",{ a => \"b\", \"something\" => 42, \"a\" => foo, x => {x=>y}},\"end\", [a, \"b\", 42] )", string );
     }
+    
+    public void testSimpleFunctionCallWithFrom() throws Exception {
+        
+        final RuleDescr rule = parseResource( "test_SimpleFunctionCallWithFrom.drl" ).rule();
+        FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
+        System.out.println( from.getDataSource() );
+        FunctionCallDescr func = (FunctionCallDescr) from.getDataSource();
+        
+        if (parser.hasErrors()) {
+            System.err.println(parser.getErrorMessages());
+        }
+        assertFalse(parser.hasErrors());    
+        
+        String string = func.getName() + func.getArguments();
+        
+        assertEquals( "doIt( foo,bar,42,\"hello\",{ a => \"b\", \"something\" => 42, \"a\" => foo, x => {x=>y}},\"end\", [a, \"b\", 42] )", string );
+    }    
+    
 
 
 //    public void xxxtestFrom() throws Exception {

Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/argument_list.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/argument_list.drl	2006-11-30 20:39:59 UTC (rev 7993)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/argument_list.drl	2006-11-30 20:45:41 UTC (rev 7994)
@@ -1,9 +0,0 @@
-
-rule blah
-
- when 
-
-	Col() from something.doIt( foo,bar,42,"hello",{ a => "b", "something" => 42, "a" => foo, x => {x=>y}},"end", [a, "b", 42] )
- then
-	partay();
-end	
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleFunctionCallWithFrom.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleFunctionCallWithFrom.drl	2006-11-30 20:39:59 UTC (rev 7993)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleFunctionCallWithFrom.drl	2006-11-30 20:45:41 UTC (rev 7994)
@@ -0,0 +1,9 @@
+
+rule blah
+
+ when 
+
+	Col() from doIt( foo,bar,42,"hello",{ a => "b", "something" => 42, "a" => foo, x => {x=>y}},"end", [a, "b", 42] )
+ then
+	partay();
+end	
\ No newline at end of file

Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleMethodCallWithFrom.drl (from rev 7988, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/argument_list.drl)