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

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

Author: michael.neale at jboss.com
Date: 2007-12-07 02:11:20 -0500 (Fri, 07 Dec 2007)
New Revision: 17081

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-1271 yay testing tool works

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 06:20:26 UTC (rev 17080)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java	2007-12-07 07:11:20 UTC (rev 17081)
@@ -208,10 +208,12 @@
 
 
 			if (!fld.successResult) {
-				fld.actualResult = eval("__fact__." + fld.fieldName, st).toString();
+				Object actual = eval("__fact__." + fld.fieldName, st);
+				fld.actualResult = (actual != null) ? actual.toString() : "";
+
 				if (fld.operator.equals("==")) {
 					fld.explanation = "[" + value.name + "] field [" + fld.fieldName + "] was [" + fld.actualResult
-										+ "] expected [" + fld.actualResult + "].";
+										+ "] expected [" + fld.expected + "].";
 				} else {
 					fld.explanation = "[" + value.name + "] field [" + fld.fieldName + "] was not expected to be [" + fld.actualResult
 					+ "].";

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 06:20:26 UTC (rev 17080)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java	2007-12-07 07:11:20 UTC (rev 17081)
@@ -218,6 +218,26 @@
 
 	}
 
+	public void testVerifyFieldAndActualIsNull() throws Exception {
+		ScenarioRunner runner = new ScenarioRunner(new Scenario(), null,
+				new MockWorkingMemory());
+		Cheese f1 = new Cheese();
+		f1.setType(null);
+		runner.populatedData.put("f1", f1);
+
+		VerifyFact vf = new VerifyFact();
+		vf.name = "f1";
+		vf.fieldValues.add(new VerifyField("type", "boo", "=="));
+
+		runner.verify(vf);
+		VerifyField vfl = (VerifyField) vf.fieldValues.get(0);
+
+		assertEquals("[f1] field [type] was [] expected [boo].", vfl.explanation);
+		assertEquals("boo", vfl.expected);
+		assertEquals("", vfl.actualResult);
+
+	}
+
 	public void testDummyRunNoRules() throws Exception {
 		Scenario sc = new Scenario();
 		FactData[] facts = new FactData[] { new FactData("Cheese", "c1",