diff options
author | Boslet, Cory <cory.boslet@att.com> | 2020-10-20 11:38:11 -0400 |
---|---|---|
committer | Benjamin, Max (mb388a) <mb388a@att.com> | 2020-10-21 16:20:20 -0400 |
commit | 1b0033ac8a578730ba95e48f7a7ab73e49380b51 (patch) | |
tree | 29b7e93e525645a29e1b7cd87391c6dbc4d17c44 /bpmn/so-bpmn-building-blocks/src/test/java | |
parent | 7396509f9c11cc4e9651210cf8a290679bb17fd5 (diff) |
Removed audit code
Updated to error on inventory therefore no longer need audit
Removed the audit UT test from source
Removed the audit from the task services.
Updated the BB unit test to not have audit anymore
Changed robots to fix for create inventory.
Delete the vnfc by id after each robot
Create pserver in aai that ci is using
Continue to fix robot test for heat bridge
Continue to fix robots due to heatbridge enabled
More changes to simulator to account for heatbridge for replace scenrios
Added get resources scenrio for heatbridge
Added header and added version to simulator
Added correct response file and header for base module id
Fixed the remaining failing service instance robots
Changed to get tenant id else where when null
Fixed the macro robots for heatbridge and getting resources
Added scenrios that are still needed for heatbridge
Added to connect when already exist and missing relationships
Updated unit test to account for change to code.
Issue-ID: SO-3316
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I8cefebd91261fcb8ff03d582afb48517dd34625a
Diffstat (limited to 'bpmn/so-bpmn-building-blocks/src/test/java')
-rw-r--r-- | bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/ActivateVfModuleBBTest.java | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/ActivateVfModuleBBTest.java b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/ActivateVfModuleBBTest.java index 6f89f3c738..558e785e94 100644 --- a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/ActivateVfModuleBBTest.java +++ b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/ActivateVfModuleBBTest.java @@ -22,12 +22,9 @@ package org.onap.so.bpmn.infrastructure.bpmn.subprocess; import static org.camunda.bpm.engine.test.assertions.bpmn.BpmnAwareAssertions.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import java.io.IOException; -import java.util.List; import org.camunda.bpm.engine.delegate.BpmnError; -import org.camunda.bpm.engine.externaltask.LockedExternalTask; import org.camunda.bpm.engine.runtime.ProcessInstance; import org.junit.Before; import org.junit.Test; @@ -47,20 +44,10 @@ public class ActivateVfModuleBBTest extends BaseBPMNTest { public void sunnyDay() throws InterruptedException, IOException { mockSubprocess("SDNCHandler", "My Mock Process Name", "GenericStub"); ProcessInstance pi = runtimeService.startProcessInstanceByKey("ActivateVfModuleBB", variables); - List<LockedExternalTask> tasks = externalTaskService.fetchAndLock(100, "externalWorkerId") - .topic("InventoryAddAudit", 60L * 1000L).execute(); - while (!tasks.isEmpty()) { - for (LockedExternalTask task : tasks) { - externalTaskService.complete(task.getId(), "externalWorkerId"); - } - tasks = externalTaskService.fetchAndLock(100, "externalWorkerId").topic("InventoryAddAudit", 60L * 1000L) - .execute(); - } assertThat(pi).isNotNull(); - assertThat(pi).isStarted().hasPassedInOrder("ActivateVfModuleBB_Start", "ExclusiveGateway_1v8bmbu", - "Setup_AAI_Inventory_Audit", "Audit_AAI_Inventory", "ActivateVfModule", "CallActivity_sdncHandler", - "UpdateVfModuleActiveStatus", "ActivateVfModuleBB_End"); + assertThat(pi).isStarted().hasPassedInOrder("ActivateVfModuleBB_Start", "ActivateVfModule", + "CallActivity_sdncHandler", "UpdateVfModuleActiveStatus", "ActivateVfModuleBB_End"); assertThat(pi).isEnded(); } @@ -70,19 +57,9 @@ public class ActivateVfModuleBBTest extends BaseBPMNTest { doThrow(BpmnError.class).when(aaiUpdateTasks) .updateOrchestrationStatusActivateVfModule(any(BuildingBlockExecution.class)); ProcessInstance pi = runtimeService.startProcessInstanceByKey("ActivateVfModuleBB", variables); - List<LockedExternalTask> tasks = externalTaskService.fetchAndLock(100, "externalWorkerId") - .topic("InventoryAddAudit", 60L * 1000L).execute(); - while (!tasks.isEmpty()) { - for (LockedExternalTask task : tasks) { - externalTaskService.complete(task.getId(), "externalWorkerId"); - } - tasks = externalTaskService.fetchAndLock(100, "externalWorkerId").topic("InventoryAddAudit", 60L * 1000L) - .execute(); - } assertThat(pi).isNotNull().isStarted() - .hasPassedInOrder("ActivateVfModuleBB_Start", "ExclusiveGateway_1v8bmbu", "Setup_AAI_Inventory_Audit", - "Audit_AAI_Inventory", "ActivateVfModule", "UpdateVfModuleActiveStatus") + .hasPassedInOrder("ActivateVfModuleBB_Start", "ActivateVfModule", "UpdateVfModuleActiveStatus") .hasNotPassed("ActivateVfModuleBB_End"); } } |