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

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

Author: mark.proctor at jboss.com
Date: 2007-08-26 22:30:24 -0400 (Sun, 26 Aug 2007)
New Revision: 14618

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dynamic2.drl
Log:
JBRULES-1137 Rules are not removed when they have shared nodes


Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java	2007-08-27 00:42:33 UTC (rev 14617)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java	2007-08-27 02:30:24 UTC (rev 14618)
@@ -174,22 +174,28 @@
                                            5 );
         workingMemory.insert( cheddar );
 
-        assertEquals( 11,
+        assertEquals( 15,
                       workingMemory.getAgenda().getActivations().length );
 
         reteooRuleBase.removeRule( "org.drools.test",
                                    "Who likes Stilton" );
-        assertEquals( 8,
+        assertEquals( 12,
                       workingMemory.getAgenda().getActivations().length );
 
         reteooRuleBase.removeRule( "org.drools.test",
                                    "like cheese" );
+        
+//        reteooRuleBase.removeRule( "org.drools.test",
+//                                   "like cheese2" );        
 
         final Cheese muzzarela = new Cheese( "muzzarela",
                                              5 );
+        assertEquals( 8,
+                      workingMemory.getAgenda().getActivations().length );
+        
         workingMemory.insert( muzzarela );
 
-        assertEquals( 4,
+        assertEquals( 9,
                       workingMemory.getAgenda().getActivations().length );
 
         reteooRuleBase.removePackage( "org.drools.test" );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dynamic2.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dynamic2.drl	2007-08-27 00:42:33 UTC (rev 14617)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dynamic2.drl	2007-08-27 02:30:24 UTC (rev 14618)
@@ -4,9 +4,18 @@
 
 global java.util.List list
 
+// make these rules share
+// so that we know things are being 
+// removed correctly still
 rule "like cheese"
     when
         Cheese( t:type )
     then
 		list.add( t );
+end    
+
+rule "like cheese2"
+    when
+        Cheese( t:type )
+    then
 end    
\ No newline at end of file