[jboss-svn-commits] JBL Code SVN: r12524 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/brms/server/util and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 12 22:46:40 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-06-12 22:46:39 -0400 (Tue, 12 Jun 2007)
New Revision: 12524
Added:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertLogicalFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionUpdateField.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/InsertedObject.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Insert_Retract_Noloop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LockOnActiveWithUpdate.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionWithExists.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertions.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertions2.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsAccumulatorPattern.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsBacking.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsDynamicRule.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsDynamicRule2.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsLoop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNoLoop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNot.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNotPingPong.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsSelfreferencing.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsUpdateEqual.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsWithUpdate.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_UpdateActivationCreationNoLoop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_UpdateNoloop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_logicalInsertions3.drl
Removed:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertLogicalFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionModifyField.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Assert_Retract_Noloop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LockOnActiveWithModify.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionWithExists.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions2.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsAccumulatorPattern.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsBacking.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsLoop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsModifyEqual.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNoLoop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNot.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNotPingPong.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsSelfreferencing.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsWithModify.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyActivationCreationNoLoop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyNoloop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_logicalAssertions3.drl
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRXMLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixerTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/assert_retract.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/evalmodify.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/no-loop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_DynamicRules.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_DynamicRules2.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FactBindings.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FireRuleAfterDuration.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_JoinNodeModifyObject.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_JoinNodeModifyTuple.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Query.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_QueryWithParams.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_RemovePackage.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_RetractModifyWithFunction.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Serializable.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/waltz/waltz.drl
Log:
JBRULES-922 API change for assert and modify
Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertFact.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertFact.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,20 +0,0 @@
-package org.drools.brms.client.modeldriven.brxml;
-
-/**
- * This is used when asserting a new fact.
- * @author Michael Neale
- *
- */
-public class ActionAssertFact extends ActionFieldList {
-
-
- public String factType;
-
- public ActionAssertFact(final String type) {
- this.factType = type;
- }
-
- public ActionAssertFact() {
- }
-
-}
Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertLogicalFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertLogicalFact.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertLogicalFact.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,18 +0,0 @@
-package org.drools.brms.client.modeldriven.brxml;
-
-/**
- * Logical assertions are used as part of "truth maintenance".
- *
- * @author Michael Neale
- */
-public class ActionAssertLogicalFact extends ActionAssertFact {
-
- public ActionAssertLogicalFact(final String fact) {
- super( fact );
- }
-
- public ActionAssertLogicalFact() {
- super();
- }
-
-}
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertFact.java (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertFact.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertFact.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertFact.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,20 @@
+package org.drools.brms.client.modeldriven.brxml;
+
+/**
+ * This is used when asserting a new fact.
+ * @author Michael Neale
+ *
+ */
+public class ActionInsertFact extends ActionFieldList {
+
+
+ public String factType;
+
+ public ActionInsertFact(final String type) {
+ this.factType = type;
+ }
+
+ public ActionInsertFact() {
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertLogicalFact.java (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertLogicalFact.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertLogicalFact.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertLogicalFact.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,18 @@
+package org.drools.brms.client.modeldriven.brxml;
+
+/**
+ * Logical assertions are used as part of "truth maintenance".
+ *
+ * @author Michael Neale
+ */
+public class ActionInsertLogicalFact extends ActionInsertFact {
+
+ public ActionInsertLogicalFact(final String fact) {
+ super( fact );
+ }
+
+ public ActionInsertLogicalFact() {
+ super();
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionModifyField.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionModifyField.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionModifyField.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,21 +0,0 @@
-package org.drools.brms.client.modeldriven.brxml;
-
-/**
- * Basically the same as setting fields, EXCEPT that
- * it will notify the engine of the changes.
- * This only applies to bound fact variables from the LHS.
- *
- * @author Michael Neale
- */
-public class ActionModifyField extends ActionSetField {
-
- public ActionModifyField(final String itemText) {
- super( itemText );
- }
-
- public ActionModifyField() {
- super();
- }
-
-
-}
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionUpdateField.java (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionModifyField.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionUpdateField.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionUpdateField.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,21 @@
+package org.drools.brms.client.modeldriven.brxml;
+
+/**
+ * Basically the same as setting fields, EXCEPT that
+ * it will notify the engine of the changes.
+ * This only applies to bound fact variables from the LHS.
+ *
+ * @author Michael Neale
+ */
+public class ActionUpdateField extends ActionSetField {
+
+ public ActionUpdateField(final String itemText) {
+ super( itemText );
+ }
+
+ public ActionUpdateField() {
+ super();
+ }
+
+
+}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,10 +1,10 @@
package org.drools.brms.server.util;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertLogicalFact;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertLogicalFact;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionModifyField;
+import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
import org.drools.brms.client.modeldriven.brxml.ActionSetField;
import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
@@ -305,17 +305,17 @@
buf = b;
}
- public void visitActionAssertFact(final ActionAssertFact action) {
+ public void visitActionAssertFact(final ActionInsertFact action) {
this.generateAssertCall( action,
false );
}
- public void visitActionAssertLogicalFact(final ActionAssertLogicalFact action) {
+ public void visitActionAssertLogicalFact(final ActionInsertLogicalFact action) {
this.generateAssertCall( action,
false );
}
- private void generateAssertCall(final ActionAssertFact action,
+ private void generateAssertCall(final ActionInsertFact action,
final boolean isLogic) {
buf.append( "\t\t" );
if( isDSLEnhanced ) {
@@ -344,7 +344,7 @@
}
}
- public void visitActionModifyField(final ActionModifyField action) {
+ public void visitActionModifyField(final ActionUpdateField action) {
this.visitActionSetField( action );
buf.append( "\t\t" );
if( isDSLEnhanced ) {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRXMLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRXMLPersistence.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRXMLPersistence.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,9 +1,9 @@
package org.drools.brms.server.util;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertLogicalFact;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertLogicalFact;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionModifyField;
+import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
import org.drools.brms.client.modeldriven.brxml.ActionSetField;
import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
@@ -40,9 +40,9 @@
this.xt.alias( "retract",
ActionRetractFact.class );
this.xt.alias( "assert",
- ActionAssertFact.class );
+ ActionInsertFact.class );
this.xt.alias( "modify",
- ActionModifyField.class );
+ ActionUpdateField.class );
this.xt.alias( "setField",
ActionSetField.class );
this.xt.alias( "dslSentence",
@@ -63,7 +63,7 @@
CompositeFieldConstraint.class );
this.xt.alias( "assertLogical",
- ActionAssertLogicalFact.class );
+ ActionInsertLogicalFact.class );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -22,11 +22,11 @@
public class KnowledgeHelperFixer {
static String KNOWLEDGE_HELPER_PFX = ""; //could also be: "drools\\." for "classic" mode.
- static Pattern MODIFY = Pattern.compile( "(.*)\\b" + KnowledgeHelperFixer.KNOWLEDGE_HELPER_PFX + "modify\\s*\\(([^)]+)\\)(\\s*;.*)",
+ static Pattern UPDATE = Pattern.compile( "(.*)\\b" + KnowledgeHelperFixer.KNOWLEDGE_HELPER_PFX + "update\\s*\\(([^)]+)\\)(\\s*;.*)",
Pattern.DOTALL );
- static Pattern ASSERT = Pattern.compile( "(.*)\\b" + KnowledgeHelperFixer.KNOWLEDGE_HELPER_PFX + "assert\\s*\\((.*)\\)(\\s*;.*)",
+ static Pattern INSERT = Pattern.compile( "(.*)\\b" + KnowledgeHelperFixer.KNOWLEDGE_HELPER_PFX + "insert\\s*\\((.*)\\)(\\s*;.*)",
Pattern.DOTALL );
- static Pattern ASSERT_LOGICAL = Pattern.compile( "(.*)\\b" + KnowledgeHelperFixer.KNOWLEDGE_HELPER_PFX + "assertLogical\\s*\\((.*)\\)(\\s*;.*)",
+ static Pattern INSERT_LOGICAL = Pattern.compile( "(.*)\\b" + KnowledgeHelperFixer.KNOWLEDGE_HELPER_PFX + "insertLogical\\s*\\((.*)\\)(\\s*;.*)",
Pattern.DOTALL );
static Pattern RETRACT = Pattern.compile( "(.*)\\b" + KnowledgeHelperFixer.KNOWLEDGE_HELPER_PFX + "retract\\s*\\((.+)\\)(\\s*;.*)",
Pattern.DOTALL );
@@ -44,11 +44,11 @@
*/
public String fix(final String raw) {
String result = fix( raw,
- ModifyReplacer.INSTANCE );
+ UpdateReplacer.INSTANCE );
result = fix( result,
- AssertReplacer.INSTANCE );
+ InsertReplacer.INSTANCE );
result = fix( result,
- AssertLogicalReplacer.INSTANCE );
+ InsertLogicalReplacer.INSTANCE );
result = fix( result,
RetractReplacer.INSTANCE );
return result;
@@ -104,50 +104,50 @@
String getReplacement(String guts);
}
- static class AssertReplacer
+ static class InsertReplacer
implements
Replacer {
- static Replacer INSTANCE = new AssertReplacer();
+ static Replacer INSTANCE = new InsertReplacer();
public Pattern getPattern() {
- return KnowledgeHelperFixer.ASSERT;
+ return KnowledgeHelperFixer.INSERT;
}
public String getReplacement(final String guts) {
- return "drools.assertObject(" + guts + ")";
+ return "drools.insert(" + guts + ")";
}
}
- static class AssertLogicalReplacer
+ static class InsertLogicalReplacer
implements
Replacer {
- static Replacer INSTANCE = new AssertLogicalReplacer();
+ static Replacer INSTANCE = new InsertLogicalReplacer();
public Pattern getPattern() {
- return KnowledgeHelperFixer.ASSERT_LOGICAL;
+ return KnowledgeHelperFixer.INSERT_LOGICAL;
}
public String getReplacement(final String guts) {
- return "drools.assertLogicalObject(" + guts + ")";
+ return "drools.insertLogical(" + guts + ")";
}
}
- static class ModifyReplacer
+ static class UpdateReplacer
implements
Replacer {
- static Replacer INSTANCE = new ModifyReplacer();
+ static Replacer INSTANCE = new UpdateReplacer();
public Pattern getPattern() {
- return KnowledgeHelperFixer.MODIFY;
+ return KnowledgeHelperFixer.UPDATE;
}
public String getReplacement(final String guts) {
- return "drools.modifyObject( " + guts + " )";
+ return "drools.update( " + guts + " )";
}
}
@@ -163,7 +163,7 @@
}
public String getReplacement(final String guts) {
- return "drools.retractObject( " + guts.trim() + " )";
+ return "drools.retract( " + guts.trim() + " )";
}
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -141,7 +141,7 @@
public int doAfter(Object value,
ASTNode node,
VariableResolverFactory factory) {
- ((DroolsMVELFactory) factory).getWorkingMemory().assertObject( value );
+ ((DroolsMVELFactory) factory).getWorkingMemory().insert( value );
return 0;
}
}
@@ -162,7 +162,7 @@
ASTNode node,
VariableResolverFactory factory) {
FactHandle handle = ((DroolsMVELFactory) factory).getWorkingMemory().getFactHandle( value );
- ((DroolsMVELFactory) factory).getWorkingMemory().modifyAssert( handle, value, null, null );
+ ((DroolsMVELFactory) factory).getWorkingMemory().modifyInsert( handle, value, null, null );
return 0;
}
}
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,41 +0,0 @@
-package org.drools;
-
-public class AssertedObject {
- private String value;
-
- public String getValue() {
- return this.value;
- }
-
- public void setValue(final String value) {
- this.value = value;
- }
-
- public AssertedObject(final String value) {
- this.value = value;
- }
-
- public AssertedObject() {
- }
-
- public int hashCode() {
- final int PRIME = 31;
- int result = 1;
- result = PRIME * result + ((value == null) ? 0 : value.hashCode());
- return result;
- }
-
- public boolean equals(Object obj) {
- if ( this == obj ) return true;
- if ( obj == null ) return false;
- if ( getClass() != obj.getClass() ) return false;
- final AssertedObject other = (AssertedObject) obj;
- if ( value == null ) {
- if ( other.value != null ) return false;
- } else if ( !value.equals( other.value ) ) return false;
- return true;
- }
-
-
-
-}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/InsertedObject.java (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/InsertedObject.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/InsertedObject.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,41 @@
+package org.drools;
+
+public class InsertedObject {
+ private String value;
+
+ public String getValue() {
+ return this.value;
+ }
+
+ public void setValue(final String value) {
+ this.value = value;
+ }
+
+ public InsertedObject(final String value) {
+ this.value = value;
+ }
+
+ public InsertedObject() {
+ }
+
+ public int hashCode() {
+ final int PRIME = 31;
+ int result = 1;
+ result = PRIME * result + ((value == null) ? 0 : value.hashCode());
+ return result;
+ }
+
+ public boolean equals(Object obj) {
+ if ( this == obj ) return true;
+ if ( obj == null ) return false;
+ if ( getClass() != obj.getClass() ) return false;
+ final InsertedObject other = (InsertedObject) obj;
+ if ( value == null ) {
+ if ( other.value != null ) return false;
+ } else if ( !value.equals( other.value ) ) return false;
+ return true;
+ }
+
+
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -3,9 +3,9 @@
import junit.framework.TestCase;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionModifyField;
+import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
@@ -45,7 +45,7 @@
m.addAttribute( new RuleAttribute( "no-loop",
"true" ) );
- m.addRhsItem( new ActionAssertFact( "Report" ) );
+ m.addRhsItem( new ActionInsertFact( "Report" ) );
m.name = "my rule";
final String drl = p.marshal( m );
@@ -159,7 +159,7 @@
comp.addFactPattern( new FactPattern( "Cancel" ) );
m.addLhsItem( comp );
- final ActionModifyField set = new ActionModifyField();
+ final ActionUpdateField set = new ActionUpdateField();
set.variable = "p1";
set.addFieldValue( new ActionFieldValue( "status",
"rejected",
@@ -248,7 +248,7 @@
p.addConstraint( Z );
- ActionAssertFact ass = new ActionAssertFact("Whee");
+ ActionInsertFact ass = new ActionInsertFact("Whee");
m.addRhsItem( ass );
String actual = BRDRLPersistence.getInstance().marshal( m );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -9,9 +9,9 @@
import junit.framework.TestCase;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
+import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionModifyField;
+import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
@@ -44,7 +44,7 @@
m.addAttribute( new RuleAttribute( "no-loop",
"true" ) );
- m.addRhsItem( new ActionAssertFact( "Report" ) );
+ m.addRhsItem( new ActionInsertFact( "Report" ) );
m.name = "my rule";
final String xml = p.marshal( m );
//System.out.println(xml);
@@ -158,7 +158,7 @@
p.addConstraint( Z );
- ActionAssertFact ass = new ActionAssertFact("Whee");
+ ActionInsertFact ass = new ActionInsertFact("Whee");
m.addRhsItem( ass );
@@ -232,7 +232,7 @@
comp.addFactPattern( new FactPattern( "Cancel" ) );
m.addLhsItem( comp );
- final ActionModifyField set = new ActionModifyField();
+ final ActionUpdateField set = new ActionUpdateField();
set.variable = "p1";
set.addFieldValue( new ActionFieldValue( "status",
"rejected",
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -44,6 +44,7 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.WorkingMemory;
+import org.drools.base.DefaultKnowledgeHelper;
import org.drools.common.ActivationGroupNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.LogicalDependency;
@@ -123,7 +124,7 @@
pattern.addConstraint( returnValue );
// There is no m this should produce errors.
- ruleDescr.setConsequence( "modify(m);" );
+ ruleDescr.setConsequence( "update(m);" );
builder.addPackage( packageDescr );
@@ -175,8 +176,9 @@
rule.getLhs(),
tuple );
- KnowledgeHelper knowledgeHelper = new org.drools.base.DefaultKnowledgeHelper( activation,
- workingMemory );
+ DefaultKnowledgeHelper knowledgeHelper = new org.drools.base.DefaultKnowledgeHelper( workingMemory );
+ knowledgeHelper.setActivation( activation );
+
rule.getConsequence().evaluate( knowledgeHelper,
workingMemory );
assertEquals( new Integer( 1 ),
@@ -193,8 +195,9 @@
rule = pkg.getRule( "rule-1" );
- knowledgeHelper = new org.drools.base.DefaultKnowledgeHelper( activation,
- workingMemory );
+ knowledgeHelper = new org.drools.base.DefaultKnowledgeHelper( workingMemory );
+ knowledgeHelper.setActivation( activation );
+
rule.getConsequence().evaluate( knowledgeHelper,
workingMemory );
assertEquals( new Integer( 2 ),
@@ -254,8 +257,9 @@
newRule.getLhs(),
tuple );
- final KnowledgeHelper knowledgeHelper = new org.drools.base.DefaultKnowledgeHelper( activation,
- workingMemory );
+ final DefaultKnowledgeHelper knowledgeHelper = new org.drools.base.DefaultKnowledgeHelper( workingMemory );
+ knowledgeHelper.setActivation( activation );
+
newRule.getConsequence().evaluate( knowledgeHelper,
workingMemory );
assertEquals( new Integer( 1 ),
@@ -363,7 +367,7 @@
"stilton" );
stilton.setFieldValue( "price",
new Integer( 200 ) );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
}
@@ -388,7 +392,7 @@
pattern.addConstraint( literalDescr );
- ruleDescr.setConsequence( "modify(stilton);" );
+ ruleDescr.setConsequence( "update(stilton);" );
builder.addPackage( packageDescr );
@@ -426,7 +430,7 @@
pattern.addConstraint( returnValue );
- ruleDescr.setConsequence( "modify(stilton);" );
+ ruleDescr.setConsequence( "update(stilton);" );
builder.addPackage( packageDescr );
@@ -494,7 +498,7 @@
final PredicateDescr predicate = new PredicateDescr( "( ( Integer )map.get( new Integer(x) ) ).intValue() == y" );
pattern.addConstraint( predicate );
- ruleDescr.setConsequence( "modify(stilton);" );
+ ruleDescr.setConsequence( "update(stilton);" );
builder.addPackage( packageDescr );
@@ -560,7 +564,7 @@
final EvalDescr evalDescr = new EvalDescr( "( ( Integer )map.get( new Integer(x) ) ).intValue() == y" );
lhs.addDescr( evalDescr );
- ruleDescr.setConsequence( "modify(stilton);" );
+ ruleDescr.setConsequence( "update(stilton);" );
builder.addPackage( packageDescr );
@@ -606,7 +610,7 @@
final PackageBuilder builder = new PackageBuilder();
final Rule rule = createRule( new OrDescr(),
builder,
- "modify(stilton);" );
+ "update(stilton);" );
assertLength( 0,
builder.getErrors().getErrors() );
@@ -626,7 +630,7 @@
final PackageBuilder builder = new PackageBuilder();
final Rule rule = createRule( new AndDescr(),
builder,
- "modify(stilton);" );
+ "update(stilton);" );
assertLength( 0,
builder.getErrors().getErrors() );
@@ -648,7 +652,7 @@
// Make sure we can't accessa variable bound inside the not node
Rule rule = createRule( new NotDescr(),
builder,
- "modify(stilton);" );
+ "update(stilton);" );
assertEquals( 1,
builder.getErrors().getErrors().length );
@@ -677,7 +681,7 @@
// Make sure we can't accessa variable bound inside the not node
Rule rule = createRule( new ExistsDescr(),
builder,
- "modify(stilton);" );
+ "update(stilton);" );
assertEquals( 1,
builder.getErrors().getErrors().length );
@@ -869,7 +873,7 @@
pattern.addConstraint( literalDescr );
- queryDescr.setConsequence( "modify(stilton);" );
+ queryDescr.setConsequence( "update(stilton);" );
builder.addPackage( packageDescr );
@@ -881,7 +885,7 @@
StatefulSession session = ruleBase.newStatefulSession();
- session.assertObject( new Cheese( "stilton", 15) );
+ session.insert( new Cheese( "stilton", 15) );
QueryResults results = session.getQueryResults( "query1", new Object[] { "stilton" } );
assertEquals( 1, results.size() );
@@ -978,7 +982,7 @@
lhs.addDescr( pattern2 );
pattern2.addConstraint( fieldBindingDescr );
- ruleDescr.setConsequence( "modify(stilton);" );
+ ruleDescr.setConsequence( "update(stilton);" );
builder.addPackage( packageDescr );
@@ -1046,7 +1050,7 @@
pattern.addConstraint( returnValue );
- ruleDescr.setConsequence( "modify(stilton);" );
+ ruleDescr.setConsequence( "update(stilton);" );
}
private void createPredicateRule(final PackageDescr packageDescr,
@@ -1075,7 +1079,7 @@
final PredicateDescr predicate = new PredicateDescr( expression );
pattern.addConstraint( predicate );
- ruleDescr.setConsequence( "modify(stilton);" );
+ ruleDescr.setConsequence( "update(stilton);" );
}
private void createEvalRule(final PackageDescr packageDescr,
@@ -1191,11 +1195,6 @@
assertTrue(flows.containsKey( "0" ));
p = (Process) flows.get( "0" );
assertTrue( p instanceof RuleFlowProcessImpl );
-
-
-
-
-
}
public void testPackageRuleFlows() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -54,9 +54,9 @@
ruleBase.addPackage( pkg );
final WorkingMemory wm = ruleBase.newStatefulSession();
- wm.assertObject( new Person( "Bob",
+ wm.insert( new Person( "Bob",
"http://foo.bar" ) );
- wm.assertObject( new Cheese( "stilton",
+ wm.insert( new Cheese( "stilton",
42 ) );
final List messages = new ArrayList();
@@ -93,8 +93,8 @@
ruleBase.addPackage( pkg );
final WorkingMemory wm = ruleBase.newStatefulSession();
- wm.assertObject( new Person( "rage" ) );
- wm.assertObject( new Cheese( "cheddar",
+ wm.insert( new Person( "rage" ) );
+ wm.insert( new Cheese( "cheddar",
15 ) );
final List messages = new ArrayList();
@@ -106,14 +106,14 @@
assertEquals( 0,
messages.size() );
- wm.assertObject( new Person( "fire" ) );
+ wm.insert( new Person( "fire" ) );
wm.fireAllRules();
// still no firings
assertEquals( 0,
messages.size() );
- wm.assertObject( new Cheese( "brie",
+ wm.insert( new Cheese( "brie",
15 ) );
wm.fireAllRules();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -57,15 +57,15 @@
final PersonInterface bob = new Person( "bob",
"stilton" );
bob.setStatus( "Not evaluated" );
- workingMemory.assertObject( bob );
+ workingMemory.insert( bob );
final Cheese stilton = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
final Cheese cheddar = new Cheese( "cheddar",
5 );
- workingMemory.assertObject( cheddar );
+ workingMemory.insert( cheddar );
workingMemory.fireAllRules();
assertEquals( 1,
@@ -156,23 +156,23 @@
final PersonInterface bob = new Person( "bob",
"stilton" );
bob.setStatus( "Not evaluated" );
- workingMemory.assertObject( bob );
+ workingMemory.insert( bob );
final Cheese stilton1 = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton1 );
+ workingMemory.insert( stilton1 );
final Cheese stilton2 = new Cheese( "stilton",
3 );
- workingMemory.assertObject( stilton2 );
+ workingMemory.insert( stilton2 );
final Cheese stilton3 = new Cheese( "stilton",
1 );
- workingMemory.assertObject( stilton3 );
+ workingMemory.insert( stilton3 );
final Cheese cheddar = new Cheese( "cheddar",
5 );
- workingMemory.assertObject( cheddar );
+ workingMemory.insert( cheddar );
assertEquals( 11,
workingMemory.getAgenda().getActivations().length );
@@ -187,7 +187,7 @@
final Cheese muzzarela = new Cheese( "muzzarela",
5 );
- workingMemory.assertObject( muzzarela );
+ workingMemory.insert( muzzarela );
assertEquals( 4,
workingMemory.getAgenda().getActivations().length );
@@ -278,7 +278,7 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
@@ -291,7 +291,7 @@
final Cheese cheddar = new Cheese( "cheddar",
5 );
- workingMemory.assertObject( cheddar );
+ workingMemory.insert( cheddar );
try {
workingMemory.fireAllRules();
@@ -307,7 +307,7 @@
final Cheese brie = new Cheese( "brie",
5 );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -321,7 +321,7 @@
final Cheese feta = new Cheese( "feta",
5 );
- workingMemory.assertObject( feta );
+ workingMemory.insert( feta );
workingMemory.fireAllRules();
@@ -339,7 +339,7 @@
final WorkingMemory workingMemory = ruleBase.newStatefulSession();
- workingMemory.assertObject( new Precondition( "genericcode",
+ workingMemory.insert( new Precondition( "genericcode",
"genericvalue" ) );
workingMemory.fireAllRules();
@@ -366,9 +366,9 @@
15 );
final Cheese c = new Cheese( "stilton",
20 );
- workingMemory.assertObject( a );
- workingMemory.assertObject( b );
- workingMemory.assertObject( c );
+ workingMemory.insert( a );
+ workingMemory.insert( b );
+ workingMemory.insert( c );
final PackageBuilder builder = new PackageBuilder();
builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_DynamicRules.drl" ) ) );
@@ -389,8 +389,8 @@
final FactB b = new FactB( "hello",
new Integer( 2 ),
new Float( 6.28 ) );
- workingMemory.assertObject( a );
- workingMemory.assertObject( b );
+ workingMemory.insert( a );
+ workingMemory.insert( b );
final PackageBuilder builder = new PackageBuilder();
builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_DynamicRules2.drl" ) ) );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -64,7 +64,7 @@
final PersonInterface person = new Person( "Edson",
"cheese" );
- workingMemory.assertObject( person );
+ workingMemory.insert( person );
workingMemory.fireAllRules();
@@ -95,12 +95,12 @@
final PersonInterface person10 = new Person( "bob",
"cheese",
10);
- workingMemory.assertObject( person10 );
+ workingMemory.insert( person10 );
final PersonInterface person20 = new Person( "mic",
"cheese",
20);
- workingMemory.assertObject( person20 );
+ workingMemory.insert( person20 );
workingMemory.fireAllRules();
@@ -130,7 +130,7 @@
final Cheese brie = new Cheese( "brie",
12 );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -156,7 +156,7 @@
// AgendaGroup "group1" is not active, so should receive activation
final Cheese brie12 = new Cheese( "brie",
12 );
- workingMemory.assertObject( brie12 );
+ workingMemory.insert( brie12 );
final AgendaGroup group1 = workingMemory.getAgenda().getAgendaGroup( "group1" );
assertEquals( 1,
group1.size() );
@@ -165,13 +165,13 @@
// AgendaqGroup "group1" is now active, so should not receive activations
final Cheese brie10 = new Cheese( "brie",
10 );
- workingMemory.assertObject( brie10 );
+ workingMemory.insert( brie10 );
assertEquals( 1,
group1.size() );
final Cheese cheddar20 = new Cheese( "cheddar",
20 );
- workingMemory.assertObject( cheddar20 );
+ workingMemory.insert( cheddar20 );
final AgendaGroup group2 = workingMemory.getAgenda().getAgendaGroup( "group1" );
assertEquals( 1,
group2.size() );
@@ -180,14 +180,14 @@
rfg.setActive( true );
final Cheese cheddar17 = new Cheese( "cheddar",
17 );
- workingMemory.assertObject( cheddar17 );
+ workingMemory.insert( cheddar17 );
assertEquals( 1,
group2.size() );
}
public void testLockOnActiveWithModify() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LockOnActiveWithModify.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LockOnActiveWithUpdate.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -210,10 +210,10 @@
final Person mark = new Person( "mark" );
mark.setCheese( brie );
- final FactHandle brieHandle = wm.assertObject( brie );
- wm.assertObject( bob );
- wm.assertObject( mic );
- wm.assertObject( mark );
+ final FactHandle brieHandle = wm.insert( brie );
+ wm.insert( bob );
+ wm.insert( mic );
+ wm.insert( mark );
final DefaultAgenda agenda = (DefaultAgenda) wm.getAgenda();
final AgendaGroup group1 = agenda.getAgendaGroup( "group1" );
@@ -223,7 +223,7 @@
agenda.fireNextItem( null );
assertEquals( 2,
group1.size() );
- wm.modifyObject( brieHandle,
+ wm.update( brieHandle,
brie );
assertEquals( 2,
group1.size() );
@@ -239,7 +239,7 @@
agenda.fireNextItem( null );
assertEquals( 2,
rfg.size() );
- wm.modifyObject( brieHandle,
+ wm.update( brieHandle,
brie );
assertEquals( 2,
group2.size() );
@@ -260,7 +260,7 @@
final Cheese brie = new Cheese( "brie",
12 );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -306,7 +306,7 @@
final Cheese brie = new Cheese( "brie",
12 );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
final ActivationGroup activationGroup0 = workingMemory.getAgenda().getActivationGroup( "activation-group-0" );
assertEquals( 2,
@@ -359,7 +359,7 @@
final Cheese brie = new Cheese( "brie",
12 );
- final FactHandle brieHandle = workingMemory.assertObject( brie );
+ final FactHandle brieHandle = workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -376,13 +376,13 @@
}
- public void testAssertRetractNoloop() throws Exception {
+ public void testInsertRetractNoloop() throws Exception {
// read in the source
- final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_Assert_Retract_Noloop.drl" ) );
+ final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_Insert_Retract_Noloop.drl" ) );
final RuleBase ruleBase = loadRuleBase( reader );
final WorkingMemory wm = ruleBase.newStatefulSession();
- wm.assertObject( new Cheese( "stilton",
+ wm.insert( new Cheese( "stilton",
15 ) );
wm.fireAllRules();
@@ -403,7 +403,7 @@
final Cheese brie = new Cheese( "brie",
12 );
- final FactHandle brieHandle = workingMemory.assertObject( brie );
+ final FactHandle brieHandle = workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -434,7 +434,7 @@
final Cheese brie = new Cheese( "brie",
12 );
- final FactHandle brieHandle = workingMemory.assertObject( brie );
+ final FactHandle brieHandle = workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -453,21 +453,21 @@
}
- public void testModifyNoLoop() throws Exception {
+ public void testUpdateNoLoop() throws Exception {
// JBRULES-780, throws a NullPointer or infinite loop if there is an issue
- final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_ModifyNoloop.drl" ) );
+ final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_UpdateNoloop.drl" ) );
final RuleBase ruleBase = loadRuleBase( reader );
final WorkingMemory wm = ruleBase.newStatefulSession();
- wm.assertObject( new Cheese( "stilton",
+ wm.insert( new Cheese( "stilton",
15 ) );
wm.fireAllRules();
}
- public void testModifyActivationCreationNoLoop() throws Exception {
- // JBRULES-787, no-loop blocks all dependant tuples for modify
- final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_ModifyActivationCreationNoLoop.drl" ) );
+ public void testUpdateActivationCreationNoLoop() throws Exception {
+ // JBRULES-787, no-loop blocks all dependant tuples for update
+ final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_UpdateActivationCreationNoLoop.drl" ) );
final RuleBase ruleBase = loadRuleBase( reader );
final InternalWorkingMemoryActions wm = (InternalWorkingMemoryActions) ruleBase.newStatefulSession();
@@ -490,19 +490,19 @@
final Cheese stilton = new Cheese( "stilton",
15 );
- final FactHandle stiltonHandle = wm.assertObject( stilton );
+ final FactHandle stiltonHandle = wm.insert( stilton );
final Person p1 = new Person( "p1" );
p1.setCheese( stilton );
- wm.assertObject( p1 );
+ wm.insert( p1 );
final Person p2 = new Person( "p2" );
p2.setCheese( stilton );
- wm.assertObject( p2 );
+ wm.insert( p2 );
final Person p3 = new Person( "p3" );
p3.setCheese( stilton );
- wm.assertObject( p3 );
+ wm.insert( p3 );
assertEquals( 3,
created.size() );
@@ -512,7 +512,7 @@
final Activation item = ((ActivationCreatedEvent) created.get( 2 )).getActivation();
// simulate a modify inside a consequence
- wm.modifyObject( stiltonHandle,
+ wm.update( stiltonHandle,
stilton,
item.getRule(),
item );
@@ -537,7 +537,7 @@
workingMemory.setGlobal( "list",
list );
- workingMemory.assertObject( "Test" );
+ workingMemory.insert( "Test" );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
@@ -657,7 +657,7 @@
// go !
final Message message = new Message( "hola" );
- workingMemory.assertObject( message );
+ workingMemory.insert( message );
workingMemory.fireAllRules();
assertFalse( message.isFired() );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -63,9 +63,9 @@
final FactHandle[] cheeseHandles = new FactHandle[cheese.length];
for ( int i = 0; i < cheese.length; i++ ) {
- cheeseHandles[i] = wm.assertObject( cheese[i] );
+ cheeseHandles[i] = wm.insert( cheese[i] );
}
- final FactHandle bobHandle = wm.assertObject( bob );
+ final FactHandle bobHandle = wm.insert( bob );
// ---------------- 1st scenario
wm.fireAllRules();
@@ -76,7 +76,7 @@
// ---------------- 2nd scenario
final int index = 1;
cheese[index].setPrice( 9 );
- wm.modifyObject( cheeseHandles[index],
+ wm.update( cheeseHandles[index],
cheese[index] );
wm.fireAllRules();
@@ -88,7 +88,7 @@
// ---------------- 3rd scenario
bob.setLikes( "brie" );
- wm.modifyObject( bobHandle,
+ wm.update( bobHandle,
bob );
wm.fireAllRules();
@@ -99,7 +99,7 @@
((Cheesery) results.get( results.size() - 1 )).getTotalAmount() );
// ---------------- 4th scenario
- wm.retractObject( cheeseHandles[3] );
+ wm.retract( cheeseHandles[3] );
wm.fireAllRules();
// should not have fired as per constraint
@@ -120,21 +120,21 @@
wm.setGlobal( "results",
results );
- wm.assertObject( new Cheese( "stilton",
+ wm.insert( new Cheese( "stilton",
10 ) );
- wm.assertObject( new Cheese( "stilton",
+ wm.insert( new Cheese( "stilton",
7 ) );
- wm.assertObject( new Cheese( "stilton",
+ wm.insert( new Cheese( "stilton",
8 ) );
- wm.assertObject( new Cheese( "brie",
+ wm.insert( new Cheese( "brie",
5 ) );
- wm.assertObject( new Cheese( "provolone",
+ wm.insert( new Cheese( "provolone",
150 ) );
- wm.assertObject( new Cheese( "provolone",
+ wm.insert( new Cheese( "provolone",
20 ) );
- wm.assertObject( new Person( "Bob",
+ wm.insert( new Person( "Bob",
"stilton" ) );
- wm.assertObject( new Person( "Mark",
+ wm.insert( new Person( "Mark",
"provolone" ) );
wm.fireAllRules();
@@ -170,9 +170,9 @@
final FactHandle[] cheeseHandles = new FactHandle[cheese.length];
for ( int i = 0; i < cheese.length; i++ ) {
- cheeseHandles[i] = wm.assertObject( cheese[i] );
+ cheeseHandles[i] = wm.insert( cheese[i] );
}
- final FactHandle bobHandle = wm.assertObject( bob );
+ final FactHandle bobHandle = wm.insert( bob );
// ---------------- 1st scenario
int fireCount = 0;
@@ -187,7 +187,7 @@
// ---------------- 2nd scenario
final int index = 1;
cheese[index].setPrice( 9 );
- wm.modifyObject( cheeseHandles[index],
+ wm.update( cheeseHandles[index],
cheese[index] );
wm.fireAllRules();
@@ -200,7 +200,7 @@
// ---------------- 3rd scenario
bob.setLikes( "brie" );
- wm.modifyObject( bobHandle,
+ wm.update( bobHandle,
bob );
wm.fireAllRules();
@@ -208,7 +208,7 @@
results.size() );
// ---------------- 4th scenario
- wm.retractObject( cheeseHandles[3] );
+ wm.retract( cheeseHandles[3] );
wm.fireAllRules();
// should not have fired as per constraint
@@ -233,8 +233,8 @@
10 );
final Person p = new Person( "Mark",
"stilton" );
- workingMemory.assertObject( c );
- workingMemory.assertObject( p );
+ workingMemory.insert( c );
+ workingMemory.insert( p );
workingMemory.fireAllRules();
assertTrue( list.contains( c.getType() ) );
@@ -257,16 +257,16 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- final FactHandle stiltonHandle = workingMemory.assertObject( stilton );
+ final FactHandle stiltonHandle = workingMemory.insert( stilton );
final Cheese cheddar = new Cheese( "cheddar",
7 );
- final FactHandle cheddarHandle = workingMemory.assertObject( cheddar );
+ final FactHandle cheddarHandle = workingMemory.insert( cheddar );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
- workingMemory.retractObject( stiltonHandle );
+ workingMemory.retract( stiltonHandle );
workingMemory.fireAllRules();
@@ -298,21 +298,21 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- final FactHandle stiltonHandle = workingMemory.assertObject( stilton );
+ final FactHandle stiltonHandle = workingMemory.insert( stilton );
final Cheese cheddar = new Cheese( "cheddar",
7 );
- final FactHandle cheddarHandle = workingMemory.assertObject( cheddar );
+ final FactHandle cheddarHandle = workingMemory.insert( cheddar );
final PersonInterface paul = new Person( "paul",
"stilton",
12 );
- workingMemory.assertObject( paul );
+ workingMemory.insert( paul );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
- workingMemory.retractObject( stiltonHandle );
+ workingMemory.retract( stiltonHandle );
workingMemory.fireAllRules();
@@ -335,7 +335,7 @@
final Cheese cheddar = new Cheese( "cheddar",
7 );
- final FactHandle cheddarHandle = workingMemory.assertObject( cheddar );
+ final FactHandle cheddarHandle = workingMemory.insert( cheddar );
workingMemory.fireAllRules();
assertEquals( 0,
@@ -343,7 +343,7 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- final FactHandle stiltonHandle = workingMemory.assertObject( stilton );
+ final FactHandle stiltonHandle = workingMemory.insert( stilton );
workingMemory.fireAllRules();
assertEquals( 1,
@@ -351,7 +351,7 @@
final Cheese brie = new Cheese( "brie",
5 );
- final FactHandle brieHandle = workingMemory.assertObject( brie );
+ final FactHandle brieHandle = workingMemory.insert( brie );
workingMemory.fireAllRules();
assertEquals( 1,
@@ -380,22 +380,22 @@
final Person bob = new Person( "Bob",
"muzzarela" );
- workingMemory.assertObject( cheddar );
+ workingMemory.insert( cheddar );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
- workingMemory.assertObject( provolone );
+ workingMemory.insert( provolone );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
- workingMemory.assertObject( edson );
+ workingMemory.insert( edson );
workingMemory.fireAllRules();
assertEquals( 1,
list.size() );
- workingMemory.assertObject( bob );
+ workingMemory.insert( bob );
workingMemory.fireAllRules();
assertEquals( 1,
list.size() );
@@ -416,19 +416,19 @@
list );
final State state = new State( "SP" );
- workingMemory.assertObject( state );
+ workingMemory.insert( state );
final Person bob = new Person( "Bob" );
bob.setStatus( state.getState() );
bob.setLikes( "stilton" );
- workingMemory.assertObject( bob );
+ workingMemory.insert( bob );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
- workingMemory.assertObject( new Cheese( bob.getLikes(),
+ workingMemory.insert( new Cheese( bob.getLikes(),
10 ) );
workingMemory.fireAllRules();
@@ -448,16 +448,16 @@
wm.setGlobal( "results",
results );
- wm.assertObject( new Cheese( "stilton",
+ wm.insert( new Cheese( "stilton",
10 ) );
- wm.assertObject( new Cheese( "brie",
+ wm.insert( new Cheese( "brie",
5 ) );
- wm.assertObject( new Cheese( "provolone",
+ wm.insert( new Cheese( "provolone",
150 ) );
- wm.assertObject( new Person( "Bob",
+ wm.insert( new Person( "Bob",
"stilton",
20 ) );
- wm.assertObject( new Person( "Mark",
+ wm.insert( new Person( "Mark",
"provolone" ) );
wm.fireAllRules();
@@ -491,30 +491,30 @@
list );
final Person bob = new Person( "bob", "stilton" );
- workingMemory.assertObject( bob );
+ workingMemory.insert( bob );
final Person mark = new Person( "mark", "stilton" );
- workingMemory.assertObject( mark );
+ workingMemory.insert( mark );
final Cheese stilton1 = new Cheese( "stilton",
6 );
- final FactHandle stilton1Handle = workingMemory.assertObject( stilton1 );
+ final FactHandle stilton1Handle = workingMemory.insert( stilton1 );
final Cheese stilton2 = new Cheese( "stilton",
7 );
- final FactHandle stilton2Handle = workingMemory.assertObject( stilton2 );
+ final FactHandle stilton2Handle = workingMemory.insert( stilton2 );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
- workingMemory.retractObject( stilton1Handle );
+ workingMemory.retract( stilton1Handle );
workingMemory.fireAllRules();
assertEquals( 1,
list.size() );
assertEquals( mark, list.get( 0 ));
- workingMemory.retractObject( stilton2Handle );
+ workingMemory.retract( stilton2Handle );
workingMemory.fireAllRules();
assertEquals( 2,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -35,7 +35,7 @@
workingMemory.setGlobal( "list",
list );
- workingMemory.assertObject( new Cheese("stilton", 10) );
+ workingMemory.insert( new Cheese("stilton", 10) );
workingMemory.fireAllRules();
assertEquals( 2, list.size() );
assertEquals( new Integer(30), list.get(0));
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -37,7 +37,7 @@
import org.acme.insurance.Driver;
import org.acme.insurance.Policy;
-import org.drools.AssertedObject;
+import org.drools.InsertedObject;
import org.drools.Cell;
import org.drools.Cheese;
import org.drools.Cheesery;
@@ -77,8 +77,8 @@
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
import org.drools.event.DefaultWorkingMemoryEventListener;
-import org.drools.event.ObjectAssertedEvent;
-import org.drools.event.ObjectModifiedEvent;
+import org.drools.event.ObjectInsertedEvent;
+import org.drools.event.ObjectUpdatedEvent;
import org.drools.event.ObjectRetractedEvent;
import org.drools.event.WorkingMemoryEventListener;
import org.drools.facttemplates.Fact;
@@ -125,7 +125,7 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
@@ -160,7 +160,7 @@
final TestParam tp1 = new TestParam();
tp1.setValue2( "boo" );
- wm.assertObject( tp1 );
+ wm.insert( tp1 );
wm.fireAllRules();
@@ -181,7 +181,7 @@
final List events = new ArrayList();
final WorkingMemoryEventListener listener = new DefaultWorkingMemoryEventListener() {
- public void objectModified(ObjectModifiedEvent event) {
+ public void objectUpdated(ObjectUpdatedEvent event) {
events.add( event );
}
};
@@ -193,11 +193,11 @@
15 );
bigCheese.setCheese( cheddar );
- final FactHandle bigCheeseHandle = workingMemory.assertObject( bigCheese );
- final FactHandle cheddarHandle = workingMemory.assertObject( cheddar );
+ final FactHandle bigCheeseHandle = workingMemory.insert( bigCheese );
+ final FactHandle cheddarHandle = workingMemory.insert( cheddar );
workingMemory.fireAllRules();
- ObjectModifiedEvent event = (ObjectModifiedEvent) events.get( 0 );
+ ObjectUpdatedEvent event = (ObjectUpdatedEvent) events.get( 0 );
assertSame( cheddarHandle,
event.getFactHandle() );
assertSame( cheddar,
@@ -205,7 +205,7 @@
assertSame( cheddar,
event.getObject() );
- event = (ObjectModifiedEvent) events.get( 1 );
+ event = (ObjectUpdatedEvent) events.get( 1 );
assertSame( bigCheeseHandle,
event.getFactHandle() );
assertSame( bigCheese,
@@ -230,17 +230,17 @@
list );
final Cheese nullCheese = new Cheese( null,
2 );
- workingMemory.assertObject( nullCheese );
+ workingMemory.insert( nullCheese );
final Person notNullPerson = new Person( "shoes butt back" );
notNullPerson.setBigDecimal( new BigDecimal( "42.42" ) );
- workingMemory.assertObject( notNullPerson );
+ workingMemory.insert( notNullPerson );
final Person nullPerson = new Person( "whee" );
nullPerson.setBigDecimal( null );
- workingMemory.assertObject( nullPerson );
+ workingMemory.insert( nullPerson );
workingMemory.fireAllRules();
System.out.println( list.get( 0 ) );
@@ -267,7 +267,7 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
@@ -303,13 +303,13 @@
final List list = new ArrayList();
workingMemory.setGlobal( "list",
list );
- workingMemory.assertObject( new Message( "hola" ) );
+ workingMemory.insert( new Message( "hola" ) );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
- workingMemory.assertObject( new Cheese( "brie",
+ workingMemory.insert( new Cheese( "brie",
33 ) );
workingMemory.fireAllRules();
@@ -334,8 +334,8 @@
message.addToList( "hello" );
message.setNumber( 42 );
- workingMemory.assertObject( message );
- workingMemory.assertObject( "boo" );
+ workingMemory.insert( message );
+ workingMemory.insert( "boo" );
workingMemory.fireAllRules();
assertTrue( message.isFired() );
assertEquals( message,
@@ -358,7 +358,7 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
@@ -383,7 +383,7 @@
null,
12 );
bill.setAlive( true );
- workingMemory.assertObject( bill );
+ workingMemory.insert( bill );
workingMemory.fireAllRules();
assertEquals( bill,
@@ -409,7 +409,7 @@
"stilton" );
stilton.setFieldValue( "price",
new Integer( 100 ) );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
assertEquals( 1,
@@ -438,7 +438,7 @@
list );
final State state = new State( "initial" );
- workingMemory.assertObject( state,
+ workingMemory.insert( state,
true );
workingMemory.fireAllRules();
@@ -484,8 +484,8 @@
13 );
ben.setBigDecimal( new BigDecimal( "43" ) );
- workingMemory.assertObject( bill );
- workingMemory.assertObject( ben );
+ workingMemory.insert( bill );
+ workingMemory.insert( ben );
workingMemory.fireAllRules();
assertEquals( 1,
@@ -503,8 +503,8 @@
ruleBase.addPackage( builder.getPackage() );
final WorkingMemory memory = ruleBase.newStatefulSession();
- memory.assertObject( cell1 );
- memory.assertObject( cell );
+ memory.insert( cell1 );
+ memory.insert( cell );
memory.fireAllRules();
assertEquals( 9,
cell.getValue() );
@@ -524,7 +524,7 @@
final Cheese cheddar = new Cheese( "cheddar",
5 );
- final FactHandle h = workingMemory.assertObject( cheddar );
+ final FactHandle h = workingMemory.insert( cheddar );
workingMemory.fireAllRules();
@@ -534,14 +534,14 @@
assertEquals( 1,
list.size() );
- workingMemory.retractObject( h );
+ workingMemory.retract( h );
workingMemory.fireAllRules();
// still just one
assertEquals( 1,
list.size() );
- workingMemory.assertObject( new Cheese( "stilton",
+ workingMemory.insert( new Cheese( "stilton",
5 ) );
workingMemory.fireAllRules();
@@ -562,7 +562,7 @@
final Cheese stilton = new Cheese( "stinky",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
final QueryResults results = workingMemory.getQueryResults( "simple query" );
assertEquals( 1,
results.size() );
@@ -586,7 +586,7 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
assertEquals( stilton,
@@ -613,7 +613,7 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
assertEquals( stilton,
@@ -634,7 +634,7 @@
list );
final Person foo = new Person( "foo" );
- workingMemory.assertObject( foo );
+ workingMemory.insert( foo );
workingMemory.fireAllRules();
assertEquals( foo,
@@ -660,11 +660,11 @@
final PersonInterface peter = new Person( "peter",
null,
12 );
- workingMemory.assertObject( peter );
+ workingMemory.insert( peter );
final PersonInterface jane = new Person( "jane",
null,
10 );
- workingMemory.assertObject( jane );
+ workingMemory.insert( jane );
workingMemory.fireAllRules();
@@ -693,11 +693,11 @@
final PersonInterface peter = new Person( "peter",
null,
12 );
- workingMemory.assertObject( peter );
+ workingMemory.insert( peter );
final PersonInterface jane = new Person( "jane",
null,
10 );
- workingMemory.assertObject( jane );
+ workingMemory.insert( jane );
workingMemory.fireAllRules();
@@ -722,8 +722,8 @@
final PersonInterface p2 = new Person( null,
"drink",
30 );
- workingMemory.assertObject( p1 );
- workingMemory.assertObject( p2 );
+ workingMemory.insert( p1 );
+ workingMemory.insert( p2 );
workingMemory.fireAllRules();
@@ -747,8 +747,8 @@
final Primitives p2 = new Primitives();
p2.setArrayAttribute( null );
- workingMemory.assertObject( p1 );
- workingMemory.assertObject( p2 );
+ workingMemory.insert( p1 );
+ workingMemory.insert( p2 );
workingMemory.fireAllRules();
assertEquals( 2,
@@ -766,7 +766,7 @@
final WorkingMemory workingMemory = ruleBase.newStatefulSession();
final Cheese cheese = new Cheese( "stilton",
15 );
- workingMemory.assertObject( cheese );
+ workingMemory.insert( cheese );
final List list = new ArrayList();
workingMemory.setGlobal( "list",
list );
@@ -813,7 +813,7 @@
cheesery.addCheese( cheddar );
workingMemory.setGlobal( "cheesery",
cheesery );
- workingMemory.assertObject( cheesery );
+ workingMemory.insert( cheesery );
workingMemory.fireAllRules();
@@ -859,7 +859,7 @@
globalObject );
final Person bob = new Person( "bob" );
- workingMemory.assertObject( bob );
+ workingMemory.insert( bob );
workingMemory.fireAllRules();
@@ -996,7 +996,7 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
@@ -1021,7 +1021,7 @@
final PersonInterface person = new Person( "michael",
"cheese" );
person.setStatus( "start" );
- workingMemory.assertObject( person );
+ workingMemory.insert( person );
workingMemory.fireAllRules();
assertEquals( 5,
@@ -1045,10 +1045,10 @@
final Cheese mussarela = new Cheese( "Mussarela",
35 );
- workingMemory.assertObject( mussarela );
+ workingMemory.insert( mussarela );
final Cheese provolone = new Cheese( "Provolone",
20 );
- workingMemory.assertObject( provolone );
+ workingMemory.insert( provolone );
workingMemory.fireAllRules();
@@ -1071,7 +1071,7 @@
final Cheese brie = new Cheese( "brie",
12 );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
try {
workingMemory.fireAllRules();
@@ -1093,7 +1093,7 @@
final Cheese brie = new Cheese( "brie",
12 );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
try {
workingMemory.fireAllRules();
@@ -1117,7 +1117,7 @@
12 );
try {
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
fail( "Should throw an Exception from the Eval" );
} catch ( final Exception e ) {
@@ -1139,7 +1139,7 @@
12 );
try {
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
fail( "Should throw an Exception from the Predicate" );
} catch ( final Exception e ) {
@@ -1161,7 +1161,7 @@
12 );
try {
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
fail( "Should throw an Exception from the ReturnValue" );
} catch ( final Exception e ) {
@@ -1214,12 +1214,12 @@
oldChili2.setAge( 48 );
oldChili2.setHair( "blue" );
- workingMemory.assertObject( youngChili1 );
- workingMemory.assertObject( youngChili2 );
- workingMemory.assertObject( chili1 );
- workingMemory.assertObject( chili2 );
- workingMemory.assertObject( oldChili1 );
- workingMemory.assertObject( oldChili2 );
+ workingMemory.insert( youngChili1 );
+ workingMemory.insert( youngChili2 );
+ workingMemory.insert( chili1 );
+ workingMemory.insert( chili2 );
+ workingMemory.insert( oldChili1 );
+ workingMemory.insert( oldChili2 );
workingMemory.fireAllRules();
@@ -1260,7 +1260,7 @@
final Cheese brie = new Cheese( "brie",
12 );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -1286,7 +1286,7 @@
workingMemory.setGlobal( "list",
list );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -1315,7 +1315,7 @@
workingMemory.setGlobal( "list",
list );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -1344,14 +1344,14 @@
final Cheese stilton = new Cheese( "stilton",
12 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
final Cheese brie = new Cheese( "brie",
10 );
- workingMemory.assertObject( brie );
+ workingMemory.insert( brie );
final Cheesery cheesery = new Cheesery();
cheesery.getCheeses().add( stilton );
- workingMemory.assertObject( cheesery );
+ workingMemory.insert( cheesery );
workingMemory.fireAllRules();
@@ -1380,12 +1380,12 @@
final Cheesery cheesery1 = new Cheesery();
cheesery1.setStatus( Cheesery.SELLING_CHEESE );
cheesery1.setMaturity( Maturity.OLD );
- workingMemory.assertObject( cheesery1 );
+ workingMemory.insert( cheesery1 );
final Cheesery cheesery2 = new Cheesery();
cheesery2.setStatus( Cheesery.MAKING_CHEESE );
cheesery2.setMaturity( Maturity.YOUNG );
- workingMemory.assertObject( cheesery2 );
+ workingMemory.insert( cheesery2 );
workingMemory.fireAllRules();
@@ -1432,8 +1432,8 @@
final PersonInterface pete = new Person( null,
null );
bob.setStatus( "P2" );
- workingMemory.assertObject( bob );
- workingMemory.assertObject( pete );
+ workingMemory.insert( bob );
+ workingMemory.insert( pete );
workingMemory.fireAllRules();
@@ -1482,7 +1482,7 @@
new ArrayList() );
final Person bob = new Person( "bob" );
- workingMemory.assertObject( bob );
+ workingMemory.insert( bob );
final byte[] wm = serializeOut( workingMemory );
@@ -1565,13 +1565,13 @@
list );
final Person hola = new Person( "hola" );
- workingMemory.assertObject( hola );
+ workingMemory.insert( hola );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
- workingMemory.assertObject( new State( "x" ) );
+ workingMemory.insert( new State( "x" ) );
workingMemory.fireAllRules();
@@ -1624,7 +1624,7 @@
for ( int i = 1; i <= MAX; i++ ) {
final IndexedNumber n = new IndexedNumber( i,
MAX - i + 1 );
- workingMemory.assertObject( n );
+ workingMemory.insert( n );
}
workingMemory.fireAllRules();
@@ -1651,7 +1651,7 @@
final QueryResults results = workingMemory.getQueryResults( "assertedobjquery" );
assertEquals( 1, results.size() );
- assertEquals( new AssertedObject( "value1"), results.get( 0 ).get( 0 ) );
+ assertEquals( new InsertedObject( "value1"), results.get( 0 ).get( 0 ) );
}
public void testQueryWithParams() throws Exception {
@@ -1666,18 +1666,18 @@
QueryResults results = workingMemory.getQueryResults( "assertedobjquery", new String[] { "value1" } );
assertEquals( 1, results.size() );
- assertEquals( new AssertedObject( "value1"), results.get( 0 ).get( 0 ) );
+ assertEquals( new InsertedObject( "value1"), results.get( 0 ).get( 0 ) );
results = workingMemory.getQueryResults( "assertedobjquery", new String[] { "value3" } );
assertEquals( 0, results.size() );
results = workingMemory.getQueryResults( "assertedobjquery2", new String[] { null, "value2" } );
assertEquals( 1, results.size() );
- assertEquals( new AssertedObject( "value2"), results.get( 0 ).get( 0 ) );
+ assertEquals( new InsertedObject( "value2"), results.get( 0 ).get( 0 ) );
results = workingMemory.getQueryResults( "assertedobjquery2", new String[] { "value3", "value2" } );
assertEquals( 1, results.size() );
- assertEquals( new AssertedObject( "value2"), results.get( 0 ).get( 0 ) );
+ assertEquals( new InsertedObject( "value2"), results.get( 0 ).get( 0 ) );
}
public void testTwoQuerries() throws Exception {
@@ -1694,7 +1694,7 @@
final Cheese stilton = new Cheese( "stinky",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
final Person per1 = new Person( "stinker",
"smelly feet",
70 );
@@ -1702,8 +1702,8 @@
"smelly armpits",
40 );
- workingMemory.assertObject( per1 );
- workingMemory.assertObject( per2 );
+ workingMemory.insert( per1 );
+ workingMemory.insert( per2 );
QueryResults results = workingMemory.getQueryResults( "find stinky cheeses" );
assertEquals( 1,
@@ -1723,8 +1723,8 @@
final Driver driver = new Driver();
final Policy policy = new Policy();
- wm.assertObject( driver );
- wm.assertObject( policy );
+ wm.insert( driver );
+ wm.insert( policy );
wm.fireAllRules();
@@ -1748,7 +1748,7 @@
tgt.setCourse( new Float( 145.0f ) );
tgt.setSpeed( new Float( 12.0f ) );
tgt.setTime( new Float( 1.8666667f ) );
- wm.assertObject( tgt );
+ wm.insert( tgt );
tgt = new org.drools.Target();
tgt.setLabel( "Santa-Maria" );
@@ -1757,7 +1757,7 @@
tgt.setCourse( new Float( 325.0f ) );
tgt.setSpeed( new Float( 8.0f ) );
tgt.setTime( new Float( 1.8666667f ) );
- wm.assertObject( tgt );
+ wm.insert( tgt );
wm.fireAllRules();
@@ -1769,7 +1769,7 @@
tgt.setCourse( new Float( 145.0f ) );
tgt.setSpeed( new Float( 12.0f ) );
tgt.setTime( new Float( 1.9f ) );
- wm.assertObject( tgt );
+ wm.insert( tgt );
tgt = new org.drools.Target();
tgt.setLabel( "Santa-Maria" );
@@ -1778,7 +1778,7 @@
tgt.setCourse( new Float( 325.0f ) );
tgt.setSpeed( new Float( 8.0f ) );
tgt.setTime( new Float( 1.9f ) );
- wm.assertObject( tgt );
+ wm.insert( tgt );
wm.fireAllRules();
@@ -1790,7 +1790,7 @@
tgt.setCourse( new Float( 145.0f ) );
tgt.setSpeed( new Float( 12.0f ) );
tgt.setTime( new Float( 1.9333333f ) );
- wm.assertObject( tgt );
+ wm.insert( tgt );
tgt = new org.drools.Target();
tgt.setLabel( "Santa-Maria" );
@@ -1799,7 +1799,7 @@
tgt.setCourse( new Float( 325.0f ) );
tgt.setSpeed( new Float( 8.0f ) );
tgt.setTime( new Float( 1.9333333f ) );
- wm.assertObject( tgt );
+ wm.insert( tgt );
wm.fireAllRules();
@@ -1811,7 +1811,7 @@
tgt.setCourse( new Float( 145.0f ) );
tgt.setSpeed( new Float( 12.0f ) );
tgt.setTime( new Float( 1.9666667f ) );
- wm.assertObject( tgt );
+ wm.insert( tgt );
tgt = new org.drools.Target();
tgt.setLabel( "Santa-Maria" );
@@ -1820,7 +1820,7 @@
tgt.setCourse( new Float( 325.0f ) );
tgt.setSpeed( new Float( 8.0f ) );
tgt.setTime( new Float( 1.9666667f ) );
- wm.assertObject( tgt );
+ wm.insert( tgt );
wm.fireAllRules();
}
@@ -1838,17 +1838,17 @@
"stilton",
20 );
p1.setStatus( "europe" );
- final FactHandle c1FactHandle = workingMemory.assertObject( p1 );
+ final FactHandle c1FactHandle = workingMemory.insert( p1 );
final Person p2 = new Person( "p2",
"stilton",
30 );
p2.setStatus( "europe" );
- final FactHandle c2FactHandle = workingMemory.assertObject( p2 );
+ final FactHandle c2FactHandle = workingMemory.insert( p2 );
final Person p3 = new Person( "p3",
"stilton",
40 );
p3.setStatus( "europe" );
- final FactHandle c3FactHandle = workingMemory.assertObject( p3 );
+ final FactHandle c3FactHandle = workingMemory.insert( p3 );
workingMemory.fireAllRules();
QueryResults queryResults = workingMemory.getQueryResults( "2 persons with the same status" );
@@ -1857,7 +1857,7 @@
// europe=[ 1, 2 ], america=[ 3 ]
p3.setStatus( "america" );
- workingMemory.modifyObject( c3FactHandle,
+ workingMemory.update( c3FactHandle,
p3 );
workingMemory.fireAllRules();
queryResults = workingMemory.getQueryResults( "2 persons with the same status" );
@@ -1866,7 +1866,7 @@
// europe=[ 1 ], america=[ 2, 3 ]
p2.setStatus( "america" );
- workingMemory.modifyObject( c2FactHandle,
+ workingMemory.update( c2FactHandle,
p2 );
workingMemory.fireAllRules();
queryResults = workingMemory.getQueryResults( "2 persons with the same status" );
@@ -1875,7 +1875,7 @@
// europe=[ ], america=[ 1, 2, 3 ]
p1.setStatus( "america" );
- workingMemory.modifyObject( c1FactHandle,
+ workingMemory.update( c1FactHandle,
p1 );
workingMemory.fireAllRules();
queryResults = workingMemory.getQueryResults( "2 persons with the same status" );
@@ -1884,7 +1884,7 @@
// europe=[ 2 ], america=[ 1, 3 ]
p2.setStatus( "europe" );
- workingMemory.modifyObject( c2FactHandle,
+ workingMemory.update( c2FactHandle,
p2 );
workingMemory.fireAllRules();
queryResults = workingMemory.getQueryResults( "2 persons with the same status" );
@@ -1893,7 +1893,7 @@
// europe=[ 1, 2 ], america=[ 3 ]
p1.setStatus( "europe" );
- workingMemory.modifyObject( c1FactHandle,
+ workingMemory.update( c1FactHandle,
p1 );
workingMemory.fireAllRules();
queryResults = workingMemory.getQueryResults( "2 persons with the same status" );
@@ -1902,7 +1902,7 @@
// europe=[ 1, 2, 3 ], america=[ ]
p3.setStatus( "europe" );
- workingMemory.modifyObject( c3FactHandle,
+ workingMemory.update( c3FactHandle,
p3 );
workingMemory.fireAllRules();
queryResults = workingMemory.getQueryResults( "2 persons with the same status" );
@@ -1925,7 +1925,7 @@
final Cheese stilton = new Cheese( "stilton",
5 );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
@@ -1960,9 +1960,9 @@
7 );
final Cheese brie = new Cheese( "brie",
4 );
- workingMemory.assertObject( stilton1 );
- workingMemory.assertObject( stilton2 );
- workingMemory.assertObject( brie );
+ workingMemory.insert( stilton1 );
+ workingMemory.insert( stilton2 );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
@@ -1991,14 +1991,14 @@
final Sensor sensor1 = new Sensor( 100,
150 );
- workingMemory.assertObject( sensor1 );
+ workingMemory.insert( sensor1 );
workingMemory.fireAllRules();
assertEquals( 0,
sensors.size() );
final Sensor sensor2 = new Sensor( 200,
150 );
- workingMemory.assertObject( sensor2 );
+ workingMemory.insert( sensor2 );
workingMemory.fireAllRules();
assertEquals( 3,
sensors.size() );
@@ -2037,19 +2037,19 @@
list );
final State state = new State( "SP" );
- workingMemory.assertObject( state );
+ workingMemory.insert( state );
final Person bob = new Person( "Bob" );
bob.setStatus( state.getState() );
bob.setLikes( "stilton" );
- workingMemory.assertObject( bob );
+ workingMemory.insert( bob );
workingMemory.fireAllRules();
assertEquals( 0,
list.size() );
- workingMemory.assertObject( new Cheese( bob.getLikes(),
+ workingMemory.insert( new Cheese( bob.getLikes(),
10 ) );
workingMemory.fireAllRules();
@@ -2086,17 +2086,17 @@
final WorkingMemory wm = ruleBase.newStatefulSession();
- wm.assertObject( new Cheese( "a",
+ wm.insert( new Cheese( "a",
10 ) );
- wm.assertObject( new Cheese( "b",
+ wm.insert( new Cheese( "b",
10 ) );
- wm.assertObject( new Cheese( "c",
+ wm.insert( new Cheese( "c",
10 ) );
- wm.assertObject( new Cheese( "d",
+ wm.insert( new Cheese( "d",
10 ) );
final Cheese e = new Cheese( "e",
10 );
- wm.assertObject( e );
+ wm.insert( e );
wm.fireAllRules();
@@ -2130,7 +2130,7 @@
p1.setPrimitiveArrayAttribute( new int[]{1, 2, 3} );
p1.setArrayAttribute( new String[]{"a", "b"} );
- workingMemory.assertObject( p1 );
+ workingMemory.insert( p1 );
workingMemory.fireAllRules();
assertEquals( 3,
@@ -2160,8 +2160,8 @@
final Cheese cheese = new Cheese( "brie",
10 );
- workingMemory.assertObject( person );
- workingMemory.assertObject( cheese );
+ workingMemory.insert( person );
+ workingMemory.insert( cheese );
workingMemory.fireAllRules();
assertEquals( 4,
@@ -2185,8 +2185,8 @@
final Cheese brie = new Cheese( "brie",
10 );
- workingMemory.assertObject( stilton );
- workingMemory.assertObject( brie );
+ workingMemory.insert( stilton );
+ workingMemory.insert( brie );
workingMemory.fireAllRules();
assertEquals( 5,
@@ -2204,7 +2204,7 @@
assertEquals( stilton.getPrice(),
((Integer) result.get( "test3" + stilton.getType() )).intValue() );
- workingMemory.assertObject( new Person( "bob",
+ workingMemory.insert( new Person( "bob",
brie.getType() ) );
workingMemory.fireAllRules();
@@ -2234,7 +2234,7 @@
ruleBase.addPackage( pkg );
final WorkingMemory workingMemory = ruleBase.newStatefulSession();
- workingMemory.assertObject( new Child( "gp" ) );
+ workingMemory.insert( new Child( "gp" ) );
workingMemory.fireAllRules();
}
@@ -2261,11 +2261,11 @@
3 );
final OrderItem anotherItem2 = new OrderItem( null,
4 );
- workingMemory.assertObject( order );
- workingMemory.assertObject( item1 );
- workingMemory.assertObject( item2 );
- workingMemory.assertObject( anotherItem1 );
- workingMemory.assertObject( anotherItem2 );
+ workingMemory.insert( order );
+ workingMemory.insert( item1 );
+ workingMemory.insert( item2 );
+ workingMemory.insert( anotherItem1 );
+ workingMemory.insert( anotherItem2 );
workingMemory.fireAllRules();
@@ -2291,12 +2291,12 @@
// asserting the sensor object
final RandomNumber rn = new RandomNumber();
rn.setValue( 10 );
- workingMemory.assertObject( rn );
+ workingMemory.insert( rn );
final Guess guess = new Guess();
guess.setValue( new Integer( 5 ) );
- final FactHandle handle = workingMemory.assertObject( guess );
+ final FactHandle handle = workingMemory.insert( guess );
workingMemory.fireAllRules();
@@ -2307,7 +2307,7 @@
list.get( 0 ) );
guess.setValue( new Integer( 15 ) );
- workingMemory.modifyObject( handle,
+ workingMemory.update( handle,
guess );
workingMemory.fireAllRules();
@@ -2319,7 +2319,7 @@
list.get( 1 ) );
guess.setValue( new Integer( 10 ) );
- workingMemory.modifyObject( handle,
+ workingMemory.update( handle,
guess );
workingMemory.fireAllRules();
@@ -2347,14 +2347,14 @@
final Cheese cheese = new Cheese( "brie",
10 );
- final FactHandle handle = workingMemory.assertObject( cheese );
+ final FactHandle handle = workingMemory.insert( cheese );
final Person bob = new Person( "bob",
"stilton" );
- workingMemory.assertObject( bob );
+ workingMemory.insert( bob );
cheese.setType( "stilton" );
- workingMemory.modifyObject( handle,
+ workingMemory.update( handle,
cheese );
workingMemory.fireAllRules();
assertEquals( 2,
@@ -2409,11 +2409,11 @@
final List wmList = new ArrayList();
final WorkingMemoryEventListener workingMemoryListener = new WorkingMemoryEventListener() {
- public void objectAsserted(ObjectAssertedEvent event) {
+ public void objectInserted(ObjectInsertedEvent event) {
wmList.add( event );
}
- public void objectModified(ObjectModifiedEvent event) {
+ public void objectUpdated(ObjectUpdatedEvent event) {
wmList.add( event );
}
@@ -2430,24 +2430,24 @@
final Cheese cheddar = new Cheese( "cheddar",
17 );
- final FactHandle stiltonHandle = wm.assertObject( stilton );
+ final FactHandle stiltonHandle = wm.insert( stilton );
- final ObjectAssertedEvent oae = (ObjectAssertedEvent) wmList.get( 0 );
+ final ObjectInsertedEvent oae = (ObjectInsertedEvent) wmList.get( 0 );
assertSame( stiltonHandle,
oae.getFactHandle() );
- wm.modifyObject( stiltonHandle,
+ wm.update( stiltonHandle,
stilton );
- final ObjectModifiedEvent ome = (ObjectModifiedEvent) wmList.get( 1 );
+ final ObjectUpdatedEvent ome = (ObjectUpdatedEvent) wmList.get( 1 );
assertSame( stiltonHandle,
ome.getFactHandle() );
- wm.retractObject( stiltonHandle );
+ wm.retract( stiltonHandle );
final ObjectRetractedEvent ore = (ObjectRetractedEvent) wmList.get( 2 );
assertSame( stiltonHandle,
ore.getFactHandle() );
- wm.assertObject( cheddar );
+ wm.insert( cheddar );
}
public void testImplicitDeclarations() throws Exception {
@@ -2467,7 +2467,7 @@
final Cheese cheese = new Cheese( "stilton",
10 );
- workingMemory.assertObject( cheese );
+ workingMemory.insert( cheese );
workingMemory.fireAllRules();
assertEquals( 1,
@@ -2508,13 +2508,13 @@
10 );
final Cheese brie = new Cheese( "brie",
15 );
- workingMemory.assertObject( stilton );
- workingMemory.assertObject( muzzarela );
+ workingMemory.insert( stilton );
+ workingMemory.insert( muzzarela );
final Cheesery cheesery = new Cheesery();
cheesery.getCheeses().add( stilton.getType() );
cheesery.getCheeses().add( brie.getType() );
- workingMemory.assertObject( cheesery );
+ workingMemory.insert( cheesery );
workingMemory.fireAllRules();
@@ -2542,7 +2542,7 @@
final Primitives p = new Primitives();
p.setStringArray( new String[]{"test1", "test3"} );
- workingMemory.assertObject( p );
+ workingMemory.insert( p );
workingMemory.fireAllRules();
@@ -2568,9 +2568,9 @@
workingMemory.setGlobal( "results",
list );
- workingMemory.assertObject( new Cheese( "stilton",
+ workingMemory.insert( new Cheese( "stilton",
10 ) );
- workingMemory.assertObject( new Cheese( "brie",
+ workingMemory.insert( new Cheese( "brie",
15 ) );
workingMemory.fireAllRules();
@@ -2603,7 +2603,7 @@
assertEquals( "rule1",
list.get( 0 ) );
- workingMemory.assertObject( new Cheese( "stilton",
+ workingMemory.insert( new Cheese( "stilton",
10 ) );
workingMemory.fireAllRules();
@@ -2628,8 +2628,8 @@
workingMemory.setGlobal( "results",
list );
- workingMemory.assertObject( new Person( "bob" ) );
- workingMemory.assertObject( new Person( null ) );
+ workingMemory.insert( new Person( "bob" ) );
+ workingMemory.insert( new Person( null ) );
workingMemory.fireAllRules();
@@ -2655,8 +2655,8 @@
final Cheese muzzarella = new Cheese( "muzzarella",
9 );
final int sum = stilton.getPrice() + muzzarella.getPrice();
- final FactHandle stiltonHandle = workingMemory.assertObject( stilton );
- final FactHandle muzzarellaHandle = workingMemory.assertObject( muzzarella );
+ final FactHandle stiltonHandle = workingMemory.insert( stilton );
+ final FactHandle muzzarellaHandle = workingMemory.insert( muzzarella );
workingMemory.fireAllRules();
@@ -2708,12 +2708,12 @@
oldChili2.setAge( 48 );
oldChili2.setHair( "blue" );
- workingMemory.assertObject( youngChili1 );
- workingMemory.assertObject( youngChili2 );
- workingMemory.assertObject( chili1 );
- workingMemory.assertObject( chili2 );
- workingMemory.assertObject( oldChili1 );
- workingMemory.assertObject( oldChili2 );
+ workingMemory.insert( youngChili1 );
+ workingMemory.insert( youngChili2 );
+ workingMemory.insert( chili1 );
+ workingMemory.insert( chili2 );
+ workingMemory.insert( oldChili1 );
+ workingMemory.insert( oldChili2 );
workingMemory.fireAllRules();
@@ -2750,12 +2750,12 @@
10 );
final Cheese muzzarella2 = new Cheese( "muzzarella2",
10 );
- workingMemory.assertObject( stilton );
- workingMemory.assertObject( stilton2 );
- workingMemory.assertObject( brie );
- workingMemory.assertObject( brie2 );
- workingMemory.assertObject( muzzarella );
- workingMemory.assertObject( muzzarella2 );
+ workingMemory.insert( stilton );
+ workingMemory.insert( stilton2 );
+ workingMemory.insert( brie );
+ workingMemory.insert( brie2 );
+ workingMemory.insert( muzzarella );
+ workingMemory.insert( muzzarella2 );
workingMemory.fireAllRules();
@@ -2784,8 +2784,8 @@
final Person bob = new Person("bob", "stilton");
final Cheese stilton = new Cheese( "stilton",
12 );
- workingMemory.assertObject( bob );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( bob );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
@@ -2820,8 +2820,8 @@
final Person bob = new Person("bob", "stilton");
final Cheese stilton = new Cheese( "stilton",
12 );
- workingMemory.assertObject( bob );
- workingMemory.assertObject( stilton );
+ workingMemory.insert( bob );
+ workingMemory.insert( stilton );
workingMemory.fireAllRules();
@@ -2865,18 +2865,18 @@
final OrderItem item42 = new OrderItem( order4, 2 );
order4.addItem( item41 );
order4.addItem( item42 );
- workingMemory.assertObject( order1 );
- workingMemory.assertObject( item11 );
- workingMemory.assertObject( item12 );
- workingMemory.assertObject( order2 );
- workingMemory.assertObject( item21 );
- workingMemory.assertObject( item22 );
- workingMemory.assertObject( order3 );
- workingMemory.assertObject( item31 );
- workingMemory.assertObject( item32 );
- workingMemory.assertObject( order4 );
- workingMemory.assertObject( item41 );
- workingMemory.assertObject( item42 );
+ workingMemory.insert( order1 );
+ workingMemory.insert( item11 );
+ workingMemory.insert( item12 );
+ workingMemory.insert( order2 );
+ workingMemory.insert( item21 );
+ workingMemory.insert( item22 );
+ workingMemory.insert( order3 );
+ workingMemory.insert( item31 );
+ workingMemory.insert( item32 );
+ workingMemory.insert( order4 );
+ workingMemory.insert( item41 );
+ workingMemory.insert( item42 );
workingMemory.fireAllRules();
@@ -2909,7 +2909,7 @@
map.put( "surname", "Tirelli" );
map.put( "age", "28" );
- workingMemory.assertObject( map );
+ workingMemory.insert( map );
workingMemory.fireAllRules();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -21,8 +21,8 @@
import org.drools.common.TruthMaintenanceSystem;
import org.drools.compiler.PackageBuilder;
import org.drools.event.DefaultWorkingMemoryEventListener;
-import org.drools.event.ObjectAssertedEvent;
-import org.drools.event.ObjectModifiedEvent;
+import org.drools.event.ObjectInsertedEvent;
+import org.drools.event.ObjectUpdatedEvent;
import org.drools.event.ObjectRetractedEvent;
import org.drools.event.WorkingMemoryEventListener;
import org.drools.rule.Package;
@@ -41,9 +41,9 @@
config );
}
- public void testLogicalAssertions() throws Exception {
+ public void testLogicalInsertions() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertions.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertions.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -56,11 +56,11 @@
final Cheese brie = new Cheese( "brie",
12 );
- final FactHandle brieHandle = workingMemory.assertObject( brie );
+ final FactHandle brieHandle = workingMemory.insert( brie );
final Cheese provolone = new Cheese( "provolone",
12 );
- final FactHandle provoloneHandle = workingMemory.assertObject( provolone );
+ final FactHandle provoloneHandle = workingMemory.insert( provolone );
workingMemory.fireAllRules();
@@ -70,20 +70,20 @@
assertEquals( 3,
IteratorToList.convert( workingMemory.iterateObjects() ).size() );
- workingMemory.retractObject( brieHandle );
+ workingMemory.retract( brieHandle );
assertEquals( 2,
IteratorToList.convert( workingMemory.iterateObjects() ).size() );
- workingMemory.retractObject( provoloneHandle );
+ workingMemory.retract( provoloneHandle );
assertEquals( 0,
IteratorToList.convert( workingMemory.iterateObjects() ).size() );
}
- public void testLogicalAssertionsBacking() throws Exception {
+ public void testLogicalInsertionsBacking() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsBacking.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsBacking.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -96,7 +96,7 @@
1 );
List list;
- final FactHandle h1 = workingMemory.assertObject( cheese1 );
+ final FactHandle h1 = workingMemory.insert( cheese1 );
workingMemory.fireAllRules();
list = IteratorToList.convert( workingMemory.iterateObjects( new ClassObjectFilter( cheese1.getType().getClass() ) ) );
assertEquals( 1,
@@ -106,7 +106,7 @@
list.get( 0 ) );
// FactHandle ht = workingMemory.getFactHandle(c1.getType());
- final FactHandle h2 = workingMemory.assertObject( cheese2 );
+ final FactHandle h2 = workingMemory.insert( cheese2 );
workingMemory.fireAllRules();
list = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( cheese1.getType().getClass() ) ) );
assertEquals( 1,
@@ -116,7 +116,7 @@
assertEquals( 3, IteratorToList.convert( workingMemory.iterateObjects() ).size() );
- workingMemory.retractObject( h1 );
+ workingMemory.retract( h1 );
workingMemory.fireAllRules();
list = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( cheese1.getType().getClass() ) ) );
assertEquals( "cheese-type " + cheese1.getType() + " was retracted, but should not. Backed by cheese2 => type.",
@@ -126,7 +126,7 @@
cheese1.getType(),
list.get( 0 ) );
- workingMemory.retractObject( h2 );
+ workingMemory.retract( h2 );
workingMemory.fireAllRules();
list = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( cheese1.getType().getClass() ) ) );
assertEquals( "cheese-type " + cheese1.getType() + " was not retracted, but should have. Neither cheese1 => type nor cheese2 => type is true.",
@@ -134,9 +134,9 @@
list.size() );
}
- public void testLogicalAssertionsSelfreferencing() throws Exception {
+ public void testLogicalInsertionsSelfreferencing() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsSelfreferencing.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsSelfreferencing.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -151,7 +151,7 @@
workingMemory.setGlobal( "b",
b );
- FactHandle h1 = workingMemory.assertObject( a );
+ FactHandle h1 = workingMemory.insert( a );
workingMemory.fireAllRules();
list = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( a.getClass() ) ) );
assertEquals( 2,
@@ -159,7 +159,7 @@
assertTrue( list.contains( a ) );
assertTrue( list.contains( b ) );
- workingMemory.retractObject( h1 );
+ workingMemory.retract( h1 );
workingMemory.fireAllRules();
list = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( a.getClass() ) ) );
assertEquals( "b was retracted, but it should not have. Is backed by b => b being true.",
@@ -170,16 +170,16 @@
list.get( 0 ) );
h1 = workingMemory.getFactHandle( b );
- workingMemory.retractObject( h1 );
+ workingMemory.retract( h1 );
workingMemory.fireAllRules();
list = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( a.getClass() ) ) );
assertEquals( 0,
list.size() );
}
- public void testLogicalAssertionsLoop() throws Exception {
+ public void testLogicalInsertionsLoop() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsLoop.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsLoop.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -205,9 +205,9 @@
l.size() );
}
- public void testLogicalAssertionsNoLoop() throws Exception {
+ public void testLogicalInsertionsNoLoop() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsNoLoop.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsNoLoop.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -233,9 +233,9 @@
l.size() );
}
- public void testLogicalAssertionsWithModify() throws Exception {
+ public void testLogicalInsertionsWithModify() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsWithModify.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsWithUpdate.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -243,7 +243,7 @@
final WorkingMemory workingMemory = ruleBase.newStatefulSession();
final WorkingMemoryEventListener l2 = new DefaultWorkingMemoryEventListener() {
- public void objectAsserted(ObjectAssertedEvent event) {
+ public void objectInserted(ObjectInsertedEvent event) {
System.out.println( event );
}
@@ -251,7 +251,7 @@
System.out.println( event );
}
- public void objectModified(ObjectModifiedEvent event) {
+ public void objectUpdated(ObjectUpdatedEvent event) {
System.out.println( event );
}
};
@@ -261,7 +261,7 @@
List l;
final Person p = new Person( "person" );
p.setAge( 2 );
- final FactHandle h = workingMemory.assertObject( p );
+ final FactHandle h = workingMemory.insert( p );
assertEquals( 1,
IteratorToList.convert( workingMemory.iterateObjects() ).size() );
@@ -275,7 +275,7 @@
assertEquals( 2,
((CheeseEqual) l.get( 0 )).getPrice() );
- workingMemory.retractObject( h );
+ workingMemory.retract( h );
assertEquals( 0,
IteratorToList.convert( workingMemory.iterateObjects() ).size() );
@@ -290,9 +290,9 @@
m.size() );
}
- public void testLogicalAssertions2() throws Exception {
+ public void testLogicalInsertions2() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertions2.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertions2.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -309,7 +309,7 @@
final Sensor sensor = new Sensor( 80,
80 );
- final FactHandle handle = workingMemory.assertObject( sensor );
+ final FactHandle handle = workingMemory.insert( sensor );
// everything should be normal
workingMemory.fireAllRules();
@@ -326,7 +326,7 @@
// problems should be detected
sensor.setPressure( 200 );
sensor.setTemperature( 200 );
- workingMemory.modifyObject( handle,
+ workingMemory.update( handle,
sensor );
workingMemory.fireAllRules();
@@ -340,9 +340,9 @@
events.size() );
}
- public void testLogicalAssertionsNot() throws Exception {
+ public void testLogicalInsertionsNot() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsNot.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsNot.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -366,7 +366,7 @@
cheese,
list.get( 0 ) );
- final FactHandle h = workingMemory.assertObject( a );
+ final FactHandle h = workingMemory.insert( a );
// no need to fire rules, assertion alone removes justification for i,
// so it should be retracted.
// workingMemory.fireAllRules();
@@ -386,7 +386,7 @@
0,
workingMemory.getAgenda().agendaSize() );
- workingMemory.retractObject( h );
+ workingMemory.retract( h );
workingMemory.fireAllRules();
list = IteratorToList.convert( workingMemory.iterateObjects() );
assertEquals( "i was not asserted by not a => i.",
@@ -397,9 +397,9 @@
list.get( 0 ) );
}
- public void testLogicalAssertionsNotPingPong() throws Exception {
+ public void testLogicalInsertionsNotPingPong() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsNotPingPong.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsNotPingPong.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -430,9 +430,9 @@
list.size() );
}
- public void testLogicalAssertionsDynamicRule() throws Exception {
+ public void testLogicalInsertionsDynamicRule() throws Exception {
PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsDynamicRule.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsDynamicRule.drl" ) ) );
final Package pkg = builder.getPackage();
org.drools.reteoo.ReteooRuleBase reteooRuleBase = null;
@@ -460,12 +460,12 @@
3 );
List list;
- workingMemory.assertObject( c1 );
- final FactHandle h = workingMemory.assertObject( c2 );
- workingMemory.assertObject( c3 );
+ workingMemory.insert( c1 );
+ final FactHandle h = workingMemory.insert( c2 );
+ workingMemory.insert( c3 );
workingMemory.fireAllRules();
- // Check logical assertions where made for c2 and c3
+ // Check logical Insertions where made for c2 and c3
list = IteratorToList.convert( workingMemory.iterateObjects( new ClassObjectFilter( Person.class) ) );
assertEquals( 2,
list.size() );
@@ -474,7 +474,7 @@
assertTrue( list.contains( new Person( c3.getType() ) ) );
// this rule will make a logical assertion for c1 too
- final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsDynamicRule2.drl" ) );
+ final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsDynamicRule2.drl" ) );
builder = new PackageBuilder();
builder.addPackageFromDrl( reader );
final Package pkg2 = builder.getPackage();
@@ -531,7 +531,7 @@
list.contains( new Person( c3.getType() ) ) );
c2.setPrice( 3 );
- workingMemory.modifyObject( h,
+ workingMemory.update( h,
c2 );
list = IteratorToList.convert( workingMemory.iterateObjects( new ClassObjectFilter( Person.class) ) );
assertEquals( "c2 now has a higher price, its logical assertion should be cancelled",
@@ -558,9 +558,9 @@
list.size() );
}
- public void testLogicalAssertionsModifyEqual() throws Exception {
+ public void testLogicalInsertionsUpdateEqual() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsModifyEqual.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsUpdateEqual.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -570,7 +570,7 @@
List l;
final Person p = new Person( "person" );
p.setAge( 2 );
- final FactHandle h = workingMemory.assertObject( p );
+ final FactHandle h = workingMemory.insert( p );
assertEquals( 1,
IteratorToList.convert( workingMemory.iterateObjects() ).size() );
@@ -583,7 +583,7 @@
assertEquals( 3,
((CheeseEqual) l.get( 0 )).getPrice() );
- workingMemory.retractObject( h );
+ workingMemory.retract( h );
assertEquals( 0,
IteratorToList.convert( workingMemory.iterateObjects() ).size() );
@@ -598,9 +598,9 @@
m.size() );
}
- public void testLogicalAssertionsWithExists() throws Exception {
+ public void testLogicalInsertionsWithExists() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionWithExists.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionWithExists.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -611,17 +611,17 @@
"stilton",
20 );
p1.setStatus( "europe" );
- final FactHandle c1FactHandle = workingMemory.assertObject( p1 );
+ final FactHandle c1FactHandle = workingMemory.insert( p1 );
final Person p2 = new Person( "p2",
"stilton",
30 );
p2.setStatus( "europe" );
- final FactHandle c2FactHandle = workingMemory.assertObject( p2 );
+ final FactHandle c2FactHandle = workingMemory.insert( p2 );
final Person p3 = new Person( "p3",
"stilton",
40 );
p3.setStatus( "europe" );
- final FactHandle c3FactHandle = workingMemory.assertObject( p3 );
+ final FactHandle c3FactHandle = workingMemory.insert( p3 );
workingMemory.fireAllRules();
// all 3 in europe, so, 2 cheese
@@ -631,7 +631,7 @@
// europe=[ 1, 2 ], america=[ 3 ]
p3.setStatus( "america" );
- workingMemory.modifyObject( c3FactHandle,
+ workingMemory.update( c3FactHandle,
p3 );
workingMemory.fireAllRules();
cheeseList = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( Cheese.class) ) );
@@ -640,7 +640,7 @@
// europe=[ 1 ], america=[ 2, 3 ]
p2.setStatus( "america" );
- workingMemory.modifyObject( c2FactHandle,
+ workingMemory.update( c2FactHandle,
p2 );
workingMemory.fireAllRules();
cheeseList = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( Cheese.class) ) );
@@ -649,7 +649,7 @@
// europe=[ ], america=[ 1, 2, 3 ]
p1.setStatus( "america" );
- workingMemory.modifyObject( c1FactHandle,
+ workingMemory.update( c1FactHandle,
p1 );
workingMemory.fireAllRules();
cheeseList = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( Cheese.class) ) );
@@ -658,7 +658,7 @@
// europe=[ 2 ], america=[ 1, 3 ]
p2.setStatus( "europe" );
- workingMemory.modifyObject( c2FactHandle,
+ workingMemory.update( c2FactHandle,
p2 );
workingMemory.fireAllRules();
cheeseList = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( Cheese.class) ) );
@@ -667,7 +667,7 @@
// europe=[ 1, 2 ], america=[ 3 ]
p1.setStatus( "europe" );
- workingMemory.modifyObject( c1FactHandle,
+ workingMemory.update( c1FactHandle,
p1 );
workingMemory.fireAllRules();
cheeseList = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( Cheese.class) ) );
@@ -676,7 +676,7 @@
// europe=[ 1, 2, 3 ], america=[ ]
p3.setStatus( "europe" );
- workingMemory.modifyObject( c3FactHandle,
+ workingMemory.update( c3FactHandle,
p3 );
workingMemory.fireAllRules();
cheeseList = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( Cheese.class) ) );
@@ -684,9 +684,9 @@
cheeseList.size() );
}
- public void testLogicalAssertions3() throws Exception {
+ public void testLogicalInsertions3() throws Exception {
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_logicalAssertions3.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_logicalInsertions3.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -700,7 +700,7 @@
// asserting the sensor object
final Sensor sensor = new Sensor( 150,
100 );
- final FactHandle sensorHandle = workingMemory.assertObject( sensor );
+ final FactHandle sensorHandle = workingMemory.insert( sensor );
workingMemory.fireAllRules();
@@ -712,7 +712,7 @@
// modifying sensor
sensor.setTemperature( 125 );
- workingMemory.modifyObject( sensorHandle,
+ workingMemory.update( sensorHandle,
sensor );
workingMemory.fireAllRules();
@@ -724,7 +724,7 @@
// modifying sensor
sensor.setTemperature( 80 );
- workingMemory.modifyObject( sensorHandle,
+ workingMemory.update( sensorHandle,
sensor );
workingMemory.fireAllRules();
@@ -735,10 +735,10 @@
IteratorToList.convert( workingMemory.iterateObjects() ).size() );
}
- public void testLogicalAssertionsAccumulatorPattern() throws Exception {
+ public void testLogicalInsertionsAccumulatorPattern() throws Exception {
// JBRULES-449
final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsAccumulatorPattern.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsAccumulatorPattern.drl" ) ) );
final Package pkg = builder.getPackage();
final RuleBase ruleBase = getRuleBase();
@@ -752,7 +752,7 @@
workingMemory.fireAllRules();
List l;
- final FactHandle h = workingMemory.assertObject( new Integer( 6 ) );
+ final FactHandle h = workingMemory.insert( new Integer( 6 ) );
assertEquals( 1,
IteratorToList.convert( workingMemory.iterateObjects() ).size() );
@@ -761,7 +761,7 @@
assertEquals( "There should be 2 CheeseEqual in Working Memory, 1 justified, 1 stated", 2, l.size() );
assertEquals( 6, IteratorToList.convert( workingMemory.iterateObjects() ).size() );
- workingMemory.retractObject( h );
+ workingMemory.retract( h );
l = IteratorToList.convert( workingMemory.iterateObjects( new ClassObjectFilter( CheeseEqual.class) ) );
assertEquals( "There should be only 1 CheeseEqual in Working Memory, 1 stated (the justified should have been retracted). Check TruthMaintenanceSystem justifiedMap", 1, l.size() );
l = IteratorToList.convert( workingMemory.iterateObjects(new ClassObjectFilter( Short.class) ) );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -68,7 +68,7 @@
final long start = System.currentTimeMillis();
final Stage stage = new Stage( Stage.DUPLICATE );
- workingMemory.assertObject( stage );
+ workingMemory.insert( stage );
workingMemory.fireAllRules();
final long end = System.currentTimeMillis();
@@ -113,7 +113,7 @@
if ( m.matches() ) {
final Line l = new Line( Integer.parseInt( m.group( 1 ) ),
Integer.parseInt( m.group( 2 ) ) );
- wm.assertObject( l );
+ wm.insert( l );
}
line = reader.readLine();
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixerTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixerTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -25,77 +25,77 @@
private static final KnowledgeHelperFixer fixer = new KnowledgeHelperFixer();
public void testAdd__Handle__Simple() {
- String result = KnowledgeHelperFixerTest.fixer.fix( "modify(myObject );" );
- assertEquals( "drools.modifyObject( myObject );",
+ String result = KnowledgeHelperFixerTest.fixer.fix( "update(myObject );" );
+ assertEquals( "drools.update( myObject );",
result );
- result = KnowledgeHelperFixerTest.fixer.fix( "modify ( myObject );" );
- assertEquals( "drools.modifyObject( myObject );",
+ result = KnowledgeHelperFixerTest.fixer.fix( "update ( myObject );" );
+ assertEquals( "drools.update( myObject );",
result );
}
public void testAdd__Handle__withNewLines() {
- final String result = KnowledgeHelperFixerTest.fixer.fix( "\n\t\n\tmodify(myObject );" );
- assertEquals( "\n\t\n\tdrools.modifyObject( myObject );",
+ final String result = KnowledgeHelperFixerTest.fixer.fix( "\n\t\n\tupdate(myObject );" );
+ assertEquals( "\n\t\n\tdrools.update( myObject );",
result );
}
public void testAdd__Handle__rComplex() {
- String result = KnowledgeHelperFixerTest.fixer.fix( "something modify(myObject ); other" );
- assertEquals( "something drools.modifyObject( myObject ); other",
+ String result = KnowledgeHelperFixerTest.fixer.fix( "something update(myObject ); other" );
+ assertEquals( "something drools.update( myObject ); other",
result );
- result = KnowledgeHelperFixerTest.fixer.fix( "something modify (myObject );" );
- assertEquals( "something drools.modifyObject( myObject );",
+ result = KnowledgeHelperFixerTest.fixer.fix( "something update (myObject );" );
+ assertEquals( "something drools.update( myObject );",
result );
- result = KnowledgeHelperFixerTest.fixer.fix( " modify(myObject ); x" );
- assertEquals( " drools.modifyObject( myObject ); x",
+ result = KnowledgeHelperFixerTest.fixer.fix( " update(myObject ); x" );
+ assertEquals( " drools.update( myObject ); x",
result );
//should not touch, as it is not a stand alone word
- result = KnowledgeHelperFixerTest.fixer.fix( "xxmodify(myObject ) x" );
- assertEquals( "xxmodify(myObject ) x",
+ result = KnowledgeHelperFixerTest.fixer.fix( "xxupdate(myObject ) x" );
+ assertEquals( "xxupdate(myObject ) x",
result );
}
public void testMultipleMatches() {
- String result = KnowledgeHelperFixerTest.fixer.fix( "modify(myObject); modify(myObject );" );
- assertEquals( "drools.modifyObject( myObject ); drools.modifyObject( myObject );",
+ String result = KnowledgeHelperFixerTest.fixer.fix( "update(myObject); update(myObject );" );
+ assertEquals( "drools.update( myObject ); drools.update( myObject );",
result );
- result = KnowledgeHelperFixerTest.fixer.fix( "xxx modify(myObject ); modify(myObject ); modify(yourObject ); yyy" );
- assertEquals( "xxx drools.modifyObject( myObject ); drools.modifyObject( myObject ); drools.modifyObject( yourObject ); yyy",
+ result = KnowledgeHelperFixerTest.fixer.fix( "xxx update(myObject ); update(myObject ); update(yourObject ); yyy" );
+ assertEquals( "xxx drools.update( myObject ); drools.update( myObject ); drools.update( yourObject ); yyy",
result );
}
public void testAssert() {
- final String raw = "some code; assert(new String(\"foo\"));\n More();";
- final String result = "some code; drools.assertObject(new String(\"foo\"));\n More();";
+ final String raw = "some code; insert(new String(\"foo\"));\n More();";
+ final String result = "some code; drools.insert(new String(\"foo\"));\n More();";
assertEquals( result,
KnowledgeHelperFixerTest.fixer.fix( raw ) );
}
public void testAssertLogical() {
- final String raw = "some code; assertLogical(new String(\"foo\"));\n More();";
- final String result = "some code; drools.assertLogicalObject(new String(\"foo\"));\n More();";
+ final String raw = "some code; insertLogical(new String(\"foo\"));\n More();";
+ final String result = "some code; drools.insertLogical(new String(\"foo\"));\n More();";
assertEquals( result,
KnowledgeHelperFixerTest.fixer.fix( raw ) );
}
public void testAllActionsMushedTogether() {
- String result = KnowledgeHelperFixerTest.fixer.fix( "assert(myObject ); modify(ourObject);\t retract(herObject);" );
- assertEquals( "drools.assertObject(myObject ); drools.modifyObject( ourObject );\t drools.retractObject( herObject );",
+ String result = KnowledgeHelperFixerTest.fixer.fix( "insert(myObject ); update(ourObject);\t retract(herObject);" );
+ assertEquals( "drools.insert(myObject ); drools.update( ourObject );\t drools.retract( herObject );",
result );
- result = KnowledgeHelperFixerTest.fixer.fix( "assert(myObject ); modify(ourObject);\t retract(herObject);\nassert(myObject); modify(ourObject);\t retract(herObject);" );
- assertEquals( "drools.assertObject(myObject ); drools.modifyObject( ourObject );\t drools.retractObject( herObject);\ndrools.assertObject(myObject); drools.modifyObject( ourObject );\t drools.retractObject( herObject );",
+ result = KnowledgeHelperFixerTest.fixer.fix( "insert(myObject ); update(ourObject);\t retract(herObject);\ninsert(myObject); update(ourObject);\t retract(herObject);" );
+ assertEquals( "drools.insert(myObject ); drools.update( ourObject );\t drools.retract( herObject);\ndrools.insert(myObject); drools.update( ourObject );\t drools.retract( herObject );",
result );
}
public void testLeaveLargeAlone() {
- final String original = "yeah yeah yeah massert( xxx ) this is a long() thing Person (name=='drools') modify a thing";
+ final String original = "yeah yeah yeah minsert( xxx ) this is a long() thing Person (name=='drools') modify a thing";
final String result = KnowledgeHelperFixerTest.fixer.fix( original );
assertEquals( original,
result );
@@ -109,20 +109,20 @@
}
public void testLeaveAssertAlone() {
- final String original = "drools.assertObject(foo)";
+ final String original = "drools.insert(foo)";
assertEquals( original,
KnowledgeHelperFixerTest.fixer.fix( original ) );
}
public void testLeaveAssertLogicalAlone() {
- final String original = "drools.assertLogicalObject(foo)";
+ final String original = "drools.insertLogical(foo)";
assertEquals( original,
KnowledgeHelperFixerTest.fixer.fix( original ) );
}
public void testWackyAssert() {
- final String raw = "System.out.println($person1.getName() + \" and \" + $person2.getName() +\" are sisters\");\n" + "assert($person1.getName(\"foo\") + \" and \" + $person2.getName() +\" are sisters\"); yeah();";
- final String expected = "System.out.println($person1.getName() + \" and \" + $person2.getName() +\" are sisters\");\n" + "drools.assertObject($person1.getName(\"foo\") + \" and \" + $person2.getName() +\" are sisters\"); yeah();";
+ final String raw = "System.out.println($person1.getName() + \" and \" + $person2.getName() +\" are sisters\");\n" + "insert($person1.getName(\"foo\") + \" and \" + $person2.getName() +\" are sisters\"); yeah();";
+ final String expected = "System.out.println($person1.getName() + \" and \" + $person2.getName() +\" are sisters\");\n" + "drools.insert($person1.getName(\"foo\") + \" and \" + $person2.getName() +\" are sisters\"); yeah();";
assertEquals( expected,
KnowledgeHelperFixerTest.fixer.fix( raw ) );
@@ -130,8 +130,8 @@
}
public void testMoreAssertCraziness() {
- final String raw = "foobar(); (assert(new String(\"blah\").get()); bangBangYudoHono();)";
- assertEquals( "foobar(); (drools.assertObject(new String(\"blah\").get()); bangBangYudoHono();)",
+ final String raw = "foobar(); (insert(new String(\"blah\").get()); bangBangYudoHono();)";
+ assertEquals( "foobar(); (drools.insert(new String(\"blah\").get()); bangBangYudoHono();)",
KnowledgeHelperFixerTest.fixer.fix( raw ) );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -74,7 +74,7 @@
final Cheese cheddar = new Cheese( "cheddar",
10 );
- final InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
+ final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
final ReteTuple tuple = new ReteTuple( f0 );
final AgendaItem item = new AgendaItem( 0,
@@ -83,8 +83,8 @@
null,
context.getRule(),
null );
- final DefaultKnowledgeHelper kbHelper = new DefaultKnowledgeHelper( item,
- wm );
+ final DefaultKnowledgeHelper kbHelper = new DefaultKnowledgeHelper( wm );
+ kbHelper.setActivation( item );
context.getRule().getConsequence().evaluate( kbHelper,
wm );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -75,14 +75,14 @@
final Cheese cheddar = new Cheese( "cheddar",
10 );
- final InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
+ final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
final ReteTuple tuple = new ReteTuple( f0 );
assertTrue( eval.isAllowed( tuple,
wm ) );
cheddar.setPrice( 9 );
- wm.modifyObject( f0,
+ wm.update( f0,
cheddar );
assertFalse( eval.isAllowed( tuple,
wm ) );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -105,7 +105,7 @@
final Cheese cheddar = new Cheese( "cheddar",
10 );
- final InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
+ final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
final ReteTuple tuple = new ReteTuple( f0 );
final PredicateContextEntry predicateContext = new PredicateContextEntry();
@@ -115,7 +115,7 @@
stilton ) );
cheddar.setPrice( 9 );
- wm.modifyObject( f0,
+ wm.update( f0,
cheddar );
assertFalse( predicate.isAllowedCachedLeft( predicateContext,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -113,10 +113,10 @@
final Cheese cheddar = new Cheese( "cheddar",
10 );
- final InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
+ final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
ReteTuple tuple = new ReteTuple( f0 );
- final InternalFactHandle f1 = (InternalFactHandle) wm.assertObject( stilton );
+ final InternalFactHandle f1 = (InternalFactHandle) wm.insert( stilton );
tuple = new ReteTuple( tuple,
f1 );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2007-06-13 02:46:39 UTC (rev 12524)
@@ -72,7 +72,7 @@
final WorkingMemory wm = ruleBase.newStatefulSession();
final Person p = new Person("mark", "", 31);
- final InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( p );
+ final InternalFactHandle f0 = (InternalFactHandle) wm.insert( p );
final ReteTuple tuple = new ReteTuple( f0 );
SalienceBuilder salienceBuilder = new MVELSalienceBuilder();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/assert_retract.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/assert_retract.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/assert_retract.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -11,7 +11,7 @@
then
list.add("first");
p.setStatus("next");
- modify(p);
+ update(p);
end
rule "second"
@@ -20,7 +20,7 @@
then
list.add("second");
p.setStatus("final");
- modify(p);
+ update(p);
end
rule "third"
@@ -36,7 +36,7 @@
not Person()
then
list.add("fourth");
- assert(new Cheese("stilton", 42));
+ insert(new Cheese("stilton", 42));
end
rule "fifth"
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/evalmodify.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/evalmodify.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/evalmodify.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -11,5 +11,5 @@
then
System.out.println("setting value to " + (value2 + 1));
cell2.setValue(value2 + 1);
- modify(cell2);
+ update(cell2);
end
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/no-loop.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/no-loop.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/no-loop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -13,5 +13,5 @@
if ( list.size() > 2 ) {
throw new Exception( "this should not loop" );
}
- modify( cheese );
+ update( cheese );
end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Assert_Retract_Noloop.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Assert_Retract_Noloop.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Assert_Retract_Noloop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,25 +0,0 @@
-package org.drools.test;
-
-import org.drools.Cheese;
-
-rule "test1"
- salience 10
- no-loop true
- when
- cheese : Cheese();
- then
- retract(cheese);
- assert(cheese);
-end
-
-
-rule "test2"
- salience 0
- no-loop true
- when
- cheese : Cheese();
- then
- retract(cheese);
-end
-
-
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_DynamicRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_DynamicRules.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_DynamicRules.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -9,6 +9,6 @@
then
c.setPrice( 30 );
retract(a);
- modify(c);
+ update(c);
end
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_DynamicRules2.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_DynamicRules2.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_DynamicRules2.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -6,7 +6,7 @@
a: FactA(s:field1, i:field2, f:field3)
not FactC(f1==s)
then
- assert(s != null ? new FactC(s, i, f) :
+ insert(s != null ? new FactC(s, i, f) :
new FactC());
end
@@ -18,5 +18,5 @@
then
c.setF3(f);
retract(b);
- modify(c);
+ update(c);
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FactBindings.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FactBindings.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FactBindings.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -8,6 +8,6 @@
when
$person : Person( name == "big cheese", $cheese : cheese )
then
- modify( $cheese );
- modify( $person );
+ update( $cheese );
+ update( $person );
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FireRuleAfterDuration.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FireRuleAfterDuration.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FireRuleAfterDuration.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -10,7 +10,7 @@
cheese : Cheese( $type:type == "brie" )
then
list.add( cheese );
- assert(new Cheese("stilton", 42));
+ insert(new Cheese("stilton", 42));
retract(cheese);
end
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Insert_Retract_Noloop.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Assert_Retract_Noloop.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Insert_Retract_Noloop.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Insert_Retract_Noloop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,25 @@
+package org.drools.test;
+
+import org.drools.Cheese;
+
+rule "test1"
+ salience 10
+ no-loop true
+ when
+ cheese : Cheese();
+ then
+ retract(cheese);
+ insert(cheese);
+end
+
+
+rule "test2"
+ salience 0
+ no-loop true
+ when
+ cheese : Cheese();
+ then
+ retract(cheese);
+end
+
+
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_JoinNodeModifyObject.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_JoinNodeModifyObject.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_JoinNodeModifyObject.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -31,8 +31,8 @@
errors.add("{2} Shouldn't fire for: " + n1 + " " + n2);
}
swap(n1, n2);
- modify(n1);
- modify(n2);
+ update(n1);
+ update(n2);
end
rule "Debug"
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_JoinNodeModifyTuple.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_JoinNodeModifyTuple.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_JoinNodeModifyTuple.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -28,7 +28,7 @@
cl.time = $time;
cl.distance = new Float( distance );
cl.bearing = new Float( 144.9 );
- assert( cl );
+ insert( cl );
}
end
@@ -56,7 +56,7 @@
a.time2 = $time2;
a.bearing = $bearing;
a.bearing2 = $bearing2;
- assert( a );
+ insert( a );
retract( $cls1 );
end
@@ -69,7 +69,7 @@
$app.distance2 = $distance3;
$app.bearing2 = $bearing3;
$app.time2 = $time3;
- modify( $app );
+ update( $app );
end
rule "Danger Distance Warning"
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LockOnActiveWithModify.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LockOnActiveWithModify.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LockOnActiveWithModify.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,27 +0,0 @@
-package org.drools.test;
-
-import org.drools.Person;
-import org.drools.Cheese;
-
-global java.util.List list;
-
-rule "test lock with modify"
- agenda-group "group1"
- lock-on-active true
- when
- $cheese : Cheese( price < 30 )
- $person : Person( cheese == $cheese )
- then
- list.add( $person );
-end
-
-rule "test group2 ruleflow2"
- agenda-group "group2"
- ruleflow-group "ruleflow2"
- lock-on-active true
- when
- $cheese : Cheese( price < 30 )
- $person : Person( cheese == $cheese )
- then
- list.add( $person );
-end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LockOnActiveWithUpdate.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LockOnActiveWithModify.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LockOnActiveWithUpdate.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LockOnActiveWithUpdate.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,27 @@
+package org.drools.test;
+
+import org.drools.Person;
+import org.drools.Cheese;
+
+global java.util.List list;
+
+rule "test lock with modify"
+ agenda-group "group1"
+ lock-on-active true
+ when
+ $cheese : Cheese( price < 30 )
+ $person : Person( cheese == $cheese )
+ then
+ list.add( $person );
+end
+
+rule "test group2 ruleflow2"
+ agenda-group "group2"
+ ruleflow-group "ruleflow2"
+ lock-on-active true
+ when
+ $cheese : Cheese( price < 30 )
+ $person : Person( cheese == $cheese )
+ then
+ list.add( $person );
+end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionWithExists.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionWithExists.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionWithExists.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,9 +0,0 @@
-package org.drools
-
-rule "Supply cheese for for every person when there already exists someone of the same status and they are older"
- when
- p : Person($status : status, $age : age)
- exists Person(status == $status, age > $age);
- then
- assertLogical(new Cheese("Cheese for person with age " + $age, 0));
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,29 +0,0 @@
-package org.drools.test;
-
-import org.drools.Cheese;
-import org.drools.Person;
-
-global java.util.List list;
-
-rule justifier1
- when
- cheese : Cheese( type == "brie" )
- then
- assertLogical( new Person( "jane" ) );
- list.add( cheese );
-end
-
-rule justifier2
- when
- cheese : Cheese( type == "provolone" )
- then
- assertLogical( new Person( "jane" ) );
- list.add( cheese );
-end
-
-rule justified
- when
- person : Person( )
- then
- list.add( person );
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions2.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions2.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions2.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,53 +0,0 @@
-package org.drools.test;
-
-import org.drools.Alarm;
-import org.drools.EmergencyTeam;
-import org.drools.Sensor;
-
-global java.util.List events;
-
-rule "Everything is Normal"
- when
- not Alarm( )
- then
- events.add("Everything is Normal");
-end
-
-rule "Problem detected"
- salience 10
- when
- sensor : ( Sensor( temperature > 100 ) or Sensor( pressure > 150 ) )
- then
- events.add( "Problem detected: "+sensor.toString() );
- assertLogical( new Alarm( "Call emergency team" ) );
-end
-
-rule "Call Emergency Team"
- when
- Alarm ( )
- then
- events.add( "Calling Emergency Team" );
- assertLogical( new EmergencyTeam() );
-end
-
-rule "Emergency Team solves temperature"
- salience 20
- when
- EmergencyTeam()
- sensor : Sensor( temperature > 100 )
- then
- events.add( "Solving temperature problem" );
- sensor.setTemperature(80);
- modify(sensor);
-end
-
-rule "Emergency Team solves pressure"
- salience 20
- when
- EmergencyTeam()
- sensor : Sensor( pressure > 150 )
- then
- events.add( "Solving pressure problem" );
- sensor.setPressure(80);
- modify(sensor);
-end
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsAccumulatorPattern.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsAccumulatorPattern.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsAccumulatorPattern.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,63 +0,0 @@
-package org.drools.test;
-
-import java.lang.Integer;
-import java.lang.Float;
-import java.lang.Double;
-import java.lang.Short;
-import java.lang.String;
-import org.drools.CheeseEqual;
-
-global java.lang.String ga;
-global java.lang.String gb;
-global java.lang.Short gs;
-
-rule "assert-item"
- when
- i : Integer()
- then
- assertLogical(new Double(2.0));
-end
-
-rule "kickstart-accumulation"
- when
- i : Integer()
- then
- assertLogical(new Float(1.0));
-end
-
-rule "item qualifies"
- when
- d : Double()
- f : Float()
- then
- //assert(new Short((short)3));
- assert(gs);
- assertLogical(new CheeseEqual(ga, 4));
-end
-
-rule "accumulate item"
- when
- f : Float()
- s : Short()
- c : CheeseEqual(type == (ga), price == 4)
- not CheeseEqual(type == (gb), price == 5)
- then
- modify(f);
- assert(new CheeseEqual(gb, 5));
-end
-
-rule "clean-up-1"
- when
- s : Short()
- not Float()
- then
- retract(s);
-end
-
-rule "clean-up-2"
- when
- c : CheeseEqual(type == (gb), price == 5)
- not Float()
- then
- retract(c);
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsBacking.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsBacking.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsBacking.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,10 +0,0 @@
-package org.drools.test;
-
-import org.drools.Cheese;
-
-rule "Cheese => type"
- when
- Cheese( type : type )
- then
- assertLogical( type );
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,12 +0,0 @@
-package org.drools.test;
-
-import org.drools.Person;
-import org.drools.Cheese;
-
-rule "rule1"
- when
- Cheese( type : type, price : price -> (price > 1))
- #Cheese( type : type, price > 1 )
- then
- assertLogical( new Person( type ) );
-end
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,12 +0,0 @@
-package org.drools.test2;
-
-import org.drools.Person;
-import org.drools.Cheese;
-
-rule "rule2"
- when
- Cheese( type : type, price : price -> (price < 3))
- #Cheese( type : type, price < 3)
- then
- assertLogical( new Person( type ) );
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsLoop.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsLoop.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsLoop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,18 +0,0 @@
-package org.drools.test;
-
-import org.drools.Person;
-import java.util.List;
-
-global Person a;
-global List l;
-
-rule "r"
- when
- not Person()
- then
- if (l.size() < 10)
- {
- l.add(new Integer(0));
- assertLogical( a );
- }
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsModifyEqual.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsModifyEqual.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsModifyEqual.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,20 +0,0 @@
-package org.drools.test;
-
-import org.drools.Person
-import org.drools.CheeseEqual;
-
-rule "assert"
- when
- p : Person()
- then
- assertLogical( new CheeseEqual( p.getName(), p.getAge() ) );
-end
-
-rule "modify"
- no-loop true
- when
- c : CheeseEqual(price == 2)
- then
- c.setPrice(c.getPrice() + 1);
- modify(c);
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNoLoop.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNoLoop.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNoLoop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,20 +0,0 @@
-package org.drools.test;
-
-import org.drools.Person;
-import java.util.List;
-
-global Person a;
-global List l;
-
-rule "r"
- no-loop true
- when
- not Person()
- then
- l.add(new Person("0"));
- if (l.size() > 2)
- {
- throw new Exception( "this should not loop" );
- }
- assertLogical( a );
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNot.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNot.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNot.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,13 +0,0 @@
-package org.drools.test;
-
-import org.drools.Cheese
-import org.drools.Person
-
-global Cheese cheese
-
-rule "r"
- when
- not Person()
- then
- assertLogical(cheese);
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNotPingPong.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNotPingPong.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNotPingPong.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,28 +0,0 @@
-package org.drools.test;
-
-import java.util.List;
-import org.drools.Person
-import org.drools.Cheese
-
-global Cheese cheese;
-global Person person;
-global java.util.List list;
-
-rule "not person then cheese"
- when
- not Person()
- then
- if (list.size() < 10) {
- list.add(new Integer(0));
- assertLogical( cheese );
- }
-end
-rule "if cheese then person"
- when
- Cheese()
- then
- if (list.size() < 10) {
- list.add(new Integer(0));
- assertLogical( person );
- }
-end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsSelfreferencing.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsSelfreferencing.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsSelfreferencing.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,13 +0,0 @@
-package org.drools.test;
-
-import org.drools.Person;
-
-global Person b;
-
-
-rule "Person => b"
- when
- s : Person()
- then
- assertLogical( b );
-end
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsWithModify.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsWithModify.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsWithModify.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,21 +0,0 @@
-package org.drools.test;
-
-import org.drools.Person
-import org.drools.CheeseEqual;
-
-rule "assert"
- salience 10
- when
- p : Person( name == "person" )
- then
- assertLogical( new CheeseEqual( p.getName(), p.getAge() ) );
-end
-
-rule "modify"
- no-loop true
- when
- p : Person( name == "person" )
- c : CheeseEqual(price == 2)
- then
- modify( p );
-end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionWithExists.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionWithExists.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionWithExists.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionWithExists.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,9 @@
+package org.drools
+
+rule "Supply cheese for for every person when there already exists someone of the same status and they are older"
+ when
+ p : Person($status : status, $age : age)
+ exists Person(status == $status, age > $age);
+ then
+ insertLogical(new Cheese("Cheese for person with age " + $age, 0));
+end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertions.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertions.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertions.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,29 @@
+package org.drools.test;
+
+import org.drools.Cheese;
+import org.drools.Person;
+
+global java.util.List list;
+
+rule justifier1
+ when
+ cheese : Cheese( type == "brie" )
+ then
+ insertLogical( new Person( "jane" ) );
+ list.add( cheese );
+end
+
+rule justifier2
+ when
+ cheese : Cheese( type == "provolone" )
+ then
+ insertLogical( new Person( "jane" ) );
+ list.add( cheese );
+end
+
+rule justified
+ when
+ person : Person( )
+ then
+ list.add( person );
+end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertions2.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertions2.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertions2.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertions2.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,53 @@
+package org.drools.test;
+
+import org.drools.Alarm;
+import org.drools.EmergencyTeam;
+import org.drools.Sensor;
+
+global java.util.List events;
+
+rule "Everything is Normal"
+ when
+ not Alarm( )
+ then
+ events.add("Everything is Normal");
+end
+
+rule "Problem detected"
+ salience 10
+ when
+ sensor : ( Sensor( temperature > 100 ) or Sensor( pressure > 150 ) )
+ then
+ events.add( "Problem detected: "+sensor.toString() );
+ insertLogical( new Alarm( "Call emergency team" ) );
+end
+
+rule "Call Emergency Team"
+ when
+ Alarm ( )
+ then
+ events.add( "Calling Emergency Team" );
+ insertLogical( new EmergencyTeam() );
+end
+
+rule "Emergency Team solves temperature"
+ salience 20
+ when
+ EmergencyTeam()
+ sensor : Sensor( temperature > 100 )
+ then
+ events.add( "Solving temperature problem" );
+ sensor.setTemperature(80);
+ update(sensor);
+end
+
+rule "Emergency Team solves pressure"
+ salience 20
+ when
+ EmergencyTeam()
+ sensor : Sensor( pressure > 150 )
+ then
+ events.add( "Solving pressure problem" );
+ sensor.setPressure(80);
+ update(sensor);
+end
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsAccumulatorPattern.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsAccumulatorPattern.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsAccumulatorPattern.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsAccumulatorPattern.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,63 @@
+package org.drools.test;
+
+import java.lang.Integer;
+import java.lang.Float;
+import java.lang.Double;
+import java.lang.Short;
+import java.lang.String;
+import org.drools.CheeseEqual;
+
+global java.lang.String ga;
+global java.lang.String gb;
+global java.lang.Short gs;
+
+rule "assert-item"
+ when
+ i : Integer()
+ then
+ insertLogical(new Double(2.0));
+end
+
+rule "kickstart-accumulation"
+ when
+ i : Integer()
+ then
+ insertLogical(new Float(1.0));
+end
+
+rule "item qualifies"
+ when
+ d : Double()
+ f : Float()
+ then
+ //assert(new Short((short)3));
+ insert(gs);
+ insertLogical(new CheeseEqual(ga, 4));
+end
+
+rule "accumulate item"
+ when
+ f : Float()
+ s : Short()
+ c : CheeseEqual(type == (ga), price == 4)
+ not CheeseEqual(type == (gb), price == 5)
+ then
+ update(f);
+ insert(new CheeseEqual(gb, 5));
+end
+
+rule "clean-up-1"
+ when
+ s : Short()
+ not Float()
+ then
+ retract(s);
+end
+
+rule "clean-up-2"
+ when
+ c : CheeseEqual(type == (gb), price == 5)
+ not Float()
+ then
+ retract(c);
+end
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsBacking.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsBacking.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsBacking.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,10 @@
+package org.drools.test;
+
+import org.drools.Cheese;
+
+rule "Cheese => type"
+ when
+ Cheese( type : type )
+ then
+ insertLogical( type );
+end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsDynamicRule.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsDynamicRule.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsDynamicRule.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,12 @@
+package org.drools.test;
+
+import org.drools.Person;
+import org.drools.Cheese;
+
+rule "rule1"
+ when
+ Cheese( type : type, price : price -> (price > 1))
+ #Cheese( type : type, price > 1 )
+ then
+ insertLogical( new Person( type ) );
+end
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsDynamicRule2.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsDynamicRule2.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsDynamicRule2.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,12 @@
+package org.drools.test2;
+
+import org.drools.Person;
+import org.drools.Cheese;
+
+rule "rule2"
+ when
+ Cheese( type : type, price : price -> (price < 3))
+ #Cheese( type : type, price < 3)
+ then
+ insertLogical( new Person( type ) );
+end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsLoop.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsLoop.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsLoop.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsLoop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,18 @@
+package org.drools.test;
+
+import org.drools.Person;
+import java.util.List;
+
+global Person a;
+global List l;
+
+rule "r"
+ when
+ not Person()
+ then
+ if (l.size() < 10)
+ {
+ l.add(new Integer(0));
+ insertLogical( a );
+ }
+end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNoLoop.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNoLoop.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNoLoop.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNoLoop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,20 @@
+package org.drools.test;
+
+import org.drools.Person;
+import java.util.List;
+
+global Person a;
+global List l;
+
+rule "r"
+ no-loop true
+ when
+ not Person()
+ then
+ l.add(new Person("0"));
+ if (l.size() > 2)
+ {
+ throw new Exception( "this should not loop" );
+ }
+ insertLogical( a );
+end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNot.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNot.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNot.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNot.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,13 @@
+package org.drools.test;
+
+import org.drools.Cheese
+import org.drools.Person
+
+global Cheese cheese
+
+rule "r"
+ when
+ not Person()
+ then
+ insertLogical(cheese);
+end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNotPingPong.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNotPingPong.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNotPingPong.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsNotPingPong.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,28 @@
+package org.drools.test;
+
+import java.util.List;
+import org.drools.Person
+import org.drools.Cheese
+
+global Cheese cheese;
+global Person person;
+global java.util.List list;
+
+rule "not person then cheese"
+ when
+ not Person()
+ then
+ if (list.size() < 10) {
+ list.add(new Integer(0));
+ insertLogical( cheese );
+ }
+end
+rule "if cheese then person"
+ when
+ Cheese()
+ then
+ if (list.size() < 10) {
+ list.add(new Integer(0));
+ insertLogical( person );
+ }
+end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsSelfreferencing.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsSelfreferencing.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsSelfreferencing.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsSelfreferencing.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,13 @@
+package org.drools.test;
+
+import org.drools.Person;
+
+global Person b;
+
+
+rule "Person => b"
+ when
+ s : Person()
+ then
+ insertLogical( b );
+end
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsUpdateEqual.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsModifyEqual.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsUpdateEqual.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsUpdateEqual.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,20 @@
+package org.drools.test;
+
+import org.drools.Person
+import org.drools.CheeseEqual;
+
+rule "assert"
+ when
+ p : Person()
+ then
+ insertLogical( new CheeseEqual( p.getName(), p.getAge() ) );
+end
+
+rule "modify"
+ no-loop true
+ when
+ c : CheeseEqual(price == 2)
+ then
+ c.setPrice(c.getPrice() + 1);
+ update(c);
+end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsWithUpdate.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsWithModify.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsWithUpdate.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalInsertionsWithUpdate.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,21 @@
+package org.drools.test;
+
+import org.drools.Person
+import org.drools.CheeseEqual;
+
+rule "assert"
+ salience 10
+ when
+ p : Person( name == "person" )
+ then
+ insertLogical( new CheeseEqual( p.getName(), p.getAge() ) );
+end
+
+rule "modify"
+ no-loop true
+ when
+ p : Person( name == "person" )
+ c : CheeseEqual(price == 2)
+ then
+ update( p );
+end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyActivationCreationNoLoop.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyActivationCreationNoLoop.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyActivationCreationNoLoop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,15 +0,0 @@
-package org.drools.test;
-
-import org.drools.Cheese;
-import org.drools.Person;
-
-rule "test1"
- no-loop true
- when
- cheese : Cheese( price == 15 )
- $p : Person( cheese == cheese )
- then
-
-end
-
-
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyNoloop.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyNoloop.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyNoloop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,25 +0,0 @@
-package org.drools.test;
-
-import org.drools.Cheese;
-
-rule "test1"
- salience 10
- no-loop true
- when
- cheese : Cheese( price == 15 )
- then
- modify(cheese);
-end
-
-
-rule "test2"
- salience 0
- no-loop true
- when
- cheese : Cheese( price == 15 )
- then
- cheese.setPrice( 14 );
- modify(cheese);
-end
-
-
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Query.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Query.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Query.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,14 +1,14 @@
package org.drools.integrationtests;
-import org.drools.AssertedObject;
+import org.drools.InsertedObject;
rule rule1
when
then
- assert( new AssertedObject( "value1") );
- assert( new AssertedObject( "value2") );
+ insert( new InsertedObject( "value1") );
+ insert( new InsertedObject( "value2") );
end
query "assertedobjquery"
- assertedobj : AssertedObject( value=="value1" )
+ assertedobj : InsertedObject( value=="value1" )
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_QueryWithParams.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_QueryWithParams.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_QueryWithParams.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,18 +1,18 @@
package org.drools.integrationtests;
-import org.drools.AssertedObject;
+import org.drools.InsertedObject;
rule rule1
when
then
- assert( new AssertedObject( "value1") );
- assert( new AssertedObject( "value2") );
+ insert( new InsertedObject( "value1") );
+ insert( new InsertedObject( "value2") );
end
query "assertedobjquery" ( $value )
- assertedobj : AssertedObject( value == $value )
+ assertedobj : InsertedObject( value == $value )
end
query "assertedobjquery2" ( $value1, String $value2 )
- assertedobj : AssertedObject( value == $value2 )
+ assertedobj : InsertedObject( value == $value2 )
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_RemovePackage.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_RemovePackage.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_RemovePackage.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,21 +1,21 @@
package org.drools;
import org.drools.Precondition;
-import org.drools.AssertedObject;
+import org.drools.InsertedObject;
rule rule1
salience 10
when
p: Precondition ( code == "genericcode")
then
- assert( new AssertedObject( "value1") );
- assert( new AssertedObject( "value2") );
+ insert( new InsertedObject( "value1") );
+ insert( new InsertedObject( "value2") );
end
rule rule2
when
p: Precondition ( code == "genericcode", value=="genericvalue")
then
- assert( new AssertedObject( "value3") );
- assert( new AssertedObject( "value4") );
+ insert( new InsertedObject( "value3") );
+ insert( new InsertedObject( "value4") );
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_RetractModifyWithFunction.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_RetractModifyWithFunction.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_RetractModifyWithFunction.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -14,7 +14,7 @@
then
Cheese x = getMin( $c1, $c2 );
x.setPrice( $c1.getPrice() + $c2.getPrice() );
- modify( x );
+ update( x );
// testing stuff after the ) ;
end
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Serializable.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Serializable.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Serializable.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -43,6 +43,6 @@
when
Person( name == "bob" )
then
- assertLogical ( new Person( "help" ) );
+ insertLogical ( new Person( "help" ) );
list.add( new Integer( 4 ) );
end
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_UpdateActivationCreationNoLoop.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyActivationCreationNoLoop.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_UpdateActivationCreationNoLoop.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_UpdateActivationCreationNoLoop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,15 @@
+package org.drools.test;
+
+import org.drools.Cheese;
+import org.drools.Person;
+
+rule "test1"
+ no-loop true
+ when
+ cheese : Cheese( price == 15 )
+ $p : Person( cheese == cheese )
+ then
+
+end
+
+
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_UpdateNoloop.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ModifyNoloop.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_UpdateNoloop.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_UpdateNoloop.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,25 @@
+package org.drools.test;
+
+import org.drools.Cheese;
+
+rule "test1"
+ salience 10
+ no-loop true
+ when
+ cheese : Cheese( price == 15 )
+ then
+ update(cheese);
+end
+
+
+rule "test2"
+ salience 0
+ no-loop true
+ when
+ cheese : Cheese( price == 15 )
+ then
+ cheese.setPrice( 14 );
+ update(cheese);
+end
+
+
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_logicalAssertions3.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_logicalAssertions3.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_logicalAssertions3.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -1,18 +0,0 @@
-package org.drools
-
-global java.util.List events;
-
-rule "#1: hot"
-when
- $s : Sensor( temperature > 100 )
-then
- events.add( "It is hot: " + $s );
- assertLogical(new Alarm("FIRE"));
-end
-
-rule "#2: print out"
-when
- Alarm( message == "FIRE" )
-then
- events.add( "Fire alarm is ON" );
-end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_logicalInsertions3.drl (from rev 12511, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_logicalAssertions3.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_logicalInsertions3.drl (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_logicalInsertions3.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -0,0 +1,18 @@
+package org.drools
+
+global java.util.List events;
+
+rule "#1: hot"
+when
+ $s : Sensor( temperature > 100 )
+then
+ events.add( "It is hot: " + $s );
+ insertLogical(new Alarm("FIRE"));
+end
+
+rule "#2: print out"
+when
+ Alarm( message == "FIRE" )
+then
+ events.add( "Fire alarm is ON" );
+end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/waltz/waltz.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/waltz/waltz.drl 2007-06-12 20:47:22 UTC (rev 12523)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/waltz/waltz.drl 2007-06-13 02:46:39 UTC (rev 12524)
@@ -14,26 +14,26 @@
when
$stage : Stage(value == Stage.START)
then
- assert (new Line( 122, 107));
- assert (new Line( 107, 2207));
- assert (new Line(2207, 3204));
- assert (new Line(3204, 6404));
- assert (new Line(2216, 2207));
- assert (new Line(3213, 3204));
- assert (new Line(2216, 3213));
- assert (new Line( 107, 2601));
- assert (new Line(2601, 7401));
- assert (new Line(6404, 7401));
- assert (new Line(3213, 6413));
- assert (new Line(6413, 6404));
- assert (new Line(7416, 7401));
- assert (new Line(5216, 6413));
- assert (new Line(2216, 5216));
- assert (new Line( 122, 5222));
- assert (new Line(5222, 7416));
- assert (new Line(5222, 5216));
+ insert (new Line( 122, 107));
+ insert (new Line( 107, 2207));
+ insert (new Line(2207, 3204));
+ insert (new Line(3204, 6404));
+ insert (new Line(2216, 2207));
+ insert (new Line(3213, 3204));
+ insert (new Line(2216, 3213));
+ insert (new Line( 107, 2601));
+ insert (new Line(2601, 7401));
+ insert (new Line(6404, 7401));
+ insert (new Line(3213, 6413));
+ insert (new Line(6413, 6404));
+ insert (new Line(7416, 7401));
+ insert (new Line(5216, 6413));
+ insert (new Line(2216, 5216));
+ insert (new Line( 122, 5222));
+ insert (new Line(5222, 7416));
+ insert (new Line(5222, 5216));
$stage.setValue(Stage.DUPLICATE);
- modify ( $stage );
+ update ( $stage );
//sysout.println("Waltz started");
//sysout.println("Stage: duplicate");
end
@@ -47,8 +47,8 @@
$line : Line ( $p1:p1, $p2:p2 )
then
//sysout.println("Draw "+$p1+" "+$p2);
- assert( new Edge ( $p1, $p2, false, Edge.NIL, false ) );
- assert( new Edge ( $p2, $p1, false, Edge.NIL, false ) );
+ insert( new Edge ( $p1, $p2, false, Edge.NIL, false ) );
+ insert( new Edge ( $p2, $p1, false, Edge.NIL, false ) );
retract( $line );
end
@@ -60,7 +60,7 @@
not ( Line() )
then
$stage.setValue ( Stage.DETECT_JUNCTIONS );
- modify($stage);
+ update($stage);
//sysout.println("reversing done");
end
@@ -77,13 +77,13 @@
$edge3: Edge( p1==$basePoint, $edge3P2:p2 != $edge1P2, p2 != $edge2P2, joined == false )
then
Junction junction = WaltzUtil.make_3_junction( $basePoint, $edge1P2, $edge2P2, $edge3P2 );
- assert( junction );
+ insert( junction );
$edge1.setJoined(true);
$edge2.setJoined(true);
$edge3.setJoined(true);
- modify( $edge1 );
- modify( $edge2 );
- modify( $edge3 );
+ update( $edge1 );
+ update( $edge2 );
+ update( $edge3 );
//sysout.println("make 3 junction");
end
@@ -96,11 +96,11 @@
$edge2: Edge( p1==$basePoint, $edge2P2:p2 != $edge1P2, joined == false )
not Edge( p1==$basePoint, p2 != $edge1P2, p2 != $edge2P2 )
then
- assert( new Junction($edge1P2, $edge2P2, 0, $basePoint, Junction.L) );
+ insert( new Junction($edge1P2, $edge2P2, 0, $basePoint, Junction.L) );
$edge1.setJoined(true);
$edge2.setJoined(true);
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("make L");
end
@@ -111,7 +111,7 @@
$stage : Stage ( value == Stage.DETECT_JUNCTIONS )
then
$stage.setValue( Stage.FIND_INITIAL_BOUNDARY );
- modify( $stage );
+ update( $stage );
//sysout.println("detecting done");
end
@@ -127,9 +127,9 @@
$edge1.setLabel( Edge.B );
$edge2.setLabel( Edge.B );
$stage.setValue( Stage.FIND_SECOND_BOUNDARY );
- modify( $edge1 );
- modify( $edge2 );
- modify( $stage );
+ update( $edge1 );
+ update( $edge2 );
+ update( $stage );
//sysout.println("\n\ninitial boundary junction L\n\n");
end
@@ -147,10 +147,10 @@
$edge2.setLabel( Edge.PLUS );
$edge3.setLabel( Edge.B );
$stage.setValue( Stage.FIND_SECOND_BOUNDARY );
- modify( $edge1 );
- modify( $edge2 );
- modify( $edge3 );
- modify( $stage );
+ update( $edge1 );
+ update( $edge2 );
+ update( $edge3 );
+ update( $stage );
//sysout.println("initial boundary junction arrow");
end
@@ -167,9 +167,9 @@
$edge1.setLabel( Edge.B );
$edge2.setLabel( Edge.B );
$stage.setValue( Stage.LABELING );
- modify( $edge1 );
- modify( $edge2 );
- modify( $stage );
+ update( $edge1 );
+ update( $edge2 );
+ update( $stage );
//sysout.println("second boundary junction L");
end
@@ -187,10 +187,10 @@
$edge2.setLabel( Edge.PLUS );
$edge3.setLabel( Edge.B );
$stage.setValue( Stage.LABELING );
- modify( $edge1 );
- modify( $edge2 );
- modify( $edge3 );
- modify( $stage );
+ update( $edge1 );
+ update( $edge2 );
+ update( $edge3 );
+ update( $stage );
//sysout.println("\n\nsecond boundary junction arrow\n\n");
end
@@ -205,8 +205,8 @@
$edge1.setPlotted( true );
$edge2.setLabel( $label );
$edge2.setPlotted( true );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("match edge - Plot "+$label+" "+$p1+" "+$p2);
end
@@ -225,7 +225,7 @@
$edge: Edge( p1 == $basePoint, p2 != $Edge1P2, label == Edge.NIL )
then
$edge.setLabel( Edge.B );
- modify( $edge );
+ update( $edge );
//sysout.println("Label L");
end
@@ -238,8 +238,8 @@
then
$edge1.setLabel( Edge.B );
$edge2.setLabel( Edge.B );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("Label tee A");
end
@@ -253,8 +253,8 @@
then
$edge1.setLabel( Edge.B );
$edge2.setLabel( Edge.B );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("Label tee B");
end
@@ -268,8 +268,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label fork 1");
end
@@ -282,7 +282,7 @@
$edge: Edge( p1 == $basePoint, p2 != $p1, p2 != $p2, label == Edge.NIL )
then
$edge.setLabel( Edge.B );
- modify( $edge );
+ update( $edge );
//sysout.println("label fork 2");
end
@@ -295,7 +295,7 @@
$edge: Edge( p1 == $basePoint, p2 != $p1, p2 != $p2, label == Edge.NIL )
then
$edge.setLabel( Edge.MINUS );
- modify( $edge );
+ update( $edge );
//sysout.println("label fork 3");
end
@@ -308,7 +308,7 @@
$edge: Edge( p1 == $basePoint, p2 != $p1, p2 != $p2, label == Edge.NIL )
then
$edge.setLabel( Edge.MINUS );
- modify( $edge );
+ update( $edge );
//sysout.println("label fork 4");
end
@@ -322,8 +322,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( $label );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 1A");
end
@@ -337,8 +337,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( $label );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 1B");
end
@@ -352,8 +352,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( $label );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 2A");
end
@@ -367,8 +367,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( $label );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 2B");
end
@@ -382,8 +382,8 @@
then
$edge1.setLabel( Edge.MINUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 3A");
end
@@ -397,8 +397,8 @@
then
$edge1.setLabel( Edge.MINUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 3B");
end
@@ -412,8 +412,8 @@
then
$edge1.setLabel( Edge.MINUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 4A");
end
@@ -427,8 +427,8 @@
then
$edge1.setLabel( Edge.MINUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 4B");
end
@@ -442,8 +442,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 5A");
end
@@ -457,8 +457,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
//sysout.println("label arrow 5B");
end
@@ -471,7 +471,7 @@
$stage: Stage( value == Stage.LABELING )
then
$stage.setValue( Stage.PLOT_REMAINING_EDGES );
- modify( $stage );
+ update( $stage );
//sysout.println("done labeling");
end
@@ -483,7 +483,7 @@
then
//sysout.println("Plot "+$label+" "+$p1+" "+$p2);
$edge.setPlotted( true );
- modify( $edge );
+ update( $edge );
end
# If we have been un able to label an edge, assume that it is a boundary.
@@ -496,7 +496,7 @@
then
//sysout.println("Plot B "+$p1+" "+$p2);
$edge.setPlotted( true );
- modify( $edge );
+ update( $edge );
end
# If there is no more work to do, then we are done and flag it.
@@ -505,6 +505,6 @@
$stage: Stage( value == Stage.PLOT_REMAINING_EDGES )
then
$stage.setValue( Stage.DONE );
- modify( $stage );
+ update( $stage );
//sysout.println("Stage: done");
end
More information about the jboss-svn-commits
mailing list