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

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

Author: mark.proctor at jboss.com
Date: 2010-11-29 02:38:16 -0500 (Mon, 29 Nov 2010)
New Revision: 36098

Modified:
   labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/testframework/ScenarioRunner.java
   labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/RuleUnit.java
   labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
Log:
JBRULES-2808 Remove TimeMachine so we have a unified clock structure

Modified: labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/testframework/ScenarioRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/testframework/ScenarioRunner.java	2010-11-29 01:46:45 UTC (rev 36097)
+++ labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/testframework/ScenarioRunner.java	2010-11-29 07:38:16 UTC (rev 36098)
@@ -28,8 +28,11 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.drools.ClockType;
 import org.drools.FactHandle;
 import org.drools.RuleBase;
+import org.drools.SessionConfiguration;
+import org.drools.StatefulSession;
 import org.drools.base.ClassTypeResolver;
 import org.drools.base.TypeResolver;
 import org.drools.common.InternalRuleBase;
@@ -100,7 +103,11 @@
     public ScenarioRunner(String xml,
                           RuleBase rb) throws ClassNotFoundException {
         this.scenario = ScenarioXMLPersistence.getInstance().unmarshal( xml );
-        this.workingMemory = (InternalWorkingMemory) rb.newStatefulSession();
+        
+        SessionConfiguration conf = new SessionConfiguration();
+        conf.setClockType( ClockType.PSEUDO_CLOCK );
+        
+        this.workingMemory = (InternalWorkingMemory) rb.newStatefulSession( conf, null );
                 Package pk = rb.getPackages()[0];
         ClassLoader cl = ((InternalRuleBase) rb).getRootClassLoader();
         HashSet<String> imports = new HashSet<String>();

Modified: labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/RuleUnit.java
===================================================================
--- labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/RuleUnit.java	2010-11-29 01:46:45 UTC (rev 36097)
+++ labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/RuleUnit.java	2010-11-29 07:38:16 UTC (rev 36098)
@@ -18,14 +18,19 @@
 
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.Date;
 
 import junit.framework.TestCase;
 
+import org.drools.ClockType;
 import org.drools.RuleBase;
 import org.drools.RuleBaseFactory;
+import org.drools.SessionConfiguration;
 import org.drools.StatefulSession;
+import org.drools.WorkingMemory;
 import org.drools.compiler.DroolsParserException;
 import org.drools.compiler.PackageBuilder;
+import org.drools.time.impl.PseudoClockScheduler;
 
 /**
  * A class with some utilities for testing rules.
@@ -46,6 +51,11 @@
 		RuleBase rb = RuleBaseFactory.newRuleBase();
 		rb.addPackage(builder.getPackage());
 
-		return rb.newStatefulSession();
+		SessionConfiguration conf = new SessionConfiguration();
+		conf.setClockType( ClockType.PSEUDO_CLOCK );
+		StatefulSession wm = rb.newStatefulSession( conf, null );
+
+        
+		return wm;
 	}
 }

Modified: labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/ScenarioRunnerTest.java	2010-11-29 01:46:45 UTC (rev 36097)
+++ labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/ScenarioRunnerTest.java	2010-11-29 07:38:16 UTC (rev 36098)
@@ -765,6 +765,12 @@
         sc.fixtures.add( ext );
 
         MockWorkingMemory wm = new MockWorkingMemory();
+        PseudoClockScheduler clock = new PseudoClockScheduler();
+        long time = new Date().getTime();
+        clock.setStartupTime( time );
+        clock.setSession( wm );
+        wm.setSessionClock( clock ); 
+        
         ScenarioRunner run = new ScenarioRunner( sc,
                                                  null,
                                                  wm );