Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

1 files changed, 81 insertions, 158 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/services/ChangeManagementServiceImplTest.java b/vid-app-common/src/test/java/org/onap/vid/services/ChangeManagementServiceImplTest.java
index 7819b4c9f..157f59c74 100644
--- a/vid-app-common/src/test/java/org/onap/vid/services/ChangeManagementServiceImplTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/services/ChangeManagementServiceImplTest.java
@@ -1,193 +1,116 @@
 package org.onap.vid.services;
 
-import static org.junit.Assert.*;
-import java.util.*;
-
-import org.json.simple.JSONArray;
-import org.junit.Assert;
-import org.junit.Test;
-import org.onap.portalsdk.core.service.DataAccessService;
-import org.onap.portalsdk.core.service.DataAccessServiceImpl;
+import org.mockito.*;
 import org.onap.vid.changeManagement.ChangeManagementRequest;
-import org.onap.vid.changeManagement.GetVnfWorkflowRelationRequest;
 import org.onap.vid.changeManagement.RequestDetails;
-import org.onap.vid.changeManagement.VnfWorkflowRelationAllResponse;
-import org.onap.vid.changeManagement.VnfWorkflowRelationRequest;
-import org.onap.vid.changeManagement.VnfWorkflowRelationResponse;
 import org.onap.vid.mso.MsoBusinessLogic;
-import org.onap.vid.mso.MsoBusinessLogicImpl;
-import org.onap.vid.mso.rest.MsoRestClientNew;
-import org.onap.vid.mso.rest.Request;
+import org.onap.vid.mso.MsoResponseWrapperInterface;
+import org.onap.vid.scheduler.SchedulerRestInterfaceIfc;
+import org.onap.portalsdk.core.service.DataAccessService;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.multipart.MultipartFile;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.mockito.Mockito.verify;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
 
