[jboss-svn-commits] JBL Code SVN: r12139 - in labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core: model and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 25 08:20:03 EDT 2007
Author: mshaw
Date: 2007-05-25 08:20:03 -0400 (Fri, 25 May 2007)
New Revision: 12139
Modified:
labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/engine/TestRunner.java
labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Scenario.java
labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/TestSuite.java
labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/test/APITester.java
Log:
Modified: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/engine/TestRunner.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/engine/TestRunner.java 2007-05-25 10:48:25 UTC (rev 12138)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/engine/TestRunner.java 2007-05-25 12:20:03 UTC (rev 12139)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Iterator;
import org.apache.commons.beanutils.PropertyUtils;
import org.drools.WorkingMemory;
@@ -67,8 +68,9 @@
*/
private void parseTestSuite () throws RuleTestLanguageException {
- for (int i=0; i<testSuite.getScenarios().length; i++)
- parseScenario(testSuite.getScenarios()[i]);
+ Iterator i = testSuite.getScenarios().iterator();
+ while (i.hasNext())
+ parseScenario( (Scenario) i.next());
}
/**
@@ -96,11 +98,12 @@
* @param wm
* @throws RuleTestLanguageException
*/
- private void parseFacts (Fact[] facts, WorkingMemory wm) throws RuleTestLanguageException {
+ private void parseFacts (Collection facts, WorkingMemory wm) throws RuleTestLanguageException {
// iterating over the facts
- for (int i=0; i<facts.length; i++) {
- Fact factDefn = facts[i];
+ Iterator i = facts.iterator();
+ while (i.hasNext()) {
+ Fact factDefn = (Fact) i.next();
Class classDefn = ObjectUtils.getClassDefn(factDefn.getType(), pkg.getImports(),null);
Object fact;
try {
@@ -132,12 +135,14 @@
* @param wm
* @throws RuleTestLanguageException
*/
- private Collection specifyRulesToFire (Rule[] rules, WorkingMemory wm) throws RuleTestLanguageException {
+ private Collection specifyRulesToFire (Collection rules, WorkingMemory wm) throws RuleTestLanguageException {
Collection items = new ArrayList();
- for (int i=0; i<rules.length; i++) {
- if (rules[i].isFire())
- items.add(rules[i].getName());
+ Iterator i = rules.iterator();
+ while (i.hasNext()) {
+ Rule rule = (Rule) i.next();
+ if (rule.isFire())
+ items.add(rule.getName());
}
return items;
}
Modified: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Scenario.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Scenario.java 2007-05-25 10:48:25 UTC (rev 12138)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Scenario.java 2007-05-25 12:20:03 UTC (rev 12139)
@@ -1,5 +1,7 @@
package org.drools.testing.core.model;
+import java.util.Collection;
+
/**
*
* @author Matt
@@ -8,28 +10,35 @@
*/
public class Scenario {
- public Fact[] facts;
- public Outcome[] outcomes;
- public Rule[] rules;
+ private Collection facts;
+ private Collection outcomes;
+ private Collection rules;
public Scenario () {}
-
- public Fact[] getFacts() {
+
+ public Collection getFacts() {
return facts;
}
- public void setFacts(Fact[] facts) {
+
+ public void setFacts(Collection facts) {
this.facts = facts;
}
- public Outcome[] getOutcomes() {
+
+ public Collection getOutcomes() {
return outcomes;
}
- public void setOutcomes(Outcome[] outcomes) {
+
+ public void setOutcomes(Collection outcomes) {
this.outcomes = outcomes;
}
- public Rule[] getRules() {
+
+ public Collection getRules() {
return rules;
}
- public void setRules(Rule[] rules) {
+
+ public void setRules(Collection rules) {
this.rules = rules;
}
+
+
}
Modified: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/TestSuite.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/TestSuite.java 2007-05-25 10:48:25 UTC (rev 12138)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/TestSuite.java 2007-05-25 12:20:03 UTC (rev 12139)
@@ -1,5 +1,8 @@
package org.drools.testing.core.model;
+import java.util.ArrayList;
+import java.util.Collection;
+
/**
*
* @author Matt
@@ -14,19 +17,11 @@
public class TestSuite {
- private Scenario[] scenarios;
+ private Collection scenarios = new ArrayList();
private String name;
public TestSuite () {}
- public Scenario[] getScenarios() {
- return scenarios;
- }
-
- public void setScenarios(Scenario[] scenarios) {
- this.scenarios = scenarios;
- }
-
public String getName() {
return name;
}
@@ -34,4 +29,12 @@
public void setName(String name) {
this.name = name;
}
+
+ public Collection getScenarios() {
+ return scenarios;
+ }
+
+ public void setScenarios(Collection scenarios) {
+ this.scenarios = scenarios;
+ }
}
Modified: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/test/APITester.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/test/APITester.java 2007-05-25 10:48:25 UTC (rev 12138)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/test/APITester.java 2007-05-25 12:20:03 UTC (rev 12139)
@@ -1,5 +1,7 @@
package org.drools.testing.core.test;
+import org.drools.testing.core.model.Rule;
+import org.drools.testing.core.model.Scenario;
import org.drools.testing.core.model.TestSuite;
import org.drools.testing.core.utils.OperatorUtils;
@@ -7,9 +9,25 @@
public class APITester extends TestCase {
+ TestSuite testSuite;
+
public void testMockTestSuite () {
- TestSuite testSuite = new TestSuite();
+ testSuite = new TestSuite();
}
+
+ private void addScenario () {
+
+ Scenario scenario = new Scenario();
+ addRule("testrule1");
+ }
+
+ private Rule addRule (String name) {
+
+ Rule rule = new Rule();
+ rule.setName(name);
+ rule.setFire(true);
+ return rule;
+ }
}
More information about the jboss-svn-commits
mailing list