Replaced all tabs with spaces in java and pom.xml
[so.git] / mso-api-handlers / mso-api-handler-infra / src / test / java / org / onap / so / apihandlerinfra / RequestHandlerUtilsTest.java
index a5f9514..dc0cd47 100644 (file)
@@ -32,20 +32,16 @@ import static org.junit.Assert.assertTrue;
 import static org.onap.so.logger.HttpHeadersConstants.ONAP_REQUEST_ID;
 import static org.onap.so.logger.HttpHeadersConstants.REQUESTOR_ID;
 import static org.onap.so.logger.MdcConstants.CLIENT_ID;
-
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
-
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.MediaType;
-
 import org.apache.http.HttpStatus;
 import org.junit.Before;
-
 import org.junit.Test;
 import org.onap.logging.ref.slf4j.ONAPLogConstants;
 import org.onap.so.apihandlerinfra.exceptions.ContactCamundaException;
@@ -65,7 +61,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.util.UriComponentsBuilder;
-
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -73,92 +68,91 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class RequestHandlerUtilsTest extends BaseTest{
+public class RequestHandlerUtilsTest extends BaseTest {
+
+    private final ObjectMapper mapper = new ObjectMapper();
+    private ObjectMapper errorMapper = new ObjectMapper();
 
-       private final ObjectMapper mapper = new ObjectMapper();
-       private ObjectMapper errorMapper = new ObjectMapper();
-       
     @Autowired
     private RequestHandlerUtils requestHandlerUtils;
 
-       @Value("${wiremock.server.port}")
-       private String wiremockPort;
-    
+    @Value("${wiremock.server.port}")
+    private String wiremockPort;
+
     private URL initialUrl;
     private int initialPort;
     private HttpHeaders headers;
 
-       @Before
-       public  void beforeClass() {
-               mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-               errorMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-               errorMapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
+    @Before
+    public void beforeClass() {
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        errorMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        errorMapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
         // set headers
-               headers = new HttpHeaders();
-        headers.set(ONAPLogConstants.Headers.PARTNER_NAME, "test_name");        
-               headers.set(HttpHeadersConstants.TRANSACTION_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
+        headers = new HttpHeaders();
+        headers.set(ONAPLogConstants.Headers.PARTNER_NAME, "test_name");
+        headers.set(HttpHeadersConstants.TRANSACTION_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
         headers.set(ONAP_REQUEST_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
         headers.set(ONAPLogConstants.MDCs.REQUEST_ID, "32807a28-1a14-4b88-b7b3-2950918aa76d");
         headers.set(CLIENT_ID, "VID");
         headers.set(REQUESTOR_ID, "xxxxxx");
-               try {  // generate one-time port number to avoid RANDOM port number later.
-                       initialUrl = new URL(createURLWithPort(Constants.ORCHESTRATION_REQUESTS_PATH));
-                       initialPort = initialUrl.getPort();
-               } catch (MalformedURLException e) {
-                       e.printStackTrace();
-               } 
-               wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests.*"))
-                               .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                                               .withStatus(HttpStatus.SC_OK)));
-       }
-       
-    public String inputStream(String JsonInput)throws IOException{
+        try { // generate one-time port number to avoid RANDOM port number later.
+            initialUrl = new URL(createURLWithPort(Constants.ORCHESTRATION_REQUESTS_PATH));
+            initialPort = initialUrl.getPort();
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+        wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests.*")).willReturn(aResponse()
+                .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON).withStatus(HttpStatus.SC_OK)));
+    }
+
+    public String inputStream(String JsonInput) throws IOException {
         JsonInput = "src/test/resources/ServiceInstanceTest" + JsonInput;
         return new String(Files.readAllBytes(Paths.get(JsonInput)));
     }
-    
-       public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod, HttpHeaders headers){
-               
-               if (!headers.containsKey(HttpHeaders.ACCEPT)) {
-                       headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
-               }
-               if (!headers.containsKey(HttpHeaders.CONTENT_TYPE)) {
-                       headers.set(HttpHeaders.CONTENT_TYPE,MediaType.APPLICATION_JSON);
-               }
+
+    public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod,
+            HttpHeaders headers) {
+
+        if (!headers.containsKey(HttpHeaders.ACCEPT)) {
+            headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
+        }
+        if (!headers.containsKey(HttpHeaders.CONTENT_TYPE)) {
+            headers.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+        }
 
         UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(uriPath, initialPort));
 
         HttpEntity<String> request = new HttpEntity<>(requestJson, headers);
 
-        return restTemplate.exchange(builder.toUriString(),
-                reqMethod, request, String.class);
+        return restTemplate.exchange(builder.toUriString(), reqMethod, request, String.class);
     }
