[jboss-svn-commits] JBL Code SVN: r13500 - in labs/jbossrules/trunk: drools-compiler/src/test/resources/org/drools/integrationtests and 1 other directories.

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

Author: tirelli
Date: 2007-07-14 10:33:53 -0400 (Sat, 14 Jul 2007)
New Revision: 13500

Added:
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_bindings.drl
Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
Log:
Fixing tests

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2007-07-14 14:01:32 UTC (rev 13499)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2007-07-14 14:33:53 UTC (rev 13500)
@@ -3332,6 +3332,31 @@
         //Thread.currentThread().wait();
     }
 
+    public void testBindingsOnConnectiveExpressions() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_bindings.drl" ) ) );
+        final Package pkg = builder.getPackage();
+
+        final RuleBase ruleBase = getRuleBase();
+        ruleBase.addPackage( pkg );
+        final WorkingMemory workingMemory = ruleBase.newStatefulSession();
+
+        final List results = new ArrayList();
+        workingMemory.setGlobal( "results",
+                                 results );
+
+        workingMemory.insert( new Cheese( "stilton", 15 ) );
+
+        workingMemory.fireAllRules();
+
+        assertEquals( 2,
+                      results.size() );
+        assertEquals( "stilton",
+                      results.get(0) );
+        assertEquals( new Integer(15),
+                      results.get(1) );
+    }
+
     
 
 }
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_bindings.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_bindings.drl	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_bindings.drl	2007-07-14 14:33:53 UTC (rev 13500)
@@ -0,0 +1,11 @@
+package org.drools;
+
+global java.util.List results;
+
+rule "bindings"
+when
+    Cheese( $t : type == "stilton" || $p : price == 10 )
+then
+    results.add( $t );
+    results.add( new Integer( $p ) );
+end 
\ No newline at end of file


Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_bindings.drl
___________________________________________________________________
Name: svn:executable
   + *

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java	2007-07-14 14:01:32 UTC (rev 13499)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java	2007-07-14 14:33:53 UTC (rev 13500)
@@ -34,7 +34,7 @@
                                  workingMemory,
                                  null );
         final Boolean result = (Boolean) MVEL.executeExpression( this.expr,
-                                                                 null,
+                                                                 object,
                                                                  this.factory );
         return result.booleanValue();
     }