[jboss-svn-commits] JBL Code SVN: r27074 - labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests.

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

Author: tirelli
Date: 2009-06-22 19:08:05 -0400 (Mon, 22 Jun 2009)
New Revision: 27074

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/MarshallingTest.java
Log:
JBRULES-2128: fixing failing tests

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	2009-06-22 19:30:14 UTC (rev 27073)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java	2009-06-22 23:08:05 UTC (rev 27074)
@@ -101,6 +101,7 @@
         ruleBase.addPackage( pkg2 );
 
         //        ruleBase    = SerializationHelper.serializeObject(ruleBase);
+        workingMemory.fireAllRules();
         assertEquals( 3,
                       list.size() );
 
@@ -122,6 +123,7 @@
 
         // Package 3 has a rule working on Person instances.
         // As we added person instance in advance, rule should fire now
+        workingMemory.fireAllRules();
 
         Assert.assertEquals( "Rule from package 3 should have been fired",
                              "match Person ok",
@@ -138,8 +140,9 @@
         builder.addPackageFromDrl( reader );
         final Package pkg4 = SerializationHelper.serializeObject( builder.getPackage() );
         ruleBase.addPackage( pkg4 );
+        workingMemory.fireAllRules();
         ruleBase = SerializationHelper.serializeObject( ruleBase );
-
+        
         Assert.assertEquals( "Rule from package 4 should have been fired",
                              "Who likes Stilton ok",
                              bob.getStatus() );
@@ -558,6 +561,8 @@
         builder2.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_CollectDynamicRules2.drl" ) ) );
         final Package pkg2 = builder2.getPackage();
         ruleBase.addPackage( pkg2 );
+        workingMemory.fireAllRules();
+        
         ruleBase = SerializationHelper.serializeObject( ruleBase );
 
         // fire all rules is automatic
@@ -680,6 +685,7 @@
             PackageBuilder fredBuilder = new PackageBuilder();
             fredBuilder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_DynamicRulesFred.drl" ) ) );
             ruleBase.addPackage( fredBuilder.getPackage() );
+            session.fireAllRules();
 
             assertEquals( 2,
                           results.size() );
@@ -692,6 +698,7 @@
             PackageBuilder edBuilder = new PackageBuilder();
             edBuilder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_DynamicRulesEd.drl" ) ) );
             ruleBase.addPackage( edBuilder.getPackage() );
+            session.fireAllRules();
 
             assertEquals( 2,
                           results.size() );
@@ -909,6 +916,7 @@
 
         ruleBaseWM.removePackage( packageName );
         ruleBaseWM.addPackage( SerializationHelper.serializeObject( builder1.getPackage() ) );
+        workingMemory.fireAllRules();
         assertEquals( 1,
                       results.size() );
         assertEquals( 3,
@@ -917,6 +925,7 @@
 
         ruleBaseWM.removePackage( packageName );
         ruleBaseWM.addPackage( SerializationHelper.serializeObject( builder1.getPackage() ) );
+        workingMemory.fireAllRules();
         assertEquals( 1,
                       results.size() );
         assertEquals( 3,

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java	2009-06-22 19:30:14 UTC (rev 27073)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java	2009-06-22 23:08:05 UTC (rev 27074)
@@ -1200,6 +1200,7 @@
         pkg = builder.getPackage();
 
         ruleBase.addPackage( pkg );
+        session2.fireAllRules();
 
         assertEquals( 2,
                       ((List) session2.getGlobal( "list" )).size() );