From 82358726fc0c37adcd426a41cdca4f3b4ddf2c56 Mon Sep 17 00:00:00 2001
From: "KULESHOV, ELENA" <evn@att.com>
Date: Wed, 24 Mar 2021 09:46:59 -0400
Subject: request db endpoint and bpmn cleanup

added new request db adapter endpoint
use bpmn constants when available
allow bpmn input setup parameter to be extended

Issue-ID: SO-3606
Signed-off-by: AT&T Open Source <g22940@att.com>
Change-Id: Ibde4d82cc7432ea3cdd9a75aef0dc695ebbf9a1b
---
 .../infrastructure/workflow/tasks/WorkflowActionTest.java  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'bpmn/so-bpmn-tasks/src/test')

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
index 26e0d2f8c9..55529b5bf0 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
@@ -232,7 +232,6 @@ public class WorkflowActionTest extends BaseTaskTest {
 
         when(catalogDbClient.getNorthBoundRequestByActionAndIsALaCarteAndRequestScopeAndCloudOwner(gAction, resource,
                 true, "my-custom-cloud-owner")).thenReturn(northBoundRequest);
-
         workflowAction.selectExecutionList(execution);
         List<ExecuteBuildingBlock> ebbs = (List<ExecuteBuildingBlock>) execution.getVariable("flowsToExecute");
         assertEqualsBulkFlowName(ebbs, "AssignServiceInstanceBB", "ActivateServiceInstanceBB");
@@ -1044,7 +1043,7 @@ public class WorkflowActionTest extends BaseTaskTest {
 
         NorthBoundRequest northBoundRequest = new NorthBoundRequest();
         List<OrchestrationFlow> orchFlows = createFlowList("AssignVfModuleBB", "CreateVfModuleBB", "ActivateVfModuleBB",
-                "AssignFabricConfigurationBB", "ActivateFabricConfigurationBB");
+                "AddFabricConfigurationBB");
         northBoundRequest.setOrchestrationFlowList(orchFlows);
 
         List<CvnfcCustomization> cvnfcCustomizations = new ArrayList<CvnfcCustomization>();
@@ -1078,15 +1077,14 @@ public class WorkflowActionTest extends BaseTaskTest {
 
         when(catalogDbClient.getNorthBoundRequestByActionAndIsALaCarteAndRequestScopeAndCloudOwner(gAction, resource,
                 true, "my-custom-cloud-owner")).thenReturn(northBoundRequest);
-        // when(catalogDbClient.getCvnfcCustomizationByVnfCustomizationUUIDAndVfModuleCustomizationUUID("fc25201d-36d6-43a3-8d39-fdae88e526ae",
-        // "9a6d01fd-19a7-490a-9800-460830a12e0b")).thenReturn(cvnfcCustomizations);
+
         workflowAction.selectExecutionList(execution);
         List<ExecuteBuildingBlock> ebbs = (List<ExecuteBuildingBlock>) execution.getVariable("flowsToExecute");
-        assertEqualsBulkFlowName(ebbs, "AssignVfModuleBB", "CreateVfModuleBB", "ActivateVfModuleBB",
-                "AssignFabricConfigurationBB", "ActivateFabricConfigurationBB", "AssignFabricConfigurationBB",
-                "ActivateFabricConfigurationBB");
+        assertEqualsBulkFlowName(ebbs, "AssignVfModuleBB", "CreateVfModuleBB", "ActivateVfModuleBB");
     }
 
+
+
     @Test
     public void selectExecutionListALaCarteVfModuleNoVolumeGroupReplaceTest() throws Exception {
         String gAction = "replaceInstance";
@@ -1450,7 +1448,6 @@ public class WorkflowActionTest extends BaseTaskTest {
                 "ChangeModelVnfBB", "ChangeModelServiceInstanceBB");
     }
 
-
     @Test
     public void selectExecutionListALaCarteVfModuleFabricDeleteTest() throws Exception {
         String gAction = "deleteInstance";
@@ -2249,6 +2246,7 @@ public class WorkflowActionTest extends BaseTaskTest {
         for (int i = 0; i < ebbs.size(); i++) {
             assertEquals(ebbs.get(i).getBuildingBlock().getBpmnFlowName(), flowNames[i]);
         }
+        assertEquals(ebbs.size(), flowNames.length);
     }
 
     private void initExecution(String gAction, String bpmnRequest, boolean isAlaCarte) {
-- 
cgit 1.2.3-korg