[jboss-svn-commits] JBL Code SVN: r16043 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/testframework and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 24 06:22:35 EDT 2007
Author: michael.neale at jboss.com
Date: 2007-10-24 06:22:34 -0400 (Wed, 24 Oct 2007)
New Revision: 16043
Added:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ExecutionTrace.java
Removed:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ScenarioRules.java
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
Log:
JBRULES-1271 testing framework refactoring
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ExecutionTrace.java (from rev 16032, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ScenarioRules.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ExecutionTrace.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ExecutionTrace.java 2007-10-24 10:22:34 UTC (rev 16043)
@@ -0,0 +1,47 @@
+package org.drools.brms.client.modeldriven.testing;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This contains lists of rules to include in the scenario (or exclude, as the case may be !).
+ * This will be used to filter the rule engines behaviour under test.
+ * @author Michael Neale
+ */
+public class ExecutionTrace implements Serializable {
+
+ /**
+ * the rules to include or exclude
+ */
+ public String[] rules = new String[0];
+
+ /**
+ * true if only the rules in the list should be allowed to fire. Otherwise
+ * it is exclusive (ie all rules can fire BUT the ones in the list).
+ */
+ public boolean inclusive = false;
+
+ /**
+ * @gwt.typeArgs <java.lang.String, java.lang.Integer>
+ */
+ public Map firingCounts = new HashMap();
+
+ /**
+ * The time taken for execution.
+ */
+ public long executionTimeResult = -1;
+
+ /**
+ * This is the date the last time the scenario was run (and what the results apply to).
+ */
+ public Date lastRunResult;
+
+ public ExecutionTrace() {}
+ public ExecutionTrace(String[] ruleList, boolean inclusive) {
+ this.rules = ruleList;
+ this.inclusive = inclusive;
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java 2007-10-24 09:56:41 UTC (rev 16042)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java 2007-10-24 10:22:34 UTC (rev 16043)
@@ -35,7 +35,7 @@
/**
* The rules to trace in this scenario.
*/
- public ScenarioRules ruleTrace = new ScenarioRules();
+ public ExecutionTrace executionTrace = new ExecutionTrace();
/**
* Returns true if this was a totally successful scenario, based on the results contained.
@@ -50,17 +50,6 @@
return true;
}
- /**
- * The time taken for execution.
- */
- public long executionTimeResult = -1;
-
-
- /**
- * This is the date the last time the scenario was run (and what the results apply to).
- */
- public Date lastRunResult;
-
}
Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ScenarioRules.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ScenarioRules.java 2007-10-24 09:56:41 UTC (rev 16042)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ScenarioRules.java 2007-10-24 10:22:34 UTC (rev 16043)
@@ -1,36 +0,0 @@
-package org.drools.brms.client.modeldriven.testing;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This contains lists of rules to include in the scenario (or exclude, as the case may be !).
- * This will be used to filter the rule engines behaviour under test.
- * @author Michael Neale
- */
-public class ScenarioRules implements Serializable {
-
- /**
- * the rules to include or exclude
- */
- public String[] rules = new String[0];
-
- /**
- * true if only the rules in the list should be allowed to fire. Otherwise
- * it is exclusive (ie all rules can fire BUT the ones in the list).
- */
- public boolean inclusive = false;
-
- /**
- * @gwt.typeArgs <java.lang.String, java.lang.Integer>
- */
- public Map firingCounts = new HashMap();
-
- public ScenarioRules() {}
- public ScenarioRules(String[] ruleList, boolean inclusive) {
- this.rules = ruleList;
- this.inclusive = inclusive;
- }
-
-}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java 2007-10-24 09:56:41 UTC (rev 16042)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java 2007-10-24 10:22:34 UTC (rev 16043)
@@ -9,9 +9,9 @@
public VerifyField[] fieldValues = new VerifyField[0];
public String factName;
+ public String description;
-
public VerifyFact() {}
public VerifyFact(String factName, VerifyField[] fieldValues) {
this.factName = factName;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2007-10-24 09:56:41 UTC (rev 16042)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2007-10-24 10:22:34 UTC (rev 16043)
@@ -7,7 +7,6 @@
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import org.drools.WorkingMemory;
@@ -53,7 +52,7 @@
final InternalWorkingMemory wm) throws ClassNotFoundException {
this.scenario = scenario;
this.workingMemory = wm;
- scenario.lastRunResult = new Date();
+ scenario.executionTrace.lastRunResult = new Date();
@@ -72,9 +71,9 @@
//create the listener to trace rules
HashSet<String> ruleList = new HashSet<String>();
- ruleList.addAll(Arrays.asList(scenario.ruleTrace.rules));
+ ruleList.addAll(Arrays.asList(scenario.executionTrace.rules));
TestingEventListener listener = new TestingEventListener(ruleList, wm
- .getRuleBase(), scenario.ruleTrace.inclusive);
+ .getRuleBase(), scenario.executionTrace.inclusive);
wm.addEventListener(listener);
//set up the time machine
@@ -94,8 +93,8 @@
//love you
long time = System.currentTimeMillis();
wm.fireAllRules(scenario.maxRuleFirings);
- scenario.executionTimeResult = System.currentTimeMillis() - time;
- scenario.ruleTrace.firingCounts = listener.firingCounts;
+ scenario.executionTrace.executionTimeResult = System.currentTimeMillis() - time;
+ scenario.executionTrace.firingCounts = listener.firingCounts;
// now check the results...
for (int i = 0; i < scenario.assertions.length; i++) {
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 2007-10-24 09:56:41 UTC (rev 16042)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java 2007-10-24 10:22:34 UTC (rev 16043)
@@ -187,7 +187,7 @@
public void testTestingEventListener() throws Exception {
Scenario sc = new Scenario();
- sc.ruleTrace.rules = new String[] { "foo", "bar" };
+ sc.executionTrace.rules = new String[] { "foo", "bar" };
MockWorkingMemory wm = new MockWorkingMemory();
ScenarioRunner run = new ScenarioRunner(sc, null, wm);
assertEquals(wm, run.workingMemory);
@@ -266,8 +266,8 @@
};
- sc.ruleTrace.rules = new String[] {"rule1", "rule2" };
- sc.ruleTrace.inclusive = true;
+ sc.executionTrace.rules = new String[] {"rule1", "rule2" };
+ sc.executionTrace.inclusive = true;
sc.assertions = new Assertion[5];
@@ -305,8 +305,8 @@
assertEquals(0, p.getAge());
- assertTrue((new Date()).after(sc.lastRunResult));
- assertTrue(sc.executionTimeResult != -1);
+ assertTrue((new Date()).after(sc.executionTrace.lastRunResult));
+ assertTrue(sc.executionTrace.executionTimeResult != -1);
}
@@ -320,8 +320,8 @@
};
- sc.ruleTrace.rules = new String[] {"rule1", "rule2" };
- sc.ruleTrace.inclusive = true;
+ sc.executionTrace.rules = new String[] {"rule1", "rule2" };
+ sc.executionTrace.inclusive = true;
sc.assertions = new Assertion[5];
More information about the jboss-svn-commits
mailing list