[jboss-svn-commits] JBL Code SVN: r12808 - in labs/jbossrules/trunk/drools-core/src: test/java/org/drools/reteoo and 1 other directory.

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

Author: tirelli
Date: 2007-06-24 16:39:30 -0400 (Sun, 24 Jun 2007)
New Revision: 12808

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/AlphaNodeTest.java
Log:
Fixing AlphaMemory configuration and test cases

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java	2007-06-24 20:36:11 UTC (rev 12807)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java	2007-06-24 20:39:30 UTC (rev 12808)
@@ -138,6 +138,9 @@
         if ( hasMemory() ) {
             final FactHashTable memory = (FactHashTable) workingMemory.getNodeMemory( this );
             propagate = memory.remove( handle );
+        } else {
+            propagate = this.constraint.isAllowed( handle.getObject(),
+                                                   workingMemory );
         }
         if ( propagate ) {
             this.sink.propagateRetractObject( handle,

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/AlphaNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/AlphaNodeTest.java	2007-06-24 20:36:11 UTC (rev 12807)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/AlphaNodeTest.java	2007-06-24 20:39:30 UTC (rev 12808)
@@ -416,7 +416,7 @@
                       memory.size() );
 
         final DefaultFactHandle f1 = new DefaultFactHandle( 1,
-                                                            "cheese" );
+                                                            new Cheese( "brie", 10 ) );
 
         // object should NOT retract as it doesn't exist
         alphaNode.retractObject( f1,
@@ -424,7 +424,7 @@
                                  workingMemory );
 
         // without memory, it will always propagate a retract
-        assertLength( 1,
+        assertLength( 0,
                       sink.getRetracted() );
         assertEquals( 0,
                       memory.size() );
@@ -436,11 +436,11 @@
                                  context,
                                  workingMemory );
 
-        assertLength( 2,
+        assertLength( 1,
                       sink.getRetracted() );
         assertEquals( 0,
                       memory.size() );
-        final Object[] list = (Object[]) sink.getRetracted().get( 1 );
+        final Object[] list = (Object[]) sink.getRetracted().get( 0 );
         assertSame( f0,
                     list[0] );