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

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

Author: mark.proctor at jboss.com
Date: 2009-01-19 00:07:33 -0500 (Mon, 19 Jan 2009)
New Revision: 24773

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_functionCallingFunction.drl
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
Log:
JBRULES-1613 functions fail when other functions that start with the same name exist
-fixed and updated recursive function test to reflect

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java	2009-01-19 03:00:54 UTC (rev 24772)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java	2009-01-19 05:07:33 UTC (rev 24773)
@@ -55,7 +55,7 @@
         final List staticImports = new LinkedList();
         for( Iterator it = pkg.getStaticImports().iterator(); it.hasNext(); ) {
             final String staticImport = (String) it.next();
-            if( ! staticImport.startsWith( functionDescr.getClassName() ) ) {
+            if( ! staticImport.endsWith( functionDescr.getName() ) ) {
                 staticImports.add( staticImport );
             }
         }

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	2009-01-19 03:00:54 UTC (rev 24772)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2009-01-19 05:07:33 UTC (rev 24773)
@@ -4368,7 +4368,7 @@
         assertEquals( 1,
                       list.size() );
 
-        assertEquals( 10,
+        assertEquals( 12,
                       ((Integer) list.get( 0 )).intValue() );
     }
 
@@ -4394,7 +4394,7 @@
         assertEquals( 1,
                       list.size() );
 
-        assertEquals( 10,
+        assertEquals( 12,
                       ((Integer) list.get( 0 )).intValue() );
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_functionCallingFunction.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_functionCallingFunction.drl	2009-01-19 03:00:54 UTC (rev 24772)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_functionCallingFunction.drl	2009-01-19 05:07:33 UTC (rev 24773)
@@ -39,12 +39,20 @@
 }
 
 function int f10(int i) {
+    return checkHierachy( i+ 1 );
+}
+
+function int checkHierachy(int i) {
+        return checkHierachyRecursive( i+ 1 );
+}
+
+function int checkHierachyRecursive(int i) {
     return i+1;
 }
 
 rule "X"
 when
-    eval( f1(0) == 10 )
+    eval( f1(0) == 12 )
 then
     results.add( new Integer( f1(0) ) );
 end
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java	2009-01-19 03:00:54 UTC (rev 24772)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java	2009-01-19 05:07:33 UTC (rev 24773)
@@ -457,6 +457,13 @@
 
     }
 
+//    public static class AccumulatePropagationCallBack {
+//        private Object            workingMemoryContext;
+//        private AccumulateContext accctx;
+//        private LeftTuple         leftTuple;
+//
+//    }
+
     /**
      * Evaluate result constraints and propagate assert in case they are true
      *