-       
-    public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod){
-       return sendRequest(requestJson, uriPath, reqMethod, new HttpHeaders());
+
+    public ResponseEntity<String> sendRequest(String requestJson, String uriPath, HttpMethod reqMethod) {
+        return sendRequest(requestJson, uriPath, reqMethod, new HttpHeaders());
     }
 
     @Test
-    public void test_mapJSONtoMSOStyle() throws IOException{
+    public void test_mapJSONtoMSOStyle() throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         mapper.setSerializationInclusion(Include.NON_NULL);
-        String testRequest= inputStream("/ServiceInstanceDefault.json");
+        String testRequest = inputStream("/ServiceInstanceDefault.json");
         String resultString = requestHandlerUtils.mapJSONtoMSOStyle(testRequest, null, false, null);
         ServiceInstancesRequest sir = mapper.readValue(resultString, ServiceInstancesRequest.class);
         ModelInfo modelInfo = sir.getRequestDetails().getModelInfo();
-        assertEquals("f7ce78bb-423b-11e7-93f8-0050569a796",modelInfo.getModelCustomizationUuid());
-        assertEquals("modelInstanceName",modelInfo.getModelInstanceName());
-        assertEquals("f7ce78bb-423b-11e7-93f8-0050569a7965",modelInfo.getModelInvariantUuid());
-        assertEquals("10",modelInfo.getModelUuid());
+        assertEquals("f7ce78bb-423b-11e7-93f8-0050569a796", modelInfo.getModelCustomizationUuid());
+        assertEquals("modelInstanceName", modelInfo.getModelInstanceName());
+        assertEquals("f7ce78bb-423b-11e7-93f8-0050569a7965", modelInfo.getModelInvariantUuid());
+        assertEquals("10", modelInfo.getModelUuid());
 
     }
-    
-    
+
+
     @Test
-    public void test_mapJSONtoMSOStyleUsePreload() throws IOException{
+    public void test_mapJSONtoMSOStyleUsePreload() throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         mapper.setSerializationInclusion(Include.NON_NULL);
-        String testRequest= inputStream("/ServiceInstanceDefault.json");
+        String testRequest = inputStream("/ServiceInstanceDefault.json");
         ServiceInstancesRequest sir = new ServiceInstancesRequest();
         RequestDetails rd = new RequestDetails();
         RequestParameters rp = new RequestParameters();
@@ -168,163 +162,178 @@ public class RequestHandlerUtilsTest extends BaseTest{
         String resultString = requestHandlerUtils.mapJSONtoMSOStyle(testRequest, sir, false, null);
         ServiceInstancesRequest sir1 = mapper.readValue(resultString, ServiceInstancesRequest.class);
         assertTrue(sir1.getRequestDetails().getRequestParameters().getUsePreload());
-    }   
-  
+    }
+
     @Test
-    public void setServiceTypeTestALaCarte() throws JsonProcessingException{
-       String requestScope = ModelType.service.toString();
-       Boolean aLaCarteFlag = true;
-       ServiceInstancesRequest sir = new ServiceInstancesRequest();
-       RequestDetails requestDetails = new RequestDetails();
-       RequestInfo requestInfo = new RequestInfo();
-       requestInfo.setSource("VID");
-       requestDetails.setRequestInfo(requestInfo);
-       sir.setRequestDetails(requestDetails);
-               Service defaultService = new Service();
-               defaultService.setServiceType("testServiceTypeALaCarte");
-       
-               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
+    public void setServiceTypeTestALaCarte() throws JsonProcessingException {
+        String requestScope = ModelType.service.toString();
+        Boolean aLaCarteFlag = true;
+        ServiceInstancesRequest sir = new ServiceInstancesRequest();
+        RequestDetails requestDetails = new RequestDetails();
+        RequestInfo requestInfo = new RequestInfo();
+        requestInfo.setSource("VID");
+        requestDetails.setRequestInfo(requestInfo);
+        sir.setRequestDetails(requestDetails);
+        Service defaultService = new Service();
+        defaultService.setServiceType("testServiceTypeALaCarte");
+
+        wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody(mapper.writeValueAsString(defaultService))
-                        .withStatus(HttpStatus.SC_OK)));
-       
-       String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
-       assertEquals(serviceType, "testServiceTypeALaCarte");
+                        .withBody(mapper.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK)));
+
+        String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
+        assertEquals(serviceType, "testServiceTypeALaCarte");
     }
