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

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

Author: tirelli
Date: 2007-01-12 14:23:18 -0500 (Fri, 12 Jan 2007)
New Revision: 8842

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/builder/GroupElementBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java
Log:
JBRULES-218: builder is now fully operational. Nesting has basic testing done. No more failing tests

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/builder/GroupElementBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/builder/GroupElementBuilder.java	2007-01-12 18:06:12 UTC (rev 8841)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/builder/GroupElementBuilder.java	2007-01-12 19:23:18 UTC (rev 8842)
@@ -64,12 +64,18 @@
                                                          utils,
                                                          columnBuilder,
                                                          (BaseDescr) child );
-                ge.addChild( ce );
+                if( ce != null ) {
+                    ge.addChild( ce );
+                }
             } else if ( child instanceof ColumnDescr ) {
                 final Column column = columnBuilder.build( context,
                                                            utils,
                                                            (ColumnDescr) child );
-                ge.addChild( column );
+                // in case there is a problem with the column building,
+                // builder will return null. Ex: ClassNotFound for the column type
+                if( column != null ) {
+                    ge.addChild( column );
+                }
 
             } else {
                 throw new RuntimeDroolsException("BUG: no builder found for descriptor class "+child.getClass() );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2007-01-12 18:06:12 UTC (rev 8841)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2007-01-12 19:23:18 UTC (rev 8842)
@@ -27,7 +27,6 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -3668,6 +3667,7 @@
         } catch ( InvalidRulePackage e ) {
             // everything fine
         } catch ( Exception e ) {
+            e.printStackTrace();
             Assert.fail("Should have thrown an InvalidRulePackage Exception instead of "+e.getMessage());
         }
     }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java	2007-01-12 18:06:12 UTC (rev 8841)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java	2007-01-12 19:23:18 UTC (rev 8842)
@@ -78,7 +78,7 @@
 
     public boolean isAllowedCachedRight(final ReteTuple tuple,
                                         final ContextEntry context) {
-        return tuple.equals(((TupleStartEqualsConstraintContextEntry) context).right);
+        return tuple.equals(((TupleStartEqualsConstraintContextEntry) context).right.getSubTuple( tuple.size() ));
     }
 
     public String toString() {
@@ -129,7 +129,7 @@
         public void updateFromFactHandle(final InternalWorkingMemory workingMemory, final InternalFactHandle handle) {
             // if it is not a rete tuple, then there is a bug in the engine...
             // it MUST be a rete tuple
-            this.right = ((ReteTuple) handle.getObject()).getSubTuple( this.compareSize );
+            this.right = (ReteTuple) handle.getObject();
         }
     }
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java	2007-01-12 18:06:12 UTC (rev 8841)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java	2007-01-12 19:23:18 UTC (rev 8842)
@@ -201,7 +201,7 @@
      */
     public ReteTuple getSubTuple( int elements ) {
         ReteTuple entry = this;
-        if( elements > this.size() ) {
+        if( elements < this.size() ) {
             int lastindex = elements-1;
             
             while ( entry.index != lastindex ) {