always increment gCurrentSequence

always increment gCurrentSequence to properly interact with retry and
rollback logic

Change-Id: I7e99973682f93f891c8d35a4f3699ba17a05bc15
Issue-ID: SO-1509
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
index f6c9597..2e91a52 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
@@ -89,8 +89,8 @@ public class WorkflowActionBBTasks {
                        execution.setVariable("completed", true);
                } else {
                        execution.setVariable("completed", false);
-                       execution.setVariable(G_CURRENT_SEQUENCE, currentSequence);
                }
+               execution.setVariable(G_CURRENT_SEQUENCE, currentSequence);
        }
        
        public void updateFlowStatistics(DelegateExecution execution) {

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
index 2fc6297..17a37c8 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
@@ -96,7 +96,9 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
                execution.setVariable("flowsToExecute", flowsToExecute);
                workflowActionBBTasks.selectBB(execution);
                boolean success = (boolean) execution.getVariable("completed");
+               int currentSequence = (int) execution.getVariable("gCurrentSequence");
                assertEquals(true,success);
+               assertEquals(1,currentSequence);
        }
        
        @Test
@@ -115,7 +117,9 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
                execution.setVariable("flowsToExecute", flowsToExecute);
                workflowActionBBTasks.selectBB(execution);
                boolean success = (boolean) execution.getVariable("completed");
+               int currentSequence = (int) execution.getVariable("gCurrentSequence");
                assertEquals(false,success);
+               assertEquals(1,currentSequence);
        }
        
        @Test