4:25 a.m.
Author: kukeltje
Date: 2009-07-30 05:25:10 -0400 (Thu, 30 Jul 2009)
New Revision: 5386
Modified:
jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ParallelGatewayTest.java
jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/forkWithUncontrolledSequenceFlow.bpmn.xml
Log:
and the test
Modified:
jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ParallelGatewayTest.java
===================================================================
---
jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ParallelGatewayTest.java 2009-07-30
09:24:19 UTC (rev 5385)
+++
jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ParallelGatewayTest.java 2009-07-30
09:25:10 UTC (rev 5386)
@@ -90,10 +90,17 @@
// speciifiing a transition is unnecessary, BPMN has outgoing AND semantic!
// TODO: fix
- taskService.completeTask( allTasks.get(0).getId(), "flow2" );
+ taskService.completeTask( allTasks.get(0).getId());
+
+ taskService.completeTask( allTasks.get(1).getId());
- pi = executionService.findProcessInstanceById(pi.getId());
+
+ assertEquals(0, taskQuery.list().size());
+ assertEquals(true, pi.isEnded());
+
+ pi = executionService.findProcessInstanceById(pi.getId());
+
// process instance is ended
assertNull(pi);
}
@@ -113,61 +120,4 @@
ClientProcessInstance pi = processDefinition.createProcessInstance();
pi.start();
}
-//
-// public void testNonExistingDefault() {
-//
-// List<Problem> problems =
parse("org/jbpm/bpmn/flownodes/exclusiveGatewayNonExistingDefault.bpmn.xml");
-//
-// if ((problems == null) || (problems.isEmpty())) {
-// fail("expected problems during parse");
-// } else {
-// assertTextPresent("cvc-id.1: There is no ID/IDREF binding for IDREF
'flow666'", problems.get(0).getMsg());
-// }
-// }
-//
-// public void testMixedValid() {
-//
-// List<Problem> problems =
parse("org/jbpm/bpmn/flownodes/exclusiveGatewayMixedValid.bpmn.xml");
-//
-// if (!problems.isEmpty()) {
-// fail("No problems should have occured. Problems: " + problems);
-// }
-// }
-//
-//
-// public void testMixedInvalid() {
-//
-// List<Problem> problems =
parse("org/jbpm/bpmn/flownodes/exclusiveGatewayMixedInvalid.bpmn.xml");
-//
-// if ((problems == null) || (problems.isEmpty())) {
-// fail("expected problems during parse");
-// } else {
-// assertTextPresent("exclusiveGateway 'Just a gateway' has the wrong
number of incomming (1) and outgoing (2) transitions for
gatewayDirection='mixed'", problems.get(0).getMsg());
-// }
-// }
-//
-//
-//
-// public void testConvergingInvalid() {
-//
-// List<Problem> problems =
parse("org/jbpm/bpmn/flownodes/exclusiveGatewayConvergingInvalid.bpmn.xml");
-//
-// if ((problems == null) || (problems.isEmpty())) {
-// fail("expected problems during parse");
-// } else {
-// assertTextPresent("exclusiveGateway 'Just a gateway' has the wrong
number of incomming (1) and outgoing (2) transitions for
gatewayDirection='converging'", problems.get(0).getMsg());
-// }
-// }
-//
-// public void testDivergingInvalid() {
-//
-// List<Problem> problems =
parse("org/jbpm/bpmn/flownodes/exclusiveGatewayDivergingInvalid.bpmn.xml");
-//
-// if ((problems == null) || (problems.isEmpty())) {
-// fail("expected problems during parse");
-// } else {
-// assertTextPresent("exclusiveGateway 'Just a gateway' has the wrong
number of incomming (2) and outgoing (2) transitions for
gatewayDirection='diverging'", problems.get(0).getMsg());
-// }
-// }
-
}
Modified:
jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/forkWithUncontrolledSequenceFlow.bpmn.xml
===================================================================
---
jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/forkWithUncontrolledSequenceFlow.bpmn.xml 2009-07-30
09:24:19 UTC (rev 5385)
+++
jbpm4/trunk/modules/bpmn/src/test/resources/org/jbpm/bpmn/flownodes/forkWithUncontrolledSequenceFlow.bpmn.xml 2009-07-30
09:25:10 UTC (rev 5386)
@@ -12,12 +12,12 @@
<bpmn:sequenceFlow id="flow1" name="fromStartToFork"
sourceRef="Start"
- targetRef="parallelGatewayFork" />
+ targetRef="forkingTask" />
- <bpmn:task id="parallelGatewayFork" name="The Fork" />
+ <bpmn:task id="forkingTask" name="The Fork" />
<bpmn:sequenceFlow id="flow2a" name="Leg 1"
- sourceRef="parallelGatewayFork"
+ sourceRef="forkingTask"
targetRef="UserTaskLeg1" />
<bpmn:userTask id="UserTaskLeg1" name="user task leg1"
implementation="other">
<bpmn:potentialOwner resourceRef="sampleResource" />
@@ -27,7 +27,7 @@
targetRef="parallelGatewayJoin" />
<bpmn:sequenceFlow id="flow3a" name="Leg 2"
- sourceRef="parallelGatewayFork"
+ sourceRef="forkingTask"
targetRef="UserTaskLeg2" />
<bpmn:userTask id="UserTaskLeg2" name="user task leg2"
implementation="other">
<bpmn:potentialOwner resourceRef="sampleResource" />