[jboss-svn-commits] JBL Code SVN: r12210 - labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue May 29 07:43:25 EDT 2007


Author: michael.neale at jboss.com
Date: 2007-05-29 07:43:25 -0400 (Tue, 29 May 2007)
New Revision: 12210

Added:
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/FieldAssertion.java
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/IAssertion.java
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFilter.java
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFiredAssertion.java
Removed:
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Assertion.java
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Outcome.java
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Rule.java
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/TestSuite.java
Modified:
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Fact.java
   labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Scenario.java
Log:
hacking changes

Deleted: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Assertion.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Assertion.java	2007-05-29 11:01:23 UTC (rev 12209)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Assertion.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -1,64 +0,0 @@
-package org.drools.testing.core.model;
-
-/**
- * 
- * @author Matt
- *
- * (c) Matt Shaw
- */
-public class Assertion {
-
-	private String name;
-	private String beanName;
-	private String propertyName;
-	private String propertyValue;
-	private String expectedValue;
-	private boolean success;
-	
-	public Assertion () {}
-	
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public boolean isSuccess() {
-		return success;
-	}
-	public void setSuccess(boolean success) {
-		this.success = success;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getExpectedValue() {
-		return expectedValue;
-	}
-
-	public void setExpectedValue(String expectedValue) {
-		this.expectedValue = expectedValue;
-	}
-
-	public String getPropertyName() {
-		return propertyName;
-	}
-
-	public void setPropertyName(String propertyName) {
-		this.propertyName = propertyName;
-	}
-
-	public String getPropertyValue() {
-		return propertyValue;
-	}
-
-	public void setPropertyValue(String propertyValue) {
-		this.propertyValue = propertyValue;
-	}
-}

Modified: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Fact.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Fact.java	2007-05-29 11:01:23 UTC (rev 12209)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Fact.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -14,18 +14,20 @@
  */
 public class Fact {
 
-	private Integer id;
+	private String name;
 	private String type;
 	private Collection fields = new ArrayList();
 	
 	public Fact () {}
 	
-	public Integer getId() {
-		return id;
+	public String getName() {
+		return name;
 	}
-	public void setId(Integer id) {
-		this.id = id;
+
+	public void setName(String name) {
+		this.name = name;
 	}
+
 	public String getType() {
 		return type;
 	}

Added: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/FieldAssertion.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/FieldAssertion.java	                        (rev 0)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/FieldAssertion.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -0,0 +1,71 @@
+package org.drools.testing.core.model;
+
+/**
+ * 
+ * @author Matt
+ *
+ * (c) Matt Shaw
+ */
+public class FieldAssertion implements IAssertion {
+
+	private String factName;
+	private String field;
+	
+	private String actualValue;
+
+	private String operator; //could be ==, <, >, <=, >=, !=
+	private String expectedValue;
+	
+	private boolean success;
+	
+	public boolean isSuccess() {
+		return success;
+	}
+
+	public void setSuccess(boolean success) {
+		this.success = success;
+	}
+
+	public FieldAssertion () {}
+
+	public String getFactName() {
+		return factName;
+	}
+
+	public void setFactName(String factName) {
+		this.factName = factName;
+	}
+
+	public String getField() {
+		return field;
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public String getActualValue() {
+		return actualValue;
+	}
+
+	public void setActualValue(String actualValue) {
+		this.actualValue = actualValue;
+	}
+
+	public String getOperator() {
+		return operator;
+	}
+
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
+
+	public String getExpectedValue() {
+		return expectedValue;
+	}
+
+	public void setExpectedValue(String expectedValue) {
+		this.expectedValue = expectedValue;
+	}
+	
+}


Property changes on: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/FieldAssertion.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/IAssertion.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/IAssertion.java	                        (rev 0)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/IAssertion.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -0,0 +1,5 @@
+package org.drools.testing.core.model;
+
+public interface IAssertion {
+
+}


Property changes on: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/IAssertion.java
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Outcome.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Outcome.java	2007-05-29 11:01:23 UTC (rev 12209)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Outcome.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -1,75 +0,0 @@
-package org.drools.testing.core.model;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * 
- * @author Matt
- *
- * (c) Matt Shaw
- */
-public class Outcome {
-
-	private String name;
-	private String state;
-	private Collection rules = new ArrayList();
-	private Collection assertions = new ArrayList();
-	private Collection passedAssertions = new ArrayList();
-	private Collection failedAssertions = new ArrayList();
-	private static final String STATE_PASS = "PASS";
-	private static final String STATE_PARTIAL_PASS = "PARTIAL PASS";
-	private static final String STATE_FAIL = "FAIL";
-	
-	public Outcome () {}
-
-	public Collection getAssertions() {
-		return assertions;
-	}
-
-	public void setAssertions(Collection assertions) {
-		this.assertions = assertions;
-	}
-
-	public Collection getRules() {
-		return rules;
-	}
-
-	public void setRules(Collection rules) {
-		this.rules = rules;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public Collection getFailedAssertions() {
-		return failedAssertions;
-	}
-
-	public void setFailedAssertions(Collection failedAssertions) {
-		this.failedAssertions = failedAssertions;
-	}
-
-	public Collection getPassedAssertions() {
-		return passedAssertions;
-	}
-
-	public void setPassedAssertions(Collection passedAssertions) {
-		this.passedAssertions = passedAssertions;
-	}
-	
-	
-}

Deleted: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Rule.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Rule.java	2007-05-29 11:01:23 UTC (rev 12209)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Rule.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -1,28 +0,0 @@
-package org.drools.testing.core.model;
-
-/**
- * 
- * @author Matt
- *
- * (c) Matt Shaw
- */
-public class Rule {
-
-	private String name;
-	private boolean fire;
-	
-	public Rule () {}
-	
-	public boolean isFire() {
-		return fire;
-	}
-	public void setFire(boolean fire) {
-		this.fire = fire;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-}

Added: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFilter.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFilter.java	                        (rev 0)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFilter.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -0,0 +1,28 @@
+package org.drools.testing.core.model;
+
+/**
+ * 
+ * @author Matt
+ *
+ * (c) Matt Shaw
+ */
+public class RuleFilter {
+
+	private String name;
+	private boolean fire;
+	
+	public RuleFilter () {}
+	
+	public boolean isFire() {
+		return fire;
+	}
+	public void setFire(boolean fire) {
+		this.fire = fire;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+}


Property changes on: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFilter.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFiredAssertion.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFiredAssertion.java	                        (rev 0)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFiredAssertion.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -0,0 +1,14 @@
+package org.drools.testing.core.model;
+
+public class RuleFiredAssertion implements IAssertion {
+
+	private String ruleName;
+	private boolean atLeastOnce = false;
+	private int expectedFiredCount;
+	private int actualFiredCount;
+	private boolean success;
+	
+
+	
+	
+}


Property changes on: labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/RuleFiredAssertion.java
___________________________________________________________________
Name: svn:eol-style
   + native

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-29 11:01:23 UTC (rev 12209)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/Scenario.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -12,34 +12,13 @@
 public class Scenario {
 
 	private Collection facts = new ArrayList();
-	private Collection outcomes = new ArrayList();
-	private Collection rules = new ArrayList();
+	private Collection assertions;
 	
+	private String[] ruleNamesToCheck;
+	
 	public Scenario () {}
 
-	public Collection getFacts() {
-		return facts;
-	}
 
-	public void setFacts(Collection facts) {
-		this.facts = facts;
-	}
-
-	public Collection getOutcomes() {
-		return outcomes;
-	}
-
-	public void setOutcomes(Collection outcomes) {
-		this.outcomes = outcomes;
-	}
-
-	public Collection getRules() {
-		return rules;
-	}
-
-	public void setRules(Collection rules) {
-		this.rules = rules;
-	}
 	
 	
 }

Deleted: 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-29 11:01:23 UTC (rev 12209)
+++ labs/jbossrules/trunk/experimental/drools-testing/src/org/drools/testing/core/model/TestSuite.java	2007-05-29 11:43:25 UTC (rev 12210)
@@ -1,40 +0,0 @@
-package org.drools.testing.core.model;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * 
- * @author Matt
- *
- * This is the test suite model for representation of rules
- * in a testing environment.
- * 
- * A test suite has many test scenarios.
- * 
- * (c) Matt Shaw
- */
-
-public class TestSuite {
-
-	private Collection scenarios = new ArrayList();
-	private String name;
-	
-	public TestSuite () {}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Collection getScenarios() {
-		return scenarios;
-	}
-
-	public void setScenarios(Collection scenarios) {
-		this.scenarios = scenarios;
-	}
-}




More information about the jboss-svn-commits mailing list