[jboss-svn-commits] JBL Code SVN: r17073 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/testframework and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Dec 6 22:21:11 EST 2007
Author: michael.neale at jboss.com
Date: 2007-12-06 22:21:11 -0500 (Thu, 06 Dec 2007)
New Revision: 17073
Modified:
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-1367 Upgrading MVEL version
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-12-07 03:14:51 UTC (rev 17072)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2007-12-07 03:21:11 UTC (rev 17073)
@@ -24,6 +24,7 @@
import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
import org.drools.common.InternalWorkingMemory;
import org.drools.rule.TimeMachine;
+import org.mvel.integration.impl.BaseVariableResolverFactory;
/**
* This actually runs the test scenarios.
@@ -56,18 +57,13 @@
*
*/
public ScenarioRunner(final Scenario scenario, final TypeResolver resolver,
- final InternalWorkingMemory wm, ClassLoader cl) throws ClassNotFoundException {
+ final InternalWorkingMemory wm) throws ClassNotFoundException {
this.scenario = scenario;
this.workingMemory = wm;
scenario.lastRunResult = new Date();
- ClassLoader current = Thread.currentThread().getContextClassLoader();
- if (cl != null) {
- Thread.currentThread().setContextClassLoader(cl);
- }
- try {
//stub out any rules we don't want to have the consequences firing of.
HashSet<String> ruleList = new HashSet<String>();
ruleList.addAll(scenario.rules);
@@ -139,12 +135,8 @@
}
- } finally {
- if (cl != null) {
- Thread.currentThread().setContextClassLoader(current);
- }
- }
+
}
private void applyTimeMachine(final InternalWorkingMemory wm,
@@ -202,6 +194,7 @@
void verify(VerifyFact value) {
+
Object fact = this.populatedData.get(value.name);
if (fact == null) fact = this.globalData.get(value.name);
for (int i = 0; i < value.fieldValues.size(); i++) {
@@ -254,3 +247,4 @@
}
+
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-12-07 03:14:51 UTC (rev 17072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java 2007-12-07 03:21:11 UTC (rev 17073)
@@ -43,7 +43,7 @@
resolver.addImport("org.drools.Cheese");
resolver.addImport("org.drools.Person");
ScenarioRunner runner = new ScenarioRunner(sc, resolver,
- new MockWorkingMemory(), null);
+ new MockWorkingMemory());
assertTrue(runner.populatedData.containsKey("c1"));
assertTrue(runner.populatedData.containsKey("p1"));
@@ -73,7 +73,7 @@
resolver.addImport("org.drools.Cheese");
ScenarioRunner runner = new ScenarioRunner(sc, resolver,
- new MockWorkingMemory(), null);
+ new MockWorkingMemory());
assertTrue(runner.populatedData.containsKey("c1"));
assertTrue(runner.populatedData.containsKey("c2"));
@@ -92,7 +92,7 @@
TypeResolver resolver = new ClassTypeResolver(new HashSet<Object>(),
Thread.currentThread().getContextClassLoader());
resolver.addImport("org.drools.Cheese");
- ScenarioRunner run = new ScenarioRunner(new Scenario(), resolver, new MockWorkingMemory(), null);
+ ScenarioRunner run = new ScenarioRunner(new Scenario(), resolver, new MockWorkingMemory());
run.populatedData.clear();
Cheese c = new Cheese();
c.setType("whee");
@@ -113,7 +113,7 @@
public void testVerifyFacts() throws Exception {
ScenarioRunner runner = new ScenarioRunner(new Scenario(), null,
- new MockWorkingMemory(), null);
+ new MockWorkingMemory());
Cheese f1 = new Cheese("cheddar", 42);
runner.populatedData.put("f1", f1);
@@ -176,7 +176,7 @@
public void testVerifyFactsWithOperator() throws Exception {
ScenarioRunner runner = new ScenarioRunner(new Scenario(), null,
- new MockWorkingMemory(), null);
+ new MockWorkingMemory());
Cheese f1 = new Cheese("cheddar", 42);
runner.populatedData.put("f1", f1);
@@ -219,7 +219,7 @@
resolver.addImport("org.drools.Cheese");
MockWorkingMemory wm = new MockWorkingMemory();
- ScenarioRunner runner = new ScenarioRunner(sc, resolver, wm, null);
+ ScenarioRunner runner = new ScenarioRunner(sc, resolver, wm);
assertEquals(1, wm.facts.size());
assertEquals(runner.populatedData.get("c1"), wm.facts.get(0));
@@ -239,7 +239,7 @@
// and baz, we leave out
ScenarioRunner runner = new ScenarioRunner(new Scenario(), null,
- new MockWorkingMemory(), null);
+ new MockWorkingMemory());
VerifyRuleFired v = new VerifyRuleFired();
v.ruleName = "foo";
v.expectedFire = true;
@@ -276,7 +276,7 @@
sc.fixtures.add(ext);
MockWorkingMemory wm = new MockWorkingMemory();
- ScenarioRunner run = new ScenarioRunner(sc, null, wm, null);
+ ScenarioRunner run = new ScenarioRunner(sc, null, wm);
assertEquals(wm, run.workingMemory);
assertNotNull(wm.agendaEventListener);
assertTrue(wm.agendaEventListener instanceof TestingEventListener);
@@ -300,7 +300,7 @@
resolver.addImport("org.drools.Cheese");
MockWorkingMemory wm = new MockWorkingMemory();
- ScenarioRunner run = new ScenarioRunner(sc, resolver, wm, null);
+ ScenarioRunner run = new ScenarioRunner(sc, resolver, wm);
assertEquals(1, wm.globals.size());
assertEquals(1, run.globalData.size());
assertEquals(1, run.populatedData.size());
@@ -318,7 +318,7 @@
public void testSimulatedDate() throws Exception {
Scenario sc = new Scenario();
MockWorkingMemory wm = new MockWorkingMemory();
- ScenarioRunner run = new ScenarioRunner(sc, null, wm, null);
+ ScenarioRunner run = new ScenarioRunner(sc, null, wm);
TimeMachine tm = run.workingMemory.getTimeMachine();
// love you
@@ -331,7 +331,7 @@
ExecutionTrace ext = new ExecutionTrace();
ext.scenarioSimulatedDate = new Date("10-Jul-1974");
sc.fixtures.add(ext);
- run = new ScenarioRunner(sc, null, wm, null);
+ run = new ScenarioRunner(sc, null, wm);
tm = run.workingMemory.getTimeMachine();
long expected = ext.scenarioSimulatedDate.getTime();
@@ -343,7 +343,7 @@
public void testVerifyRuleFired() throws Exception {
ScenarioRunner runner = new ScenarioRunner(new Scenario(), null,
- new MockWorkingMemory(), null);
+ new MockWorkingMemory());
VerifyRuleFired vr = new VerifyRuleFired("qqq", 42, null);
Map<String, Integer> f = new HashMap<String, Integer>();
@@ -431,7 +431,7 @@
WorkingMemory wm = getWorkingMemory("test_rules2.drl");
- ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm, null);
+ ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm);
assertEquals(3, executionTrace.numberOfRulesFired.intValue());
@@ -468,7 +468,7 @@
WorkingMemory wm = getWorkingMemory("test_stateful.drl");
- ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm, null);
+ ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm);
Cheese c1 = (Cheese) run.populatedData.get("c1");
Cheese c2 = (Cheese) run.populatedData.get("c2");
@@ -502,7 +502,7 @@
WorkingMemory wm = getWorkingMemory("test_stateful.drl");
- ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm, null);
+ ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm);
Cheese c1 = (Cheese) run.populatedData.get("c1");
@@ -534,7 +534,7 @@
WorkingMemory wm = getWorkingMemory("test_stateful.drl");
- ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm, null);
+ ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm);
Cheese c1 = (Cheese) run.populatedData.get("c1");
@@ -587,7 +587,7 @@
WorkingMemory wm = getWorkingMemory("test_rules2.drl");
- ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm, null);
+ ScenarioRunner run = new ScenarioRunner(sc, resolver, (InternalWorkingMemory) wm);
assertSame(run.scenario, sc);
More information about the jboss-svn-commits
mailing list