[jboss-svn-commits] JBL Code SVN: r19290 - labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel.

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

Author: mark.proctor at jboss.com
Date: 2008-03-28 02:04:34 -0400 (Fri, 28 Mar 2008)
New Revision: 19290

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
Log:
JBRULES-1520 RightTuple merge for asymmetrical Rete propagations
-Various fixes to get things working.

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java	2008-03-28 05:47:53 UTC (rev 19289)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java	2008-03-28 06:04:34 UTC (rev 19290)
@@ -86,7 +86,7 @@
         final Cheese cheddar = new Cheese( "cheddar",
                                            10 );
         final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
-        final LeftTuple tuple = new LeftTuple( f0 );
+        final LeftTuple tuple = new LeftTuple( f0, null );
 
         final AgendaItem item = new AgendaItem( 0,
                                                 tuple,
@@ -154,7 +154,7 @@
         final Cheese cheddar = new Cheese( "cheddar",
                                            10 );
         final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
-        final LeftTuple tuple = new LeftTuple( f0 );
+        final LeftTuple tuple = new LeftTuple( f0, null );
 
         final AgendaItem item = new AgendaItem( 0,
                                                 tuple,

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java	2008-03-28 05:47:53 UTC (rev 19289)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java	2008-03-28 06:04:34 UTC (rev 19290)
@@ -75,7 +75,7 @@
         final Cheese cheddar = new Cheese( "cheddar",
                                            10 );
         final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
-        final LeftTuple tuple = new LeftTuple( f0 );
+        final LeftTuple tuple = new LeftTuple( f0, null );
         
         Object evalContext = eval.createContext();
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java	2008-03-28 05:47:53 UTC (rev 19289)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java	2008-03-28 06:04:34 UTC (rev 19290)
@@ -105,7 +105,7 @@
                                            10 );
         final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
         final InternalFactHandle f1 = (InternalFactHandle) wm.insert( stilton );
-        final LeftTuple tuple = new LeftTuple( f0 );
+        final LeftTuple tuple = new LeftTuple( f0, null );
 
         final PredicateContextEntry predicateContext = (PredicateContextEntry) predicate.createContextEntry();
         predicateContext.leftTuple = tuple;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java	2008-03-28 05:47:53 UTC (rev 19289)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java	2008-03-28 06:04:34 UTC (rev 19290)
@@ -21,6 +21,7 @@
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.reteoo.LeftTuple;
+import org.drools.reteoo.RightTuple;
 import org.drools.rule.ContextEntry;
 import org.drools.rule.Declaration;
 import org.drools.rule.Package;
@@ -113,11 +114,11 @@
         final Cheese cheddar = new Cheese( "cheddar",
                                            10 );
         final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
-        LeftTuple tuple = new LeftTuple( f0 );
+        LeftTuple tuple = new LeftTuple( f0, null );
 
         final InternalFactHandle f1 = (InternalFactHandle) wm.insert( stilton );
         tuple = new LeftTuple( tuple,
-                               f1 );
+                               new RightTuple( f1, null ), null );
 
         final Cheese brie = new Cheese( "brie",
                                         20 );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java	2008-03-28 05:47:53 UTC (rev 19289)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java	2008-03-28 06:04:34 UTC (rev 19290)
@@ -62,7 +62,7 @@
 
         final Person p = new Person("mark", "", 31);
         final InternalFactHandle f0 = (InternalFactHandle) wm.insert( p );
-        final LeftTuple tuple = new LeftTuple( f0 );
+        final LeftTuple tuple = new LeftTuple( f0, null );
 
         SalienceBuilder salienceBuilder = new MVELSalienceBuilder();
         salienceBuilder.build( context );