[jboss-svn-commits] JBL Code SVN: r32801 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/workflow/instance/node and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 10 15:32:14 EDT 2010
Author: KrisVerlaenen
Date: 2010-05-10 15:32:13 -0400 (Mon, 10 May 2010)
New Revision: 32801
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
Log:
- fixed issue where canceling a work item node in the on-exit action tried to abort a completed work item
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java 2010-05-10 17:30:03 UTC (rev 32800)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java 2010-05-10 19:32:13 UTC (rev 32801)
@@ -163,15 +163,137 @@
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
+ public void testHumanTaskCancel() {
+ PackageBuilder builder = new PackageBuilder();
+ Reader source = new StringReader(
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"flow\" id=\"org.drools.humantask\" package-name=\"org.drools\" version=\"1\" >\n" +
+ "\n" +
+ " <header>\n" +
+ " </header>\n" +
+ "\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <humanTask id=\"2\" name=\"HumanTask\" >\n" +
+ " <work name=\"Human Task\" >\n" +
+ " <parameter name=\"ActorId\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+ " <value>John Doe</value>\n" +
+ " </parameter>\n" +
+ " <parameter name=\"TaskName\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+ " <value>Do something</value>\n" +
+ " </parameter>\n" +
+ " <parameter name=\"Priority\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+ " </parameter>\n" +
+ " <parameter name=\"Comment\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+ " </parameter>\n" +
+ " </work>\n" +
+ " </humanTask>\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ "\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\" />\n" +
+ " <connection from=\"2\" to=\"3\" />\n" +
+ " </connections>\n" +
+ "\n" +
+ "</process>");
+ builder.addRuleFlow(source);
+ Package pkg = builder.getPackage();
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage( pkg );
+ WorkingMemory workingMemory = ruleBase.newStatefulSession();
+ TestWorkItemHandler handler = new TestWorkItemHandler();
+ workingMemory.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
+ ProcessInstance processInstance = ( ProcessInstance )
+ workingMemory.startProcess("org.drools.humantask");
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ WorkItem workItem = handler.getWorkItem();
+ assertNotNull(workItem);
+ processInstance.setState(ProcessInstance.STATE_ABORTED);
+ assertTrue(handler.isAborted());
+ }
+
+ public void testHumanTaskCancel2() {
+ PackageBuilder builder = new PackageBuilder();
+ Reader source = new StringReader(
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"flow\" id=\"org.drools.humantask\" package-name=\"org.drools\" version=\"1\" >\n" +
+ "\n" +
+ " <header>\n" +
+ " </header>\n" +
+ "\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <humanTask id=\"2\" name=\"HumanTask\" >\n" +
+ " <work name=\"Human Task\" >\n" +
+ " <parameter name=\"ActorId\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+ " <value>John Doe</value>\n" +
+ " </parameter>\n" +
+ " <parameter name=\"TaskName\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+ " <value>Do something</value>\n" +
+ " </parameter>\n" +
+ " <parameter name=\"Priority\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+ " </parameter>\n" +
+ " <parameter name=\"Comment\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+ " </parameter>\n" +
+ " </work>\n" +
+ " <onExit>\n" +
+ " <action type=\"expression\" name=\"Cancel\" dialect=\"java\" >((org.drools.workflow.instance.NodeInstance) kcontext.getNodeInstance()).cancel();</action>\n" +
+ " </onExit>\n" +
+ " </humanTask>\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ "\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\" />\n" +
+ " <connection from=\"2\" to=\"3\" />\n" +
+ " </connections>\n" +
+ "\n" +
+ "</process>");
+ builder.addRuleFlow(source);
+ Package pkg = builder.getPackage();
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage( pkg );
+ WorkingMemory workingMemory = ruleBase.newStatefulSession();
+ TestWorkItemHandler handler = new TestWorkItemHandler();
+ workingMemory.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
+ ProcessInstance processInstance = ( ProcessInstance )
+ workingMemory.startProcess("org.drools.humantask");
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ WorkItem workItem = handler.getWorkItem();
+ assertNotNull(workItem);
+ workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), null);
+ assertFalse(handler.isAborted());
+ }
+
private static class TestWorkItemHandler implements WorkItemHandler {
private WorkItem workItem;
+ private boolean aborted = false;
public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {
this.workItem = workItem;
}
public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
+ aborted = true;
}
public WorkItem getWorkItem() {
return workItem;
}
+ public boolean isAborted() {
+ return aborted;
+ }
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java 2010-05-10 17:30:03 UTC (rev 32800)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java 2010-05-10 19:32:13 UTC (rev 32801)
@@ -193,6 +193,7 @@
}
}
}
+ this.workItemId = -1;
if (isInversionOfControl()) {
WorkingMemory workingMemory = ((ProcessInstance) getProcessInstance()).getWorkingMemory();
workingMemory.update(workingMemory.getFactHandle(this), this);
More information about the jboss-svn-commits
mailing list