[Jboss-svn-commits] JBL Code SVN: r4056 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/lang/descr test/java/org/drools/lang test/resources/org/drools/integrationtests

[<jbo...@li...>]

Author: mic...@jb...
Date: 2006-05-03 00:31:35 -0400 (Wed, 03 May 2006)
New Revision: 4056

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/eval_rule_test_more.drl
Log:
JBRULES-251

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java	2006-05-03 04:28:38 UTC (rev 4055)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java	2006-05-03 04:31:35 UTC (rev 4056)
@@ -36,12 +36,12 @@
         if ( this.descrs == Collections.EMPTY_LIST ) {
             this.descrs = new ArrayList( 1 );
         }
-//MN: No pattern combining ??     
-//        if ( patternDescr instanceof ColumnDescr ) {
-//            addColumn( (ColumnDescr) patternDescr );
-//        } else {
+     
+        if ( patternDescr instanceof ColumnDescr ) {
+            addColumn( (ColumnDescr) patternDescr );
+        } else {
             this.descrs.add( patternDescr );
-//        }
+        }
     }
 
     /**

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-05-03 04:28:38 UTC (rev 4055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2006-05-03 04:31:35 UTC (rev 4056)
@@ -388,7 +388,7 @@
     /** Note this is only to be enabled if we agree to combine patterns from columns bound to the same var.
      * At present, not a valid test. Refer to AndDescr and AndDescrTest (Michael Neale).
      */
-    public void XXXtestMultiBindings() throws Exception {
+    public void testMultiBindings() throws Exception {
         RuleDescr rule = parseResource( "multiple_bindings.drl" ).rule();        
         assertNotNull( rule );        
         assertEquals( "simple_rule", rule.getName() );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/eval_rule_test_more.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/eval_rule_test_more.drl	2006-05-03 04:28:38 UTC (rev 4055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/eval_rule_test_more.drl	2006-05-03 04:31:35 UTC (rev 4056)
@@ -12,4 +12,13 @@
         eval(s.equals("foo") && s.startsWith("f"))
     then
         list.add( s );
+end  
+
+rule "yet more"
+    when
+        s : String()
+        eval(s.equals("foo") && s.startsWith("f"))
+        eval(s.equals("foo") && s.startsWith("q"))        
+    then
+        list.add( s );
 end  
\ No newline at end of file