From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../job/command/InProgressStatusServiceTest.java   | 83 ++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 vid-app-common/src/test/java/org/onap/vid/job/command/InProgressStatusServiceTest.java

(limited to 'vid-app-common/src/test/java/org/onap/vid/job/command/InProgressStatusServiceTest.java')

diff --git a/vid-app-common/src/test/java/org/onap/vid/job/command/InProgressStatusServiceTest.java b/vid-app-common/src/test/java/org/onap/vid/job/command/InProgressStatusServiceTest.java
new file mode 100644
index 000000000..2e8139716
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/job/command/InProgressStatusServiceTest.java
@@ -0,0 +1,83 @@
+package org.onap.vid.job.command;
+
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.onap.vid.job.Job;
+import org.onap.vid.job.impl.JobSharedData;
+import org.onap.vid.model.serviceInstantiation.ServiceInstantiation;
+import org.onap.vid.mso.RestMsoImplementation;
+import org.onap.vid.mso.RestObject;
+import org.onap.vid.mso.rest.AsyncRequestStatus;
+import org.onap.vid.services.AsyncInstantiationBaseTest;
+import org.onap.vid.services.AsyncInstantiationBusinessLogic;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+import static org.testng.AssertJUnit.assertEquals;
+
+public class InProgressStatusServiceTest {
+
+    @Mock
+    private RestMsoImplementation restMso;
+
+    @Mock
+    private AsyncInstantiationBusinessLogic asyncInstantiationBL;
+
+    @InjectMocks
+    private InProgressStatusService inProgressStatusService;
+
+    @BeforeClass
+    public void initMocks() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @DataProvider
+    public static Object[][] jobStatuses() {
+        return Stream.of(Job.JobStatus.values())
+                .map(student -> new Object[] { student })
+                .toArray(Object[][]::new);
+    }
+
+    @Test(dataProvider = "jobStatuses")
+    public void whenGetFromMsoRequestStatus_returnItToCaller(Job.JobStatus expectedJobStatus) {
+
+        UUID jobUuid = UUID.randomUUID();
+        String userId = "mockedUserID";
+        String requestId = UUID.randomUUID().toString();
+        ServiceInstantiation serviceInstantiation = mock(ServiceInstantiation.class);
+
+        when(asyncInstantiationBL.getOrchestrationRequestsPath()).thenReturn("");
+
+        RestObject<AsyncRequestStatus> msoResponse = mock(RestObject.class);
+        AsyncRequestStatus requestStatus = AsyncInstantiationBaseTest.asyncRequestStatusResponse("");
+
+        when(msoResponse.getStatusCode()).thenReturn(200);
+        when(msoResponse.get()).thenReturn(requestStatus);
+        when(restMso.GetForObject(contains(requestId), eq(AsyncRequestStatus.class))).thenReturn(msoResponse);
+
+        when(asyncInstantiationBL.calcStatus(any())).thenReturn(expectedJobStatus);
+
+        ExpiryChecker expiryChecker = mock(ExpiryChecker.class);
+        when(expiryChecker.isExpired(any())).thenReturn(false);
+
+        JobSharedData sharedData = new JobSharedData(jobUuid, userId, serviceInstantiation);
+        Job.JobStatus actualJobStatus = inProgressStatusService.call(expiryChecker, sharedData, requestId);
+        assertEquals(expectedJobStatus, actualJobStatus);
+
+        verify(asyncInstantiationBL).auditMsoStatus(eq(jobUuid), same(requestStatus.request));
+
+        //verify we don't update service info during this case, which shall stay in_progress
+        verify(asyncInstantiationBL, never()).updateServiceInfo(any(), any());
+
+
+    }
+
+}
-- 
cgit 1.2.3-korg