Fix and improvement for MsoBusinessLogic tests

- Merged two test classes into one
Moved unit tests from MsoBusinessLogic to MsoBusinessLogicImpl
- unified unit test framework - using junit instead of testng
- Fixed issue with broken unit tests when run in IDE
- improved readability of unit tests
- Fixed commented/ignored unit tests
- RequestDetailsWrapper encapsulation fix

Change-Id: I7f589b36757b09f41b3568d8aa8a932bd914ac0d
Issue-ID: VID-283
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>

1 files changed, 0 insertions, 61 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicTest.java
deleted file mode 100644
index af7f74b3..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.onap.vid.mso;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.vid.mso.MsoBusinessLogicImpl;
-import org.onap.vid.mso.MsoInterface;
-import org.onap.vid.mso.MsoResponseWrapper;
-import org.onap.vid.mso.rest.RequestDetails;
-import org.onap.vid.mso.rest.RequestDetailsWrapper;
-import org.testng.annotations.Test;
-
-import java.net.URL;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-@RunWith(MockitoJUnitRunner.class)
-public class MsoBusinessLogicTest {
-
-    @InjectMocks
-    private MsoBusinessLogicImpl msoBusinessLogic;
-
-    @Mock
-    private MsoInterface msoClient;
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        String instanceId = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d";
-        final RequestDetailsWrapper requestDetailsWrapper = new RequestDetailsWrapper();
-        requestDetailsWrapper.requestDetails = setRequestDetails("mso_request_create_configuration.json");
-        Mockito.doReturn(getOkResponse(instanceId)).when(msoClient).createConfigurationInstance(requestDetailsWrapper, "/serviceInstances/v6/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/configurations");
-        final MsoResponseWrapper msoResponseWrapper = msoBusinessLogic.createConfigurationInstance(requestDetailsWrapper, instanceId);
-
-        assertNotNull(msoResponseWrapper);
-        assertEquals(202, msoResponseWrapper.getStatus());
-    }
-
-    private MsoResponseWrapper getOkResponse(String instanceId){
-        MsoResponseWrapper responseWrapper = new MsoResponseWrapper();
-        String entity = " \"body\": {\n" +
-                "      \"requestReferences\": {\n" +
-                "        \"instanceId\": \""+instanceId+"\",\n" +
-                "        \"requestId\": \"b6dc9806-b094-42f7-9386-a48de8218ce8\"\n" +
-                "      }";
-        responseWrapper.setEntity(entity);
-        responseWrapper.setStatus(202);
-        return responseWrapper;
-    }
-
-    private RequestDetails setRequestDetails(String bodyFileName)throws Exception {
-        final URL resource = this.getClass().getResource("/payload_jsons/" + bodyFileName);
-        ObjectMapper mapper = new ObjectMapper();
-        RequestDetails requestDetails = mapper.readValue(resource, RequestDetails.class);
-        return requestDetails;
-
-    }
-}