Author: tom.baeyens(a)jboss.com
Date: 2008-10-02 05:16:54 -0400 (Thu, 02 Oct 2008)
New Revision: 2461
Modified:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
Log:
[JBPM-1737] Cleanup SubProcessPlusConcurrencyDbTest
Modified:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
===================================================================
---
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java 2008-10-02
09:15:48 UTC (rev 2460)
+++
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java 2008-10-02
09:16:54 UTC (rev 2461)
@@ -24,7 +24,9 @@
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ActionHandler;
+import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.node.ProcessState;
public class SubProcessPlusConcurrencyDbTest extends AbstractDbTestCase
{
@@ -71,7 +73,26 @@
newTransaction();
}
-
+
+ public void deleteProcessDefinitions() {
+ ProcessDefinition processDefinition =
graphSession.findLatestProcessDefinition("super");
+ Node node = processDefinition.getNode("subprocess");
+ ProcessState processState = (ProcessState) session.load(ProcessState.class,
node.getId());
+ processState.setSubProcessDefinition(null);
+
+ newTransaction();
+
+ processDefinition = graphSession.findLatestProcessDefinition("sub");
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ newTransaction();
+
+ processDefinition = graphSession.findLatestProcessDefinition("super");
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ newTransaction();
+ }
+
public static class EnterNodeS implements ActionHandler {
private static final long serialVersionUID = 1L;
public void execute(ExecutionContext executionContext) throws Exception {
@@ -85,45 +106,44 @@
}
}
- public void testWithoutSubProcess()
- {
- if (true)
- {
- System.out.println("FIXME [JBPM-1737]: Cleanup
SubProcessPlusConcurrencyDbTest");
- return;
- }
-
+ public void testWithoutSubProcess() {
deployProcessDefinitions();
- ProcessInstance pi = jbpmContext.newProcessInstanceForUpdate("super");
- pi.signal("without subprocess");
- assertEquals("s", pi.getRootToken().getNode().getName());
- assertEquals(new Integer(1),
pi.getContextInstance().getVariable("invocationCount"));
+ try {
+ ProcessInstance pi = jbpmContext.newProcessInstanceForUpdate("super");
+ pi.signal("without subprocess");
+ assertEquals("s", pi.getRootToken().getNode().getName());
+ assertEquals(new Integer(1),
pi.getContextInstance().getVariable("invocationCount"));
+ newTransaction();
+
+ } finally {
+ deleteProcessDefinitions();
+ }
}
- public void testWithSubProcess()
- {
- if (true)
- {
- System.out.println("FIXME [JBPM-1737]: Cleanup
SubProcessPlusConcurrencyDbTest");
- return;
- }
-
+ public void testWithSubProcess() {
deployProcessDefinitions();
- ProcessInstance pi = jbpmContext.newProcessInstanceForUpdate("super");
- pi.signal("with subprocess");
+ try {
+ ProcessInstance pi = jbpmContext.newProcessInstanceForUpdate("super");
+ pi.signal("with subprocess");
- ProcessInstance subPi = pi.getRootToken().getSubProcessInstance();
- assertEquals("wait", subPi.getRootToken().getNode().getName());
+ ProcessInstance subPi = pi.getRootToken().getSubProcessInstance();
+ assertEquals("wait", subPi.getRootToken().getNode().getName());
- newTransaction();
+ newTransaction();
- subPi = jbpmContext.loadProcessInstanceForUpdate(subPi.getId());
- subPi.signal();
- pi = subPi.getSuperProcessToken().getProcessInstance();
+ subPi = jbpmContext.loadProcessInstanceForUpdate(subPi.getId());
+ subPi.signal();
+ pi = subPi.getSuperProcessToken().getProcessInstance();
- assertEquals("s", pi.getRootToken().getNode().getName());
- assertEquals(new Integer(1),
pi.getContextInstance().getVariable("invocationCount"));
+ assertEquals("s", pi.getRootToken().getNode().getName());
+ assertEquals(new Integer(1),
pi.getContextInstance().getVariable("invocationCount"));
+
+ newTransaction();
+
+ } finally {
+ deleteProcessDefinitions();
+ }
}
}
Show replies by date