+
     @Test
-    public void setServiceTypeTest() throws JsonProcessingException{
-       String requestScope = ModelType.service.toString();
-       Boolean aLaCarteFlag = false;
-       ServiceInstancesRequest sir = new ServiceInstancesRequest();
-       RequestDetails requestDetails = new RequestDetails();
-       RequestInfo requestInfo = new RequestInfo();
-       ModelInfo modelInfo = new ModelInfo();
-       modelInfo.setModelVersionId("0dd91181-49da-446b-b839-cd959a96f04a");
-       requestInfo.setSource("VID");
-       requestDetails.setModelInfo(modelInfo);
-       requestDetails.setRequestInfo(requestInfo);
-       sir.setRequestDetails(requestDetails);
-               Service defaultService = new Service();
-               defaultService.setServiceType("testServiceType");
-       
-               wireMockServer.stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
+    public void setServiceTypeTest() throws JsonProcessingException {
+        String requestScope = ModelType.service.toString();
+        Boolean aLaCarteFlag = false;
+        ServiceInstancesRequest sir = new ServiceInstancesRequest();
+        RequestDetails requestDetails = new RequestDetails();
+        RequestInfo requestInfo = new RequestInfo();
+        ModelInfo modelInfo = new ModelInfo();
+        modelInfo.setModelVersionId("0dd91181-49da-446b-b839-cd959a96f04a");
+        requestInfo.setSource("VID");
+        requestDetails.setModelInfo(modelInfo);
+        requestDetails.setRequestInfo(requestInfo);
+        sir.setRequestDetails(requestDetails);
+        Service defaultService = new Service();
+        defaultService.setServiceType("testServiceType");
+
+        wireMockServer.stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody(mapper.writeValueAsString(defaultService))
-                        .withStatus(HttpStatus.SC_OK)));
-       
-       String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
-       assertEquals(serviceType, "testServiceType");
+                        .withBody(mapper.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK)));
+
+        String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
+        assertEquals(serviceType, "testServiceType");
     }
+
     @Test
-    public void setServiceTypeTestDefault() throws JsonProcessingException{
-       String requestScope = ModelType.service.toString();
-       Boolean aLaCarteFlag = false;
-       ServiceInstancesRequest sir = new ServiceInstancesRequest();
-       RequestDetails requestDetails = new RequestDetails();
-       RequestInfo requestInfo = new RequestInfo();
-       ModelInfo modelInfo = new ModelInfo();
-       modelInfo.setModelVersionId("0dd91181-49da-446b-b839-cd959a96f04a");
-       requestInfo.setSource("VID");
-       requestDetails.setModelInfo(modelInfo);
-       requestDetails.setRequestInfo(requestInfo);
-       sir.setRequestDetails(requestDetails);
-               Service defaultService = new Service();
-               defaultService.setServiceType("testServiceType");
-       
-               wireMockServer.stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
+    public void setServiceTypeTestDefault() throws JsonProcessingException {
+        String requestScope = ModelType.service.toString();
+        Boolean aLaCarteFlag = false;
+        ServiceInstancesRequest sir = new ServiceInstancesRequest();
+        RequestDetails requestDetails = new RequestDetails();
+        RequestInfo requestInfo = new RequestInfo();
+        ModelInfo modelInfo = new ModelInfo();
+        modelInfo.setModelVersionId("0dd91181-49da-446b-b839-cd959a96f04a");
+        requestInfo.setSource("VID");
+        requestDetails.setModelInfo(modelInfo);
+        requestDetails.setRequestInfo(requestInfo);
+        sir.setRequestDetails(requestDetails);
+        Service defaultService = new Service();
+        defaultService.setServiceType("testServiceType");
+
+        wireMockServer.stubFor(get(urlMatching(".*/service/0dd91181-49da-446b-b839-cd959a96f04a"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                         .withStatus(HttpStatus.SC_NOT_FOUND)));
-               wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
+        wireMockServer.stubFor(get(urlMatching(".*/service/search/.*"))
                 .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody(mapper.writeValueAsString(defaultService))
-                        .withStatus(HttpStatus.SC_OK)));
-       
-       String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
-       assertEquals(serviceType, "testServiceType");
+                        .withBody(mapper.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK)));
+
+        String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
+        assertEquals(serviceType, "testServiceType");
     }
+
     @Test
-    public void setServiceTypeTestNetwork() throws JsonProcessingException{
-       String requestScope = ModelType.network.toString();
-       Boolean aLaCarteFlag = null;
-       ServiceInstancesRequest sir = new ServiceInstancesRequest();
-       RequestDetails requestDetails = new RequestDetails();
-       RequestInfo requestInfo = new RequestInfo();
-       ModelInfo modelInfo = new ModelInfo();
-       modelInfo.setModelName("networkModelName");
-       requestInfo.setSource("VID");
-       requestDetails.setModelInfo(modelInfo);
-       requestDetails.setRequestInfo(requestInfo);
-       sir.setRequestDetails(requestDetails);
-       
-       String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
-       assertEquals(serviceType, "networkModelName");
+    public void setServiceTypeTestNetwork() throws JsonProcessingException {
+        String requestScope = ModelType.network.toString();
+        Boolean aLaCarteFlag = null;
+        ServiceInstancesRequest sir = new ServiceInstancesRequest();
+        RequestDetails requestDetails = new RequestDetails();
+        RequestInfo requestInfo = new RequestInfo();
+        ModelInfo modelInfo = new ModelInfo();
+        modelInfo.setModelName("networkModelName");
+        requestInfo.setSource("VID");
+        requestDetails.setModelInfo(modelInfo);
+        requestDetails.setRequestInfo(requestInfo);
+        sir.setRequestDetails(requestDetails);
+
+        String serviceType = requestHandlerUtils.getServiceType(requestScope, sir, aLaCarteFlag);
+        assertEquals(serviceType, "networkModelName");
     }
+
     @Test
-    public void setServiceInstanceIdInstanceGroupTest() throws JsonParseException, JsonMappingException, IOException{
-       String requestScope = "instanceGroup";
-       ServiceInstancesRequest sir = mapper.readValue(inputStream("/CreateInstanceGroup.json"), ServiceInstancesRequest.class);
-       assertEquals("ddcbbf3d-f2c1-4ca0-8852-76a807285efc", requestHandlerUtils.setServiceInstanceId(requestScope, sir));
+    public void setServiceInstanceIdInstanceGroupTest() throws JsonParseException, JsonMappingException, IOException {
+        String requestScope = "instanceGroup";
+        ServiceInstancesRequest sir =
+                mapper.readValue(inputStream("/CreateInstanceGroup.json"), ServiceInstancesRequest.class);
+        assertEquals("ddcbbf3d-f2c1-4ca0-8852-76a807285efc",
+                requestHandlerUtils.setServiceInstanceId(requestScope, sir));
     }
+
     @Test
-    public void setServiceInstanceIdTest(){
-       String requestScope = "vnf";
-       ServiceInstancesRequest sir = new ServiceInstancesRequest();
-       sir.setServiceInstanceId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
-       assertEquals("f0a35706-efc4-4e27-80ea-a995d7a2a40f", requestHandlerUtils.setServiceInstanceId(requestScope, sir));
+    public void setServiceInstanceIdTest() {
+        String requestScope = "vnf";
+        ServiceInstancesRequest sir = new ServiceInstancesRequest();
+        sir.setServiceInstanceId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
+        assertEquals("f0a35706-efc4-4e27-80ea-a995d7a2a40f",
+                requestHandlerUtils.setServiceInstanceId(requestScope, sir));
     }
+
     @Test
-    public void setServiceInstanceIdReturnNullTest(){
-       String requestScope = "vnf";
-       ServiceInstancesRequest sir = new ServiceInstancesRequest();
-       assertNull(requestHandlerUtils.setServiceInstanceId(requestScope, sir));
+    public void setServiceInstanceIdReturnNullTest() {
+        String requestScope = "vnf";
+        ServiceInstancesRequest sir = new ServiceInstancesRequest();
+        assertNull(requestHandlerUtils.setServiceInstanceId(requestScope, sir));
     }
+
     @Test
-    public void camundaHistoryCheckTest() throws ContactCamundaException, RequestDbFailureException{
-       wireMockServer.stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBodyFile("Camunda/HistoryCheckResponse.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
-       
-       InfraActiveRequests duplicateRecord = new InfraActiveRequests();
-       duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
-       boolean inProgress = false;
-       inProgress = requestHandlerUtils.camundaHistoryCheck(duplicateRecord, null);
-       assertTrue(inProgress);
+    public void camundaHistoryCheckTest() throws ContactCamundaException, RequestDbFailureException {
+        wireMockServer.stubFor(get(
+                ("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+                        .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                                .withBodyFile("Camunda/HistoryCheckResponse.json")
+                                .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+        InfraActiveRequests duplicateRecord = new InfraActiveRequests();
+        duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
+        boolean inProgress = false;
+        inProgress = requestHandlerUtils.camundaHistoryCheck(duplicateRecord, null);
+        assertTrue(inProgress);
     }
+
     @Test
-    public void camundaHistoryCheckNoneFoundTest() throws ContactCamundaException, RequestDbFailureException{
-       wireMockServer.stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody("[]").withStatus(org.apache.http.HttpStatus.SC_OK)));
-       
-       InfraActiveRequests duplicateRecord = new InfraActiveRequests();
-       duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
-       boolean inProgress = false;
-       inProgress = requestHandlerUtils.camundaHistoryCheck(duplicateRecord, null);
-       assertFalse(inProgress);
+    public void camundaHistoryCheckNoneFoundTest() throws ContactCamundaException, RequestDbFailureException {
+        wireMockServer.stubFor(get(
+                ("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+                        .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                                .withBody("[]").withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+        InfraActiveRequests duplicateRecord = new InfraActiveRequests();
+        duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
+        boolean inProgress = false;
+        inProgress = requestHandlerUtils.camundaHistoryCheck(duplicateRecord, null);
+        assertFalse(inProgress);
     }
+
     @Test
-    public void camundaHistoryCheckNotInProgressTest()throws ContactCamundaException, RequestDbFailureException{
-       wireMockServer.stubFor(get(("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
-                .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBodyFile("Camunda/HistoryCheckResponseCompleted.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
-       
-       InfraActiveRequests duplicateRecord = new InfraActiveRequests();
-       duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
-       boolean inProgress = false;
-       inProgress = requestHandlerUtils.camundaHistoryCheck(duplicateRecord, null);
-       assertFalse(inProgress);
+    public void camundaHistoryCheckNotInProgressTest() throws ContactCamundaException, RequestDbFailureException {
+        wireMockServer.stubFor(get(
+                ("/sobpmnengine/history/process-instance?variables=mso-request-id_eq_f0a35706-efc4-4e27-80ea-a995d7a2a40f"))
+                        .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                                .withBodyFile("Camunda/HistoryCheckResponseCompleted.json")
+                                .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+        InfraActiveRequests duplicateRecord = new InfraActiveRequests();
+        duplicateRecord.setRequestId("f0a35706-efc4-4e27-80ea-a995d7a2a40f");
+        boolean inProgress = false;
+        inProgress = requestHandlerUtils.camundaHistoryCheck(duplicateRecord, null);
+        assertFalse(inProgress);
     }
+
     @Test
-    public void setCamundaHeadersTest()throws ContactCamundaException, RequestDbFailureException{
-       String encryptedAuth   = "015E7ACF706C6BBF85F2079378BDD2896E226E09D13DC2784BA309E27D59AB9FAD3A5E039DF0BB8408"; // user:password
-       String key = "07a7159d3bf51a0e53be7a8f89699be7";
-       HttpHeaders headers = requestHandlerUtils.setCamundaHeaders(encryptedAuth, key);
-       List<org.springframework.http.MediaType> acceptedType = headers.getAccept();
-       String expectedAcceptedType = "application/json";
-       assertEquals(expectedAcceptedType, acceptedType.get(0).toString());
-       String basicAuth = headers.getFirst(HttpHeaders.AUTHORIZATION);
-       String expectedBasicAuth = "Basic dXNlcjpwYXNzd29yZA==";        
-       assertEquals(expectedBasicAuth, basicAuth);
-    }    
-    
+    public void setCamundaHeadersTest() throws ContactCamundaException, RequestDbFailureException {
+        String encryptedAuth = "015E7ACF706C6BBF85F2079378BDD2896E226E09D13DC2784BA309E27D59AB9FAD3A5E039DF0BB8408"; // user:password
+        String key = "07a7159d3bf51a0e53be7a8f89699be7";
+        HttpHeaders headers = requestHandlerUtils.setCamundaHeaders(encryptedAuth, key);
+        List<org.springframework.http.MediaType> acceptedType = headers.getAccept();
+        String expectedAcceptedType = "application/json";
+        assertEquals(expectedAcceptedType, acceptedType.get(0).toString());
+        String basicAuth = headers.getFirst(HttpHeaders.AUTHORIZATION);
+        String expectedBasicAuth = "Basic dXNlcjpwYXNzd29yZA==";
+        assertEquals(expectedBasicAuth, basicAuth);
+    }
+
 }