+@Test
 public class ChangeManagementServiceImplTest {
 
-    private ChangeManagementServiceImpl createTestSubject() {
-        return new ChangeManagementServiceImpl(new DataAccessServiceImpl(),
-                new MsoBusinessLogicImpl(new MsoRestClientNew()));
-    }
+    @Mock
+    DataAccessService dataAccessServiceMock;
 
-    @Test
-    public void testGetMSOChangeManagements() throws Exception {
-        ChangeManagementServiceImpl testSubject;
-        Collection<Request> result;
+    @Mock
+    MsoBusinessLogic msoBusinessLogicMock;
+
+    @Mock
+    SchedulerRestInterfaceIfc schedulerRestInterface;
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getMSOChangeManagements();
+    @BeforeMethod
+    public void initMocks(){
+        MockitoAnnotations.initMocks(this);
     }
 
     @Test
-    public void testDoChangeManagement() throws Exception {
-        ChangeManagementServiceImpl testSubject;
-        ChangeManagementRequest request = null;
-        String vnfName = "";
-        ResponseEntity<String> result;
-
-        // test 1
-        testSubject = createTestSubject();
-        request = null;
-        result = testSubject.doChangeManagement(request, vnfName);
-        Assert.assertEquals(null, result);
+    public void doChangeManagement_requestIsNull_returnsNull() throws Exception {
+        ChangeManagementServiceImpl changeManagementService = new ChangeManagementServiceImpl(dataAccessServiceMock, msoBusinessLogicMock, schedulerRestInterface);
+        ResponseEntity<String> result = changeManagementService.doChangeManagement(null,"anyString");
+        assertNull(result);
     }
 
     @Test
-    public void testGetSchedulerChangeManagements() throws Exception {
-        ChangeManagementServiceImpl testSubject;
-        JSONArray result;
+    public void doChangeManagement_currentRequestDetailsIsNull_returnsNull() throws Exception {
+        ChangeManagementServiceImpl changeManagementService = new ChangeManagementServiceImpl(dataAccessServiceMock, msoBusinessLogicMock, schedulerRestInterface);
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getSchedulerChangeManagements();
-    }
+        ChangeManagementServiceImpl changeManagementServiceSpied = Mockito.spy(changeManagementService);
+        Mockito.doReturn(null).when(changeManagementServiceSpied).findRequestByVnfName(Matchers.anyList(),Mockito.anyString());
 
-    @Test
-    public void testDeleteSchedule() throws Exception {
-        ChangeManagementServiceImpl testSubject;
-        String scheduleId = "";
+        ResponseEntity<String> result = changeManagementServiceSpied.doChangeManagement(null,"anyString");
 
-        // default test
-        testSubject = createTestSubject();
-        testSubject.deleteSchedule(scheduleId);
+        assertNull(result);
     }
 
-    @Test
-    public void testAddVnfWorkflowRelation() throws Exception {
-        ChangeManagementServiceImpl testSubject;
-        VnfWorkflowRelationRequest vnfWorkflowRelationRequest = null;
-        VnfWorkflowRelationResponse result;
-
-        // default test
-        try {
-            testSubject = createTestSubject();
-            result = testSubject.addVnfWorkflowRelation(vnfWorkflowRelationRequest);
-        } catch (
-
-        Exception e) {
-        }
-    }
 
     @Test
-    public void testDeleteVnfWorkflowRelation() throws Exception {
-        ChangeManagementServiceImpl testSubject;
-        VnfWorkflowRelationRequest vnfWorkflowRelationRequest = null;
-        VnfWorkflowRelationResponse result;
-
-        // default test
-        try {
-            testSubject = createTestSubject();
-            result = testSubject.deleteVnfWorkflowRelation(vnfWorkflowRelationRequest);
-        } catch (
-
-        Exception e) {
-        }
+    public void  doChangeManagement_requestTypeIsUpdate_MsoUpdateVnfIsCalled() throws Exception {
+        Mockito.doReturn(Mockito.mock(MsoResponseWrapperInterface.class)).when(msoBusinessLogicMock).updateVnf(Mockito.any(),Mockito.anyString(),Mockito.anyString());
+        RequestDetails requestDetails = callChangeManagement(ChangeManagementRequest.UPDATE);
+
+        ArgumentCaptor<RequestDetails> argumentCaptor = ArgumentCaptor.forClass(RequestDetails.class);
+        verify(msoBusinessLogicMock).updateVnf(argumentCaptor.capture(),Mockito.anyString(),Mockito.anyString());
+        assertEquals(argumentCaptor.getValue().getVnfInstanceId(),requestDetails.getVnfInstanceId());
     }
 
     @Test
-    public void testGetAllVnfWorkflowRelations() throws Exception {
-        ChangeManagementServiceImpl testSubject;
-        VnfWorkflowRelationAllResponse result;
-
-        // default test
-        try {
-            testSubject = createTestSubject();
-            result = testSubject.getAllVnfWorkflowRelations();
-        } catch (
-
-        Exception e) {
-        }
+    public void  doChangeManagement_requestTypeIsReplace_MsoUpdateVnfIsCalled() throws Exception {
+        Mockito.doReturn(Mockito.mock(MsoResponseWrapperInterface.class)).when(msoBusinessLogicMock).replaceVnf(Mockito.any(),Mockito.anyString(),Mockito.anyString());
+        RequestDetails requestDetails = callChangeManagement(ChangeManagementRequest.REPLACE);
+
+
+        ArgumentCaptor<RequestDetails> argumentCaptor = ArgumentCaptor.forClass(RequestDetails.class);
+
+        verify(msoBusinessLogicMock).replaceVnf(argumentCaptor.capture(),Mockito.anyString(),Mockito.anyString());
+        assertEquals(argumentCaptor.getValue().getVnfInstanceId(),requestDetails.getVnfInstanceId());
     }
 
     @Test
-    public void testGetWorkflowsForVnf() throws Exception {
-        ChangeManagementServiceImpl testSubject;
-        GetVnfWorkflowRelationRequest getVnfWorkflowRelationRequest = null;
-        List<String> result;
-
-        // default test
-        try {
-            testSubject = createTestSubject();
-            result = testSubject.getWorkflowsForVnf(getVnfWorkflowRelationRequest);
-        } catch (
-
-        Exception e) {
-        }
+    public void  doChangeManagement_requestTypeIsInPlaceSoftwareUpdate_MsoUpdateVnfIsCalled() throws Exception {
+        Mockito.doReturn(Mockito.mock(MsoResponseWrapperInterface.class)).when(msoBusinessLogicMock).updateVnfSoftware(Mockito.any(),Mockito.anyString(),Mockito.anyString());
+        RequestDetails requestDetails = callChangeManagement(ChangeManagementRequest.VNF_IN_PLACE_SOFTWARE_UPDATE);
+
+
+        ArgumentCaptor<RequestDetails> argumentCaptor = ArgumentCaptor.forClass(RequestDetails.class);
+
+        verify(msoBusinessLogicMock).updateVnfSoftware(argumentCaptor.capture(),Mockito.anyString(),Mockito.anyString());
+        assertEquals(argumentCaptor.getValue().getVnfInstanceId(),requestDetails.getVnfInstanceId());
     }
 
     @Test
-    public void testUploadConfigUpdateFile() throws Exception {
-        ChangeManagementServiceImpl testSubject;
-        MultipartFile file = null;
-        String result;
-
-        // default test
-        try {
-            testSubject = createTestSubject();
-            result = testSubject.uploadConfigUpdateFile(file);
-        } catch (
-
-        Exception e) {
-        }
+    public void  doChangeManagement_requestTypeIsConfigUpdate_MsoUpdateVnfIsCalled() throws Exception {
+        Mockito.doReturn(Mockito.mock(MsoResponseWrapperInterface.class)).when(msoBusinessLogicMock).updateVnfConfig(Mockito.any(),Mockito.anyString(),Mockito.anyString());
+        RequestDetails requestDetails = callChangeManagement(ChangeManagementRequest.CONFIG_UPDATE);
+
+
+        ArgumentCaptor<RequestDetails> argumentCaptor = ArgumentCaptor.forClass(RequestDetails.class);
+
+        verify(msoBusinessLogicMock).updateVnfConfig(argumentCaptor.capture(),Mockito.anyString(),Mockito.anyString());
+        assertEquals(argumentCaptor.getValue().getVnfInstanceId(),requestDetails.getVnfInstanceId());
     }
 
-    /*
-     * TODO: fix private ChangeManagementServiceImpl createTestSubject() {
-     * return new ChangeManagementServiceImpl(); }
-     */
-
-    /*
-     * @Test public void testGetMSOChangeManagements() throws Exception {
-     * ChangeManagementServiceImpl testSubject; Collection<Request> result;
-     * 
-     * // default test testSubject = createTestSubject(); result =
-     * testSubject.getMSOChangeManagements(); }
-     * 
-     * 
-     * @Test public void testFindRequestByVnfName() throws Exception {
-     * ChangeManagementServiceImpl testSubject;List<RequestDetails> requests =
-     * null; String vnfName = ""; RequestDetails result;
-     * 
-     * // test 1 testSubject=createTestSubject();requests = null;
-     * result=Deencapsulation.invoke(testSubject, "findRequestByVnfName", new
-     * Object[]{List<RequestDetails>.class, vnfName}); Assert.assertEquals(null,
-     * result); }
-     */
-    /*
-     * 
-     * @Test public void testDoChangeManagement() throws Exception {
-     * ChangeManagementServiceImpl testSubject; ChangeManagementRequest request
-     * = null; String vnfName = ""; ResponseEntity<String> result;
-     * 
-     * // test 1 testSubject = createTestSubject(); request = null; result =
-     * testSubject.doChangeManagement(request, vnfName);
-     * Assert.assertEquals(null, result); }
-     * 
-     * 
-     * @Test public void testGetSchedulerChangeManagements() throws Exception {
-     * ChangeManagementServiceImpl testSubject; JSONArray result;
-     * 
-     * // default test testSubject = createTestSubject(); result =
-     * testSubject.getSchedulerChangeManagements(); }
-     */
-}
\ No newline at end of file
+    private RequestDetails callChangeManagement(String requestType) throws Exception {
+        ChangeManagementServiceImpl changeManagementService = new ChangeManagementServiceImpl(dataAccessServiceMock, msoBusinessLogicMock, schedulerRestInterface);
+        ChangeManagementServiceImpl changeManagementServiceSpied = Mockito.spy(changeManagementService);
+        ChangeManagementRequest updateRequest = new ChangeManagementRequest();
+
+        updateRequest.setRequestType(requestType);
+        RequestDetails requestDetails = new RequestDetails();
+        requestDetails.setVnfInstanceId("vnfFakeId");
+        Mockito.doReturn("fakeId").when(changeManagementServiceSpied).extractServiceInstanceId(Mockito.anyObject(),Mockito.anyString());
+        Mockito.doReturn(requestDetails).when(changeManagementServiceSpied).findRequestByVnfName(Matchers.anyList(),Mockito.anyString());
+
+        changeManagementServiceSpied.doChangeManagement(updateRequest,"anyVnfName");
+
+        return requestDetails;
+    }
+}