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

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

Author: michael.neale at jboss.com
Date: 2008-10-15 01:22:10 -0400 (Wed, 15 Oct 2008)
New Revision: 23457

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/TestingEventListenerTest.java
Log:
changed behaviour of filtering on advice from jdelong

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java	2008-10-15 04:06:55 UTC (rev 23456)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java	2008-10-15 05:22:10 UTC (rev 23457)
@@ -47,18 +47,24 @@
 			public boolean accept(Activation activation) {
 				if (ruleNames.size() ==0) return true;
 				String ruleName = activation.getRule().getName();
+				
+				http://www.wtf.com
+					
+				//jdelong: please don't want to see records of cancelled activations 
+					
 				if (inclusive) {
 					if (ruleNames.contains(ruleName)) {
 						return true;
 					} else {
-						record(activation.getRule(), firingCounts);
+						//record(activation.getRule(), firingCounts);
 						return false;
 					}
+					
 				} else {
-					if (!ruleName.contains(ruleName)) {
+					if (!ruleNames.contains(ruleName)) {
 						return true;
 					} else {
-						record(activation.getRule(), firingCounts);
+						//record(activation.getRule(), firingCounts);
 						return false;
 					}
 				}

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java	2008-10-15 04:06:55 UTC (rev 23456)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java	2008-10-15 05:22:10 UTC (rev 23457)
@@ -776,7 +776,7 @@
                                              1,
                                              null );
         assertions[4] = new VerifyRuleFired( "rule3",
-                                             1,
+                                             0,
                                              null );
 
         sc.fixtures.addAll( Arrays.asList( assertions ) );
@@ -792,7 +792,7 @@
                                                  resolver,
                                                  (InternalWorkingMemory) wm );
 
-        assertEquals( 3,
+        assertEquals( 2,
                       executionTrace.numberOfRulesFired.intValue() );
 
         assertSame( run.scenario,
@@ -1058,7 +1058,7 @@
 
         assertEquals( 2,
                       vr.expectedCount.intValue() );
-        assertEquals( 1,
+        assertEquals( 0,
                       vr.actualResult.intValue() );
 
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/TestingEventListenerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/TestingEventListenerTest.java	2008-10-15 04:06:55 UTC (rev 23456)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/TestingEventListenerTest.java	2008-10-15 05:22:10 UTC (rev 23457)
@@ -27,16 +27,16 @@
         assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule1"));
         assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule2"));
 
-        assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule3"));
-        assertTrue(ls.firingCounts.containsKey("rule3"));
+        //assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule3"));
+        assertFalse(ls.firingCounts.containsKey("rule3"));
         assertFalse(ls.firingCounts.containsKey("rule4"));
 
         session.insert(new Cheese());
         session.fireAllRules(ls.getAgendaFilter(set, true));
         assertEquals(new Integer(2), (Integer) ls.firingCounts.get("rule1"));
         assertEquals(new Integer(2), (Integer) ls.firingCounts.get("rule2"));
-        assertEquals(new Integer(2), (Integer) ls.firingCounts.get("rule3"));
-        assertEquals(6, ls.totalFires);
+        assertFalse(ls.firingCounts.containsKey("rule3"));
+        assertEquals(4, ls.totalFires);
 
 	}
 
@@ -56,11 +56,12 @@
         session.insert(new Cheese());
         session.fireAllRules(ls.getAgendaFilter(set, false));
 
+        //assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule1"));
+        //assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule2"));
+
+        assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule2"));
         assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule1"));
-        assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule2"));
-
-        assertEquals(new Integer(1), (Integer) ls.firingCounts.get("rule3"));
-        assertTrue(ls.firingCounts.containsKey("rule3"));
+        assertFalse(ls.firingCounts.containsKey("rule3"));
         assertFalse(ls.firingCounts.containsKey("rule4"));