Author: sb
Date: Tue Jan 22 07:52:24 2008
New Revision: 7224
Log:
# Restore 100% code coverage.
Modified:
trunk/Workflow/tests/case.php
trunk/Workflow/tests/data/ParallelSplitActionActionCancelCaseSynchronization.dot
trunk/Workflow/tests/data/ParallelSplitActionActionCancelCaseSynchronization_1.xml
trunk/Workflow/tests/data/ParallelSplitCancelCaseActionActionSynchronization.dot
trunk/Workflow/tests/data/ParallelSplitCancelCaseActionActionSynchronization_1.xml
trunk/WorkflowEventLogTiein/tests/data/ParallelSplitActionActionCancelCaseSynchronization.log
trunk/WorkflowEventLogTiein/tests/data/ParallelSplitCancelCaseActionActionSynchronization.log
Modified: trunk/Workflow/tests/case.php
==============================================================================
--- trunk/Workflow/tests/case.php [iso-8859-1] (original)
+++ trunk/Workflow/tests/case.php [iso-8859-1] Tue Jan 22 07:52:24 2008
@@ -708,30 +708,32 @@
$cancelNode = new ezcWorkflowNodeCancel;
$actionNodeA = new ezcWorkflowNodeAction( 'ServiceObject' );
$actionNodeB = new ezcWorkflowNodeAction( 'ServiceObject' );
+ $actionNodeC = new ezcWorkflowNodeAction( 'ServiceObject' );
$synchronization = new ezcWorkflowNodeSynchronization;
if ( $order == 'first' )
{
$this->branchNode->addOutNode( $cancelNode );
- $this->branchNode->addOutNode( $actionNodeA );
$this->branchNode->addOutNode( $actionNodeB );
+ $this->branchNode->addOutNode( $actionNodeC );
$synchronization->addInNode( $cancelNode );
- $synchronization->addInNode( $actionNodeA );
$synchronization->addInNode( $actionNodeB );
+ $synchronization->addInNode( $actionNodeC );
}
else
{
- $this->branchNode->addOutNode( $actionNodeA );
$this->branchNode->addOutNode( $actionNodeB );
+ $this->branchNode->addOutNode( $actionNodeC );
$this->branchNode->addOutNode( $cancelNode );
- $synchronization->addInNode( $actionNodeA );
$synchronization->addInNode( $actionNodeB );
+ $synchronization->addInNode( $actionNodeC );
$synchronization->addInNode( $cancelNode );
}
- $this->startNode->addOutNode( $this->branchNode );
+ $this->startNode->addOutNode( $actionNodeA );
+ $actionNodeA->addOutNode( $this->branchNode );
$this->endNode->addInNode( $synchronization );
}
Modified:
trunk/Workflow/tests/data/ParallelSplitActionActionCancelCaseSynchronization.dot
==============================================================================
---
trunk/Workflow/tests/data/ParallelSplitActionActionCancelCaseSynchronization.dot
[iso-8859-1] (original)
+++
trunk/Workflow/tests/data/ParallelSplitActionActionCancelCaseSynchronization.dot
[iso-8859-1] Tue Jan 22 07:52:24 2008
@@ -1,18 +1,20 @@
digraph ParallelSplitActionActionCancelCaseSynchronization {
node1 [label="Start"]
-node2 [label="Parallel Split"]
-node3 [label=""]
-node4 [label="Synchronization"]
-node5 [label="End"]
-node6 [label=""]
-node7 [label="Cancel"]
+node2 [label=""]
+node3 [label="Parallel Split"]
+node4 [label=""]
+node5 [label="Synchronization"]
+node6 [label="End"]
+node7 [label=""]
+node8 [label="Cancel"]
node1 -> node2
node2 -> node3
-node2 -> node6
-node2 -> node7
node3 -> node4
+node3 -> node7
+node3 -> node8
node4 -> node5
-node6 -> node4
-node7 -> node4
+node5 -> node6
+node7 -> node5
+node8 -> node5
}
Modified:
trunk/Workflow/tests/data/ParallelSplitActionActionCancelCaseSynchronization_1.xml
==============================================================================
---
trunk/Workflow/tests/data/ParallelSplitActionActionCancelCaseSynchronization_1.xml
[iso-8859-1] (original)
+++
trunk/Workflow/tests/data/ParallelSplitActionActionCancelCaseSynchronization_1.xml
[iso-8859-1] Tue Jan 22 07:52:24 2008
@@ -3,22 +3,25 @@
<node id="1" type="Start">
<outNode id="2"/>
</node>
- <node id="2" type="ParallelSplit">
+ <node id="2" type="Action" serviceObjectClass="ServiceObject">
<outNode id="3"/>
- <outNode id="6"/>
+ </node>
+ <node id="3" type="ParallelSplit">
+ <outNode id="4"/>
<outNode id="7"/>
+ <outNode id="8"/>
</node>
- <node id="3" type="Action" serviceObjectClass="ServiceObject">
- <outNode id="4"/>
- </node>
- <node id="4" type="Synchronization">
+ <node id="4" type="Action" serviceObjectClass="ServiceObject">
<outNode id="5"/>
</node>
- <node id="5" type="End"/>
- <node id="6" type="Action" serviceObjectClass="ServiceObject">
- <outNode id="4"/>
+ <node id="5" type="Synchronization">
+ <outNode id="6"/>
</node>
- <node id="7" type="Cancel">
- <outNode id="4"/>
+ <node id="6" type="End"/>
+ <node id="7" type="Action" serviceObjectClass="ServiceObject">
+ <outNode id="5"/>
+ </node>
+ <node id="8" type="Cancel">
+ <outNode id="5"/>
</node>
</workflow>
Modified:
trunk/Workflow/tests/data/ParallelSplitCancelCaseActionActionSynchronization.dot
==============================================================================
---
trunk/Workflow/tests/data/ParallelSplitCancelCaseActionActionSynchronization.dot
[iso-8859-1] (original)
+++
trunk/Workflow/tests/data/ParallelSplitCancelCaseActionActionSynchronization.dot
[iso-8859-1] Tue Jan 22 07:52:24 2008
@@ -1,18 +1,20 @@
digraph ParallelSplitCancelCaseActionActionSynchronization {
node1 [label="Start"]
-node2 [label="Parallel Split"]
-node3 [label="Cancel"]
-node4 [label="Synchronization"]
-node5 [label="End"]
-node6 [label=""]
+node2 [label=""]
+node3 [label="Parallel Split"]
+node4 [label="Cancel"]
+node5 [label="Synchronization"]
+node6 [label="End"]
node7 [label=""]
+node8 [label=""]
node1 -> node2
node2 -> node3
-node2 -> node6
-node2 -> node7
node3 -> node4
+node3 -> node7
+node3 -> node8
node4 -> node5
-node6 -> node4
-node7 -> node4
+node5 -> node6
+node7 -> node5
+node8 -> node5
}
Modified:
trunk/Workflow/tests/data/ParallelSplitCancelCaseActionActionSynchronization_1.xml
==============================================================================
---
trunk/Workflow/tests/data/ParallelSplitCancelCaseActionActionSynchronization_1.xml
[iso-8859-1] (original)
+++
trunk/Workflow/tests/data/ParallelSplitCancelCaseActionActionSynchronization_1.xml
[iso-8859-1] Tue Jan 22 07:52:24 2008
@@ -3,22 +3,25 @@
<node id="1" type="Start">
<outNode id="2"/>
</node>
- <node id="2" type="ParallelSplit">
+ <node id="2" type="Action" serviceObjectClass="ServiceObject">
<outNode id="3"/>
- <outNode id="6"/>
+ </node>
+ <node id="3" type="ParallelSplit">
+ <outNode id="4"/>
<outNode id="7"/>
+ <outNode id="8"/>
</node>
- <node id="3" type="Cancel">
- <outNode id="4"/>
- </node>
- <node id="4" type="Synchronization">
+ <node id="4" type="Cancel">
<outNode id="5"/>
</node>
- <node id="5" type="End"/>
- <node id="6" type="Action" serviceObjectClass="ServiceObject">
- <outNode id="4"/>
+ <node id="5" type="Synchronization">
+ <outNode id="6"/>
</node>
+ <node id="6" type="End"/>
<node id="7" type="Action" serviceObjectClass="ServiceObject">
- <outNode id="4"/>
+ <outNode id="5"/>
+ </node>
+ <node id="8" type="Action" serviceObjectClass="ServiceObject">
+ <outNode id="5"/>
</node>
</workflow>
Modified:
trunk/WorkflowEventLogTiein/tests/data/ParallelSplitActionActionCancelCaseSynchronization.log
==============================================================================
---
trunk/WorkflowEventLogTiein/tests/data/ParallelSplitActionActionCancelCaseSynchronization.log
[iso-8859-1] (original)
+++
trunk/WorkflowEventLogTiein/tests/data/ParallelSplitActionActionCancelCaseSynchronization.log
[iso-8859-1] Tue Jan 22 07:52:24 2008
@@ -1,12 +1,15 @@
MMM DD HH:MM:SS [Info] [default] [default] Started execution #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#1(ezcWorkflowNodeStart) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Started thread #0 (1 sibling(s))
for execution #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#2(ezcWorkflowNodeParallelSplit) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#2(ezcWorkflowNodeAction) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Executed node
#1(ezcWorkflowNodeStart) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#3(ezcWorkflowNodeParallelSplit) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node
#2(ezcWorkflowNodeAction) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Started thread #1 (3 sibling(s))
for execution #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#3(ezcWorkflowNodeAction) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#4(ezcWorkflowNodeAction) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Started thread #2 (3 sibling(s))
for execution #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#6(ezcWorkflowNodeAction) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#7(ezcWorkflowNodeAction) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Started thread #3 (3 sibling(s))
for execution #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node
#7(ezcWorkflowNodeCancel) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Could not roll back service object
"ServiceObject" of node #2 for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node
#8(ezcWorkflowNodeCancel) for instance #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
MMM DD HH:MM:SS [Info] [default] [default] Cancelled execution #1 of workflow
"ParallelSplitActionActionCancelCaseSynchronization" (version 1).
Modified:
trunk/WorkflowEventLogTiein/tests/data/ParallelSplitCancelCaseActionActionSynchronization.log
==============================================================================
---
trunk/WorkflowEventLogTiein/tests/data/ParallelSplitCancelCaseActionActionSynchronization.log
[iso-8859-1] (original)
+++
trunk/WorkflowEventLogTiein/tests/data/ParallelSplitCancelCaseActionActionSynchronization.log
[iso-8859-1] Tue Jan 22 07:52:24 2008
@@ -1,8 +1,11 @@
MMM DD HH:MM:SS [Info] [default] [default] Started execution #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#1(ezcWorkflowNodeStart) for instance #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Started thread #0 (1 sibling(s))
for execution #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#2(ezcWorkflowNodeParallelSplit) for instance #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#2(ezcWorkflowNodeAction) for instance #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Executed node
#1(ezcWorkflowNodeStart) for instance #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Activated node
#3(ezcWorkflowNodeParallelSplit) for instance #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node
#2(ezcWorkflowNodeAction) for instance #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
MMM DD HH:MM:SS [Debug] [default] [default] Started thread #1 (3 sibling(s))
for execution #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
-MMM DD HH:MM:SS [Debug] [default] [default] Executed node
#3(ezcWorkflowNodeCancel) for instance #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Could not roll back service object
"ServiceObject" of node #2 for instance #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
+MMM DD HH:MM:SS [Debug] [default] [default] Executed node
#4(ezcWorkflowNodeCancel) for instance #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
MMM DD HH:MM:SS [Info] [default] [default] Cancelled execution #1 of workflow
"ParallelSplitCancelCaseActionActionSynchronization" (version 1).
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
