Adding AS Delete tests

Change-Id: Ia630f84be55d9866f6473bed8c8588a2680b16ca
Issue-ID: SO-4054
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/main/resources/DeleteAs.bpmn b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/main/resources/DeleteAs.bpmn
index 4352eba..0927ba7 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/main/resources/DeleteAs.bpmn
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/main/resources/DeleteAs.bpmn
@@ -76,7 +76,7 @@
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="Flow_0rnc1yr" sourceRef="Activity_0uxlyqj" targetRef="Gateway_0jvzfpt" />
     <bpmn:sequenceFlow id="Flow_0tb94ui" name="No" sourceRef="Gateway_13t56cm" targetRef="Event_1xhfq2h">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{not nsInstanceExists}</bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{not asInstanceExists}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="Flow_0blv3cy" name="No" sourceRef="Gateway_0jvzfpt" targetRef="Event_1xhfq2h">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{not isInNotInstantiatedState}</bpmn:conditionExpression>

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/BaseTest.java b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/BaseTest.java
index 2bf2f30..d425352 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/BaseTest.java
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/BaseTest.java
@@ -25,7 +25,6 @@ import static org.slf4j.LoggerFactory.getLogger;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -124,10 +123,6 @@ public abstract class BaseTest {
                 .variableName(name).singleResult();
     }
 
-    public List<HistoricVariableInstance> getVariables(final String processInstanceId) {
-        return historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).list();
-    }
-
     public boolean waitForProcessInstanceToFinish(final String processInstanceId) throws InterruptedException {
         final long startTimeInMillis = System.currentTimeMillis();
         final long timeOutTime = startTimeInMillis + TimeUnit.SECONDS.toMillis(TIME_OUT_IN_SECONDS);

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/tasks/DeleteAsTaskTest.java b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/tasks/DeleteAsTaskTest.java
index e90e64b..9ad993b 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/tasks/DeleteAsTaskTest.java
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/tasks/DeleteAsTaskTest.java
@@ -25,6 +25,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.ok;
 import static com.github.tomakehurst.wiremock.client.WireMock.okJson;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.onap.aaiclient.client.aai.AAIVersion.V19;
@@ -32,14 +33,18 @@ import java.time.LocalDateTime;
 import java.util.Optional;
 import java.util.UUID;
 import org.camunda.bpm.engine.history.HistoricProcessInstance;
+import org.camunda.bpm.engine.history.HistoricVariableInstance;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.so.cnfm.lcm.bpmn.flows.BaseTest;
+import org.onap.so.cnfm.lcm.bpmn.flows.exceptions.AsRequestProcessingException;
 import org.onap.so.cnfm.lcm.bpmn.flows.service.JobExecutorService;
+import org.onap.so.cnfm.lcm.bpmn.flows.service.WorkflowQueryService;
 import org.onap.so.cnfm.lcm.database.beans.AsInst;
 import org.onap.so.cnfm.lcm.database.beans.Job;
 import org.onap.so.cnfm.lcm.database.beans.State;
+import org.onap.so.cnfm.lcm.model.ErrorDetails;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -52,6 +57,9 @@ public class DeleteAsTaskTest extends BaseTest {
     @Autowired
     private JobExecutorService objUnderTest;
 
+    @Autowired
+    private WorkflowQueryService workflowQueryService;
+
     @Before
     public void before() {
         wireMockServer.resetAll();
@@ -65,7 +73,7 @@ public class DeleteAsTaskTest extends BaseTest {
     @Test
     public void testRunDeleteNsJob_SuccessfulCase() throws InterruptedException {
         final String asInstanceId = UUID.randomUUID().toString();
-        addDummyAsToDatabase(asInstanceId);
+        addDummyAsToDatabase(asInstanceId, State.NOT_INSTANTIATED);
         mockAaiEndpoints(asInstanceId);
 
         objUnderTest.runDeleteAsJob(asInstanceId);
@@ -85,6 +93,83 @@ public class DeleteAsTaskTest extends BaseTest {
 
     }
 
+    @Test
+    public void testRunDeleteNsJob_AsInstanceDoesNotExistsInDb() throws InterruptedException {
+        final String asInstanceId = UUID.randomUUID().toString();
+
+        try {
+            objUnderTest.runDeleteAsJob(asInstanceId);
+        } catch (final Exception exception) {
+            assertEquals(AsRequestProcessingException.class, exception.getClass());
+        }
+
+        final Optional<Job> optional = getJobByResourceId(asInstanceId);
+        assertTrue(optional.isPresent());
+        final Job job = optional.get();
+
+        assertTrue(waitForProcessInstanceToFinish(job.getProcessInstanceId()));
+
+        final HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance(job.getProcessInstanceId());
+        assertNotNull(historicProcessInstance);
+        assertEquals(HistoricProcessInstance.STATE_COMPLETED, historicProcessInstance.getState());
+
+        final Optional<AsInst> optionalAsInst = databaseServiceProvider.getAsInst(asInstanceId);
+        assertTrue(optionalAsInst.isEmpty());
+
+        final Optional<ErrorDetails> errorDetailsOptional =
+                workflowQueryService.getErrorDetails(job.getProcessInstanceId());
+        assertTrue(errorDetailsOptional.isPresent());
+
+        final ErrorDetails errorDetails = errorDetailsOptional.get();
+        assertNotNull(errorDetails);
+        assertNotNull(errorDetails.getDetail());
+
+        final HistoricVariableInstance doesAsInstanceExistsVar =
+                getVariable(job.getProcessInstanceId(), "asInstanceExists");
+        assertNotNull(doesAsInstanceExistsVar);
+        assertFalse((boolean) doesAsInstanceExistsVar.getValue());
+    }
+
+
+    @Test
+    public void testRunDeleteNsJob_AsInstanceDoesExistsInDbWithInstantiatedState() throws InterruptedException {
+        final String asInstanceId = UUID.randomUUID().toString();
+
+        addDummyAsToDatabase(asInstanceId, State.INSTANTIATED);
+
+        try {
+            objUnderTest.runDeleteAsJob(asInstanceId);
+        } catch (final Exception exception) {
+            assertEquals(AsRequestProcessingException.class, exception.getClass());
+        }
+
+        final Optional<Job> optional = getJobByResourceId(asInstanceId);
+        assertTrue(optional.isPresent());
+        final Job job = optional.get();
+
+        assertTrue(waitForProcessInstanceToFinish(job.getProcessInstanceId()));
+
+        final HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance(job.getProcessInstanceId());
+        assertNotNull(historicProcessInstance);
+        assertEquals(HistoricProcessInstance.STATE_COMPLETED, historicProcessInstance.getState());
+
+        final Optional<AsInst> optionalAsInst = databaseServiceProvider.getAsInst(asInstanceId);
+        assertFalse(optionalAsInst.isEmpty());
+
+        final Optional<ErrorDetails> errorDetailsOptional =
+                workflowQueryService.getErrorDetails(job.getProcessInstanceId());
+        assertTrue(errorDetailsOptional.isPresent());
+
+        final ErrorDetails errorDetails = errorDetailsOptional.get();
+        assertNotNull(errorDetails);
+        assertNotNull(errorDetails.getDetail());
+
+        final HistoricVariableInstance isInNotInstantiatedStateVar =
+                getVariable(job.getProcessInstanceId(), "isInNotInstantiatedState");
+        assertNotNull(isInNotInstantiatedStateVar);
+        assertFalse((boolean) isInNotInstantiatedStateVar.getValue());
+    }
+
     private void mockAaiEndpoints(final String asInstanceId) {
         final String modelEndpoint = "/aai/" + V19 + "/network/generic-vnfs/generic-vnf/" + asInstanceId;
         final String resourceVersion = UUID.randomUUID().toString();
@@ -96,15 +181,15 @@ public class DeleteAsTaskTest extends BaseTest {
                 delete(urlMatching(modelEndpoint + "\\?resource-version=" + resourceVersion)).willReturn(ok()));
     }
 
-    private void addDummyAsToDatabase(final String asInstanceId) {
+    private void addDummyAsToDatabase(final String asInstanceId, final State state) {
         final String asdId = UUID.randomUUID().toString();
 
-        final AsInst asInst = new AsInst().asInstId(asInstanceId).name("asName").asdId(asdId)
-                .asdInvariantId(asInstanceId).status(State.NOT_INSTANTIATED).statusUpdatedTime(LocalDateTime.now())
-                .asApplicationName("asApplicationName").asApplicationVersion("asApplicationVersion")
-                .asProvider("asProvider").serviceInstanceId(SERVICE_INSTANCE_ID)
-                .serviceInstanceName("serviceInstanceName").cloudOwner("cloudOwner").cloudRegion("cloudRegion")
-                .tenantId("tenantId");
+        final AsInst asInst =
+                new AsInst().asInstId(asInstanceId).name("asName").asdId(asdId).asdInvariantId(asInstanceId)
+                        .status(state).statusUpdatedTime(LocalDateTime.now()).asApplicationName("asApplicationName")
+                        .asApplicationVersion("asApplicationVersion").asProvider("asProvider")
+                        .serviceInstanceId(SERVICE_INSTANCE_ID).serviceInstanceName("serviceInstanceName")
+                        .cloudOwner("cloudOwner").cloudRegion("cloudRegion").tenantId("tenantId");
         databaseServiceProvider.saveAsInst(asInst);
     }