added unit test for class

Adding unit tests for the infraactiverepositorycustomcontroller
and fixing an issue found while adding the test

Change-Id: Ic177f75c995ee789902dc9ad1b7df0e997b998c9
Issue-ID: SO-876
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

2 files changed, 259 insertions, 10 deletions

diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomController.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomController.java
index dea6512d38..34bf9cb0f5 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomController.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomController.java
@@ -24,12 +24,13 @@ import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.data.controller.InstanceNameDuplicateCheckRequest;
 import org.onap.so.db.request.data.repository.InfraActiveRequestsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
 
-import javax.ws.rs.PathParam;
 import java.util.List;
 import java.util.Map;
 
@@ -38,20 +39,24 @@ public class InfraActiveRequestsRepositoryCustomController {
 
     @Autowired
     InfraActiveRequestsRepository infraActiveRequestsRepository;
+
     @RequestMapping(method = RequestMethod.POST, value = "/infraActiveRequests/getCloudOrchestrationFiltersFromInfraActive")
-    public List<InfraActiveRequests> getCloudOrchestrationFiltersFromInfraActive(@RequestBody Map<String, String> orchestrationMap){
+    public List<InfraActiveRequests> getCloudOrchestrationFiltersFromInfraActive(@RequestBody Map<String, String> orchestrationMap) {
         return infraActiveRequestsRepository.getCloudOrchestrationFiltersFromInfraActive(orchestrationMap);
     }
+
     @RequestMapping(method = RequestMethod.POST, value = "/infraActiveRequests/getOrchestrationFiltersFromInfraActive")
-    public List<InfraActiveRequests> getOrchestrationFiltersFromInfraActive(@RequestBody Map<String, List<String>> orchestrationMap){
-        return  infraActiveRequestsRepository.getOrchestrationFiltersFromInfraActive(orchestrationMap);
+    public List<InfraActiveRequests> getOrchestrationFiltersFromInfraActive(@RequestBody Map<String, List<String>> orchestrationMap) {
+        return infraActiveRequestsRepository.getOrchestrationFiltersFromInfraActive(orchestrationMap);
     }
-    @RequestMapping(method = RequestMethod.GET, value = "/infraActiveRequests/checkVnfIdStatus/{nsInstanceId}")
-    public InfraActiveRequests checkVnfIdStatus(@PathParam("nsInstanceId") String operationalEnvironmentId){
+
+    @RequestMapping(method = RequestMethod.GET, value = "/infraActiveRequests/checkVnfIdStatus/{operationalEnvironmentId}")
+    public InfraActiveRequests checkVnfIdStatus(@PathVariable("operationalEnvironmentId") String operationalEnvironmentId) {
         return infraActiveRequestsRepository.checkVnfIdStatus(operationalEnvironmentId);
     }
+
     @RequestMapping(method = RequestMethod.POST, value = "/infraActiveRequests/checkInstanceNameDuplicate")
-    public InfraActiveRequests checkInstanceNameDuplicate(@RequestBody InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest){
-        return infraActiveRequestsRepository.checkInstanceNameDuplicate(instanceNameDuplicateCheckRequest.getInstanceIdMap(), instanceNameDuplicateCheckRequest.getInstanceName(),instanceNameDuplicateCheckRequest.getRequestScope());
+    public InfraActiveRequests checkInstanceNameDuplicate(@RequestBody InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest) {
+        return infraActiveRequestsRepository.checkInstanceNameDuplicate(instanceNameDuplicateCheckRequest.getInstanceIdMap(), instanceNameDuplicateCheckRequest.getInstanceName(), instanceNameDuplicateCheckRequest.getRequestScope());
     }
 }
diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java
new file mode 100644
index 0000000000..58eb0085ad
--- /dev/null
+++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java
@@ -0,0 +1,244 @@
+package org.onap.so.adapters.requestsdb;
+
+
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.so.adapters.requestsdb.application.MSORequestDBApplication;
+import org.onap.so.db.request.beans.InfraActiveRequests;
+import org.onap.so.db.request.data.controller.InstanceNameDuplicateCheckRequest;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.UUID;
+import java.util.ArrayList;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = MSORequestDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ActiveProfiles("test")
+@Transactional
+public class InfraActiveRequestsRepositoryCustomControllerTest {
+
+    @LocalServerPort
+    private int port;
+
+    private String createURLWithPort(String uri) {
+        return "http://localhost:" + port + uri;
+    }
+
+    private InfraActiveRequests infraActiveRequests;
+    private InfraActiveRequests infraActiveRequestsResponse;
+    private HttpHeaders headers;
+    private TestRestTemplate restTemplate;
+
+    private void verifyInfraActiveRequests() {
+        assertEquals(infraActiveRequests.getRequestId(), infraActiveRequestsResponse.getRequestId());
+        assertEquals(infraActiveRequests.getServiceInstanceId(), infraActiveRequestsResponse.getServiceInstanceId());
+        assertEquals(infraActiveRequests.getServiceInstanceName(), infraActiveRequestsResponse.getServiceInstanceName());
+        assertEquals(infraActiveRequests.getVnfId(), infraActiveRequestsResponse.getVnfId());
+        assertEquals(infraActiveRequests.getVnfName(), infraActiveRequestsResponse.getVnfName());
+        assertEquals(infraActiveRequests.getVfModuleId(), infraActiveRequestsResponse.getVfModuleId());
+        assertEquals(infraActiveRequests.getVfModuleName(), infraActiveRequestsResponse.getVfModuleName());
+        assertEquals(infraActiveRequests.getVolumeGroupId(), infraActiveRequestsResponse.getVolumeGroupId());
+        assertEquals(infraActiveRequests.getVolumeGroupName(), infraActiveRequestsResponse.getVolumeGroupName());
+        assertEquals(infraActiveRequests.getNetworkId(), infraActiveRequestsResponse.getNetworkId());
+        assertEquals(infraActiveRequests.getNetworkName(), infraActiveRequestsResponse.getNetworkName());
+        assertEquals(infraActiveRequests.getConfigurationId(), infraActiveRequestsResponse.getConfigurationId());
+        assertEquals(infraActiveRequests.getConfigurationName(), infraActiveRequestsResponse.getConfigurationName());
+        assertEquals(infraActiveRequests.getAaiServiceId(), infraActiveRequestsResponse.getAaiServiceId());
+        assertEquals(infraActiveRequests.getTenantId(), infraActiveRequestsResponse.getTenantId());
+        assertEquals(infraActiveRequests.getRequestScope(), infraActiveRequestsResponse.getRequestScope());
+        assertEquals(infraActiveRequests.getRequestorId(), infraActiveRequestsResponse.getRequestorId());
+        assertEquals(infraActiveRequests.getSource(), infraActiveRequestsResponse.getSource());
+        assertEquals(infraActiveRequests.getOperationalEnvId(), infraActiveRequestsResponse.getOperationalEnvId());
+        assertEquals(infraActiveRequests.getOperationalEnvName(), infraActiveRequestsResponse.getOperationalEnvName());
+        assertEquals(infraActiveRequests.getRequestStatus(), infraActiveRequestsResponse.getRequestStatus());
+        assertEquals(infraActiveRequests.getAction(), infraActiveRequestsResponse.getAction());
+    }
+
+    @Before
+    public void setup() {
+
+        headers = new HttpHeaders();
+        restTemplate = new TestRestTemplate("test", "test");
+
+        headers.set("Accept", MediaType.APPLICATION_JSON);
+        headers.set("Content-Type", MediaType.APPLICATION_JSON);
+
+        infraActiveRequests = new InfraActiveRequests();
+
+        infraActiveRequests.setRequestId(UUID.randomUUID().toString());
+        infraActiveRequests.setOperationalEnvId(UUID.randomUUID().toString());
+        infraActiveRequests.setServiceInstanceId(UUID.randomUUID().toString());
+        infraActiveRequests.setServiceInstanceName("serviceInstanceNameTest");
+        infraActiveRequests.setVnfId(UUID.randomUUID().toString());
+        infraActiveRequests.setVnfName("vnfInstanceNameTest");
+        infraActiveRequests.setVfModuleId(UUID.randomUUID().toString());
+        infraActiveRequests.setVfModuleName("vfModuleInstanceNameTest");
+        infraActiveRequests.setVolumeGroupId(UUID.randomUUID().toString());
+        infraActiveRequests.setVolumeGroupName("volumeGroupInstanceNameTest");
+        infraActiveRequests.setNetworkId(UUID.randomUUID().toString());
+        infraActiveRequests.setNetworkName("networkInstanceNameTest");
+        infraActiveRequests.setConfigurationId(UUID.randomUUID().toString());
+        infraActiveRequests.setConfigurationName("configurationInstanceNameTest");
+        infraActiveRequests.setAicCloudRegion("1");
+        infraActiveRequests.setTenantId(UUID.randomUUID().toString());
+        infraActiveRequests.setRequestScope("operationalEnvironment");
+        infraActiveRequests.setRequestorId(UUID.randomUUID().toString());
+        infraActiveRequests.setSource("sourceTest");
+        infraActiveRequests.setOperationalEnvName(UUID.randomUUID().toString());
+        infraActiveRequests.setRequestStatus("IN_PROGRESS");
+        infraActiveRequests.setAction("create");
+
+        HttpEntity<String> entity = new HttpEntity(infraActiveRequests, headers);
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests"));
+        ResponseEntity<String> response = restTemplate.exchange(
+                builder.toUriString(),
+                HttpMethod.POST, entity, String.class);
+
+        assertEquals(201, response.getStatusCodeValue());
+    }
+
+
+    @Test
+    public void getCloudOrchestrationFiltersFromInfraActiveTest() {
+
+        Map<String, String> requestMap = new HashMap<>();
+        requestMap.put("operationalEnvironmentId", infraActiveRequests.getOperationalEnvId());
+        requestMap.put("operationalEnvironmentName", infraActiveRequests.getOperationalEnvName());
+        requestMap.put("resourceType", "operationalEnvironment");
+
+        HttpEntity<Map<String, String>> entity = new HttpEntity<>(requestMap, headers);
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/getCloudOrchestrationFiltersFromInfraActive");
+
+        ResponseEntity<List<InfraActiveRequests>> response = restTemplate.exchange(
+                builder.toUriString(),
+                HttpMethod.POST, entity, new ParameterizedTypeReference<List<InfraActiveRequests>>() {
+                });
+
+        List<InfraActiveRequests> iarr = response.getBody();
+        assertEquals(200, response.getStatusCodeValue());
+
+        assertTrue(iarr.size() == 1);
+        infraActiveRequestsResponse = iarr.get(0);
+
+        verifyInfraActiveRequests();
+
+    }
+
+    @Test
+    public void getOrchestrationFiltersFromInfraActiveTest() {
+
+        Map<String, List<String>> requestMap = new HashMap<>();
+        List<String> values = new ArrayList<>();
+        values.add("EQUALS");
+        values.add(infraActiveRequests.getServiceInstanceId());
+        requestMap.put("serviceInstanceId", values);
+
+        values = new ArrayList<>();
+        values.add("EQUALS");
+        values.add(infraActiveRequests.getServiceInstanceName());
+        requestMap.put("serviceInstanceName", values);
+
+        HttpEntity<Map<String, List<String>>> entityList = new HttpEntity(requestMap, headers);
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/getOrchestrationFiltersFromInfraActive");
+
+        ResponseEntity<List<InfraActiveRequests>> response = restTemplate.exchange(
+                builder.toUriString(),
+                HttpMethod.POST, entityList, new ParameterizedTypeReference<List<InfraActiveRequests>>() {
+                });
+
+        List<InfraActiveRequests> iarr = response.getBody();
+
+        assertEquals(200, response.getStatusCodeValue());
+
+        assertTrue(iarr.size() == 1);
+        infraActiveRequestsResponse = iarr.get(0);
+
+        verifyInfraActiveRequests();
+    }
+
+    @Test
+    public void checkVnfIdStatusTest() {
+
+        HttpEntity<List<String>> entityList = new HttpEntity("", headers);
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests" + "/checkVnfIdStatus/" + infraActiveRequests.getOperationalEnvId()));
+
+        ResponseEntity<InfraActiveRequests> response = restTemplate.exchange(
+                builder.toUriString(),
+                HttpMethod.GET, HttpEntity.EMPTY, InfraActiveRequests.class);
+
+        infraActiveRequestsResponse = response.getBody();
+
+        assertEquals(200, response.getStatusCodeValue());
+
+        verifyInfraActiveRequests();
+    }
+
+    @Test
+    public void checkInstanceNameDuplicateTest() {
+
+        InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest = new InstanceNameDuplicateCheckRequest((HashMap<String, String>) null,
+                infraActiveRequests.getOperationalEnvName(),
+                infraActiveRequests.getRequestScope());
+
+        HttpEntity<InstanceNameDuplicateCheckRequest> entityList = new HttpEntity(instanceNameDuplicateCheckRequest, headers);
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate");
+
+        ResponseEntity<InfraActiveRequests> response = restTemplate.exchange(
+                builder.toUriString(),
+                HttpMethod.POST, entityList, new ParameterizedTypeReference<InfraActiveRequests>() {
+                });
+
+        infraActiveRequestsResponse = response.getBody();
+
+        assertEquals(200, response.getStatusCodeValue());
+
+        verifyInfraActiveRequests();
+    }
+
+    @Test
+    public void checkInstanceNameDuplicateViaTest() {
+
+        Map<String, String> requestMap = new HashMap<>();
+        requestMap.put("operationalEnvironmentId", infraActiveRequests.getOperationalEnvId());
+
+        InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest = new InstanceNameDuplicateCheckRequest((HashMap<String, String>) requestMap,
+                null,
+                infraActiveRequests.getRequestScope());
+
+        HttpEntity<InstanceNameDuplicateCheckRequest> entityList = new HttpEntity(instanceNameDuplicateCheckRequest, headers);
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate");
+
+        ResponseEntity<InfraActiveRequests> response = restTemplate.exchange(
+                builder.toUriString(),
+                HttpMethod.POST, entityList, new ParameterizedTypeReference<InfraActiveRequests>() {
+                });
+
+        infraActiveRequestsResponse = response.getBody();
+
+        assertEquals(200, response.getStatusCodeValue());
+
+        verifyInfraActiveRequests();
+    }
+}
\ No newline at end of file