[jboss-svn-commits] JBL Code SVN: r7997 - 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 16:29:10 -0500 (Thu, 30 Nov 2006)
New Revision: 7997

Added:
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleAccessorArgWithFrom.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleAccessorWithFrom.drl
Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
   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
Log:
JBRULES-339 'from' support for reasoning over facts not in the working memory
-Added test for simple field accessor

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 21:06:45 UTC (rev 7996)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2006-11-30 21:29:10 UTC (rev 7997)
@@ -516,8 +516,45 @@
         assertEquals( "doIt( foo,bar,42,\"hello\",{ a => \"b\", \"something\" => 42, \"a\" => foo, x => {x=>y}},\"end\", [a, \"b\", 42] )", string );
     }    
     
-
-
+    
+    public void testSimpleAccessorWithFrom() throws Exception {
+        
+        final RuleDescr rule = parseResource( "test_SimpleAccessorWithFrom.drl" ).rule();
+        FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
+        System.out.println( from.getDataSource() );
+        FieldAccessDescr field = (FieldAccessDescr) from.getDataSource();
+        
+        if (parser.hasErrors()) {
+            System.err.println(parser.getErrorMessages());
+        }
+        assertFalse(parser.hasErrors());    
+        
+        assertNull( field.getArgument() );
+        
+        String string = field.getVariableName() + "." + field.getFieldName();
+        
+        assertEquals( "something.doIt", string );
+    }      
+    
+    public void testSimpleAccessorAndArgWithFrom() throws Exception {
+        
+        final RuleDescr rule = parseResource( "test_SimpleAccessorArgWithFrom.drl" ).rule();
+        FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
+        System.out.println( from.getDataSource() );
+        FieldAccessDescr field = (FieldAccessDescr) from.getDataSource();
+        
+        if (parser.hasErrors()) {
+            System.err.println(parser.getErrorMessages());
+        }
+        assertFalse(parser.hasErrors());    
+        
+        assertNotNull( field.getArgument() );
+        
+        String string = field.getVariableName() + "." + field.getFieldName() + field.getArgument();
+        
+        assertEquals( "something.doIt[\"key\"]", string );
+    }      
+    
 //    public void testFrom() throws Exception {
 //        final RuleDescr rule = parseResource( "from.drl" ).rule();
 //

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleAccessorArgWithFrom.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleAccessorArgWithFrom.drl	2006-11-30 21:06:45 UTC (rev 7996)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleAccessorArgWithFrom.drl	2006-11-30 21:29:10 UTC (rev 7997)
@@ -0,0 +1,10 @@
+
+rule blah
+
+ when 
+
+	Col1() from something.doIt["key"]
+	Col2()
+ then
+	partay();
+end	
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleAccessorWithFrom.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleAccessorWithFrom.drl	2006-11-30 21:06:45 UTC (rev 7996)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleAccessorWithFrom.drl	2006-11-30 21:29:10 UTC (rev 7997)
@@ -0,0 +1,10 @@
+
+rule blah
+
+ when 
+
+	Col1() from something.doIt
+	Col2()
+ then
+	partay();
+end	
\ No newline at end of file

Modified: 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 21:06:45 UTC (rev 7996)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleFunctionCallWithFrom.drl	2006-11-30 21:29:10 UTC (rev 7997)
@@ -3,7 +3,8 @@
 
  when 
 
-	Col() 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();
 end	
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleMethodCallWithFrom.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleMethodCallWithFrom.drl	2006-11-30 21:06:45 UTC (rev 7996)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_SimpleMethodCallWithFrom.drl	2006-11-30 21:29:10 UTC (rev 7997)
@@ -3,7 +3,8 @@
 
  when 
 
-	Col() 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();
 end	
\ No newline at end of file