[jboss-svn-commits] JBL Code SVN: r16040 - 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 02:48:14 EDT 2007
Author: michael.neale at jboss.com
Date: 2007-10-24 02:48:14 -0400 (Wed, 24 Oct 2007)
New Revision: 16040
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/brms/client/modeldriven/testing/VerifyField.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyRuleFired.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
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 06:34:07 UTC (rev 16039)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java 2007-10-24 06:48:14 UTC (rev 16040)
@@ -53,13 +53,13 @@
/**
* The time taken for execution.
*/
- public long executionTimeTaken = -1;
+ public long executionTimeResult = -1;
/**
* This is the date the last time the scenario was run (and what the results apply to).
*/
- public Date lastRunDate;
+ public Date lastRunResult;
}
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 06:34:07 UTC (rev 16039)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java 2007-10-24 06:48:14 UTC (rev 16040)
@@ -22,7 +22,7 @@
public boolean wasSuccessful() {
for (int i = 0; i < fieldValues.length; i++) {
VerifyField vf = fieldValues[i];
- if (!vf.success) {
+ if (!vf.successResult) {
return false;
}
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyField.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyField.java 2007-10-24 06:34:07 UTC (rev 16039)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyField.java 2007-10-24 06:48:14 UTC (rev 16040)
@@ -7,8 +7,8 @@
public String fieldName;
public String expected;
- public String actual;
- public Boolean success;
+ public String actualResult;
+ public Boolean successResult;
public VerifyField() {}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyRuleFired.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyRuleFired.java 2007-10-24 06:34:07 UTC (rev 16039)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyRuleFired.java 2007-10-24 06:48:14 UTC (rev 16040)
@@ -20,12 +20,12 @@
this.expectedFire = expectedFire;
}
- public Boolean success;
- public Integer actual;
+ public Boolean successResult;
+ public Integer actualResult;
public boolean wasSuccessful() {
- return success;
+ return successResult;
}
}
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 06:34:07 UTC (rev 16039)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2007-10-24 06:48:14 UTC (rev 16040)
@@ -53,7 +53,7 @@
final InternalWorkingMemory wm) throws ClassNotFoundException {
this.scenario = scenario;
this.workingMemory = wm;
- scenario.lastRunDate = new Date();
+ scenario.lastRunResult = new Date();
@@ -94,7 +94,7 @@
//love you
long time = System.currentTimeMillis();
wm.fireAllRules(scenario.maxRuleFirings);
- scenario.executionTimeTaken = System.currentTimeMillis() - time;
+ scenario.executionTimeResult = System.currentTimeMillis() - time;
scenario.ruleTrace.firingCounts = listener.firingCounts;
// now check the results...
@@ -110,15 +110,15 @@
}
void verify(VerifyRuleFired assertion, Map<String, Integer> firingCounts) {
- assertion.actual = firingCounts.containsKey(assertion.ruleName) ? firingCounts
+ assertion.actualResult = firingCounts.containsKey(assertion.ruleName) ? firingCounts
.get(assertion.ruleName)
: 0;
if (assertion.expectedFire != null) {
- assertion.success = assertion.expectedFire ? assertion.actual > 0
- : assertion.actual == 0;
+ assertion.successResult = assertion.expectedFire ? assertion.actualResult > 0
+ : assertion.actualResult == 0;
}
if (assertion.expectedCount != null) {
- assertion.success = assertion.actual
+ assertion.successResult = assertion.actualResult
.equals(assertion.expectedCount);
}
}
@@ -140,10 +140,10 @@
Map<String, Object> st = new HashMap<String, Object>();
st.put("__fact__", fact);
st.put("__expected__", fld.expected);
- fld.success = (Boolean) eval("__fact__." + fld.fieldName
+ fld.successResult = (Boolean) eval("__fact__." + fld.fieldName
+ " == __expected__", st);
- if (!fld.success) {
- fld.actual = eval("__fact__." + fld.fieldName, st).toString();
+ if (!fld.successResult) {
+ fld.actualResult = eval("__fact__." + fld.fieldName, st).toString();
}
}
}
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 06:34:07 UTC (rev 16039)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java 2007-10-24 06:48:14 UTC (rev 16040)
@@ -80,7 +80,7 @@
runner.verify(vf);
for (int i = 0; i < vf.fieldValues.length; i++) {
- assertTrue(vf.fieldValues[i].success);
+ assertTrue(vf.fieldValues[i].successResult);
}
vf = new VerifyFact();
@@ -91,7 +91,7 @@
runner.verify(vf);
for (int i = 0; i < vf.fieldValues.length; i++) {
- assertTrue(vf.fieldValues[i].success);
+ assertTrue(vf.fieldValues[i].successResult);
}
// test one false
@@ -101,10 +101,10 @@
new VerifyField("age", "33") };
runner.verify(vf);
- assertFalse(vf.fieldValues[0].success);
- assertTrue(vf.fieldValues[1].success);
+ assertFalse(vf.fieldValues[0].successResult);
+ assertTrue(vf.fieldValues[1].successResult);
- assertEquals("michael", vf.fieldValues[0].actual);
+ assertEquals("michael", vf.fieldValues[0].actualResult);
assertEquals("mark", vf.fieldValues[0].expected);
// test 2 false
@@ -114,13 +114,13 @@
new VerifyField("age", "32") };
runner.verify(vf);
- assertFalse(vf.fieldValues[0].success);
- assertFalse(vf.fieldValues[1].success);
+ assertFalse(vf.fieldValues[0].successResult);
+ assertFalse(vf.fieldValues[1].successResult);
- assertEquals("michael", vf.fieldValues[0].actual);
+ assertEquals("michael", vf.fieldValues[0].actualResult);
assertEquals("mark", vf.fieldValues[0].expected);
- assertEquals("33", vf.fieldValues[1].actual);
+ assertEquals("33", vf.fieldValues[1].actualResult);
assertEquals("32", vf.fieldValues[1].expected);
}
@@ -147,7 +147,7 @@
assertTrue(runner.populatedData.containsKey("c1"));
VerifyFact vf = (VerifyFact) sc.assertions[0];
for (int i = 0; i < vf.fieldValues.length; i++) {
- assertTrue(vf.fieldValues[i].success);
+ assertTrue(vf.fieldValues[i].successResult);
}
}
@@ -165,23 +165,23 @@
v.ruleName = "foo";
v.expectedFire = true;
runner.verify(v, firingCounts);
- assertTrue(v.success);
- assertEquals(2, v.actual.intValue());
+ assertTrue(v.successResult);
+ assertEquals(2, v.actualResult.intValue());
v = new VerifyRuleFired();
v.ruleName = "foo";
v.expectedFire = false;
runner.verify(v, firingCounts);
- assertFalse(v.success);
- assertEquals(2, v.actual.intValue());
+ assertFalse(v.successResult);
+ assertEquals(2, v.actualResult.intValue());
v = new VerifyRuleFired();
v.ruleName = "foo";
v.expectedCount = 2;
runner.verify(v, firingCounts);
- assertTrue(v.success);
- assertEquals(2, v.actual.intValue());
+ assertTrue(v.successResult);
+ assertEquals(2, v.actualResult.intValue());
}
@@ -305,8 +305,8 @@
assertEquals(0, p.getAge());
- assertTrue((new Date()).after(sc.lastRunDate));
- assertTrue(sc.executionTimeTaken != -1);
+ assertTrue((new Date()).after(sc.lastRunResult));
+ assertTrue(sc.executionTimeResult != -1);
}
@@ -354,15 +354,15 @@
assertFalse(sc.wasSuccessful());
VerifyFact vf = (VerifyFact) sc.assertions[1];
- assertFalse(vf.fieldValues[0].success);
+ assertFalse(vf.fieldValues[0].successResult);
assertEquals("XXX", vf.fieldValues[0].expected);
- assertEquals("rule1", vf.fieldValues[0].actual);
+ assertEquals("rule1", vf.fieldValues[0].actualResult);
VerifyRuleFired vr = (VerifyRuleFired) sc.assertions[4];
- assertFalse(vr.success);
+ assertFalse(vr.successResult);
assertEquals(2, vr.expectedCount.intValue());
- assertEquals(1, vr.actual.intValue());
+ assertEquals(1, vr.actualResult.intValue());
}
More information about the jboss-svn-commits
mailing list