From 327b17ab250b4c17cf3f91f5e4cd9bffd89f3d1e Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Wed, 7 Mar 2018 18:17:22 -0800 Subject: Reduce log noise/warnings format to conventions Reduce build log warnings by formatting tests to ONAP code conventions (removing tabs etc.) Issue-ID: SO-368 Change-Id: I48c6d359b83617aebeb79db4e30c1d72d31f7eec Signed-off-by: Marcus G K Williams --- .../mso/camunda/tests/BPELRestClientTest.java | 102 ++++++++++----------- .../mso/camunda/tests/CamundaClientTest.java | 18 ++-- .../mso/camunda/tests/CamundaRequestTest.java | 67 +++++++------- .../mso/camunda/tests/CamundaResponseTest.java | 32 +++---- .../mso/camunda/tests/ResponseHandlerTest.java | 94 ++++++++++--------- 5 files changed, 147 insertions(+), 166 deletions(-) (limited to 'mso-api-handlers/mso-api-handler-common') diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/BPELRestClientTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/BPELRestClientTest.java index 4e4f0ee189..6fc396dd11 100644 --- a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/BPELRestClientTest.java +++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/BPELRestClientTest.java @@ -50,77 +50,71 @@ import org.openecomp.mso.properties.MsoJavaProperties; /** * This class implements test methods of Camunda Beans. - * - * */ public class BPELRestClientTest { + @Mock + private HttpClient mockHttpClient; - @Mock - private HttpClient mockHttpClient; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - } - - @Test - public void tesBPELPost() throws JsonGenerationException, - JsonMappingException, IOException { - + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + } - String responseBody ="" - + "req5" - + "Layer3ServiceActivateRequest" - + "OMX" - + "n" - + ""; - - HttpResponse mockResponse = createResponse(200, responseBody); - mockHttpClient = Mockito.mock(HttpClient.class); - Mockito.when(mockHttpClient.execute(Mockito.any(HttpPost.class))) - .thenReturn(mockResponse); + @Test + public void tesBPELPost() throws JsonGenerationException, + JsonMappingException, IOException { - String reqXML = "test"; - String orchestrationURI = "/active-bpel/services/REST/MsoLayer3ServiceActivate"; - MsoJavaProperties props = new MsoJavaProperties(); - props.setProperty(CommonConstants.BPEL_URL, "http://localhost:8089"); - props.setProperty("bpelAuth", "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1"); + String responseBody = "" + + "req5" + + "Layer3ServiceActivateRequest" + + "OMX" + + "n" + + ""; - RequestClient requestClient = RequestClientFactory.getRequestClient(orchestrationURI, props); - requestClient.setClient(mockHttpClient); - HttpResponse response = requestClient.post(reqXML, "reqId", "timeout", "version", null, null); + HttpResponse mockResponse = createResponse(200, responseBody); + mockHttpClient = Mockito.mock(HttpClient.class); + Mockito.when(mockHttpClient.execute(Mockito.any(HttpPost.class))) + .thenReturn(mockResponse); + String reqXML = "test"; + String orchestrationURI = "/active-bpel/services/REST/MsoLayer3ServiceActivate"; - int statusCode = response.getStatusLine().getStatusCode(); - assertEquals(requestClient.getType(), CommonConstants.BPEL); - assertEquals(statusCode, HttpStatus.SC_OK); + MsoJavaProperties props = new MsoJavaProperties(); + props.setProperty(CommonConstants.BPEL_URL, "http://localhost:8089"); + props.setProperty("bpelAuth", "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1"); + RequestClient requestClient = RequestClientFactory.getRequestClient(orchestrationURI, props); + requestClient.setClient(mockHttpClient); + HttpResponse response = requestClient.post(reqXML, "reqId", "timeout", "version", null, null); - } - private HttpResponse createResponse(int respStatus, - String respBody) { - HttpResponse response = new BasicHttpResponse( - new BasicStatusLine( - new ProtocolVersion("HTTP", 1, 1), respStatus, "")); - response.setStatusCode(respStatus); - try { - response.setEntity(new StringEntity(respBody)); - response.setHeader("Content-Type", "text/xml"); - } catch (Exception e) { - e.printStackTrace(); - } - return response; - } + int statusCode = response.getStatusLine().getStatusCode(); + assertEquals(requestClient.getType(), CommonConstants.BPEL); + assertEquals(statusCode, HttpStatus.SC_OK); + } + private HttpResponse createResponse(int respStatus, + String respBody) { + HttpResponse response = new BasicHttpResponse( + new BasicStatusLine( + new ProtocolVersion("HTTP", 1, 1), respStatus, "")); + response.setStatusCode(respStatus); + try { + response.setEntity(new StringEntity(respBody)); + response.setHeader("Content-Type", "text/xml"); + } catch (Exception e) { + e.printStackTrace(); + } + return response; + } } diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaClientTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaClientTest.java index 6ee637d864..ec3a4b025b 100644 --- a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaClientTest.java +++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaClientTest.java @@ -51,13 +51,10 @@ import org.openecomp.mso.properties.MsoJavaProperties; /** * This class implements test methods of Camunda Beans. - * - * */ public class CamundaClientTest { - @Mock private HttpClient mockHttpClient; @@ -68,15 +65,15 @@ public class CamundaClientTest { @Test public void tesCamundaPost() throws JsonGenerationException, - JsonMappingException, IOException { + JsonMappingException, IOException { - String responseBody ="{\"links\":[{\"method\":\"GET\",\"href\":\"http://localhost:9080/engine-rest/process-instance/2047c658-37ae-11e5-9505-7a1020524153\",\"rel\":\"self\"}],\"id\":\"2047c658-37ae-11e5-9505-7a1020524153\",\"definitionId\":\"dummy:10:73298961-37ad-11e5-9505-7a1020524153\",\"businessKey\":null,\"caseInstanceId\":null,\"ended\":true,\"suspended\":false}"; + String responseBody = "{\"links\":[{\"method\":\"GET\",\"href\":\"http://localhost:9080/engine-rest/process-instance/2047c658-37ae-11e5-9505-7a1020524153\",\"rel\":\"self\"}],\"id\":\"2047c658-37ae-11e5-9505-7a1020524153\",\"definitionId\":\"dummy:10:73298961-37ad-11e5-9505-7a1020524153\",\"businessKey\":null,\"caseInstanceId\":null,\"ended\":true,\"suspended\":false}"; HttpResponse mockResponse = createResponse(200, responseBody); mockHttpClient = Mockito.mock(HttpClient.class); Mockito.when(mockHttpClient.execute(Mockito.any(HttpPost.class))) - .thenReturn(mockResponse); + .thenReturn(mockResponse); String reqXML = "test"; String orchestrationURI = "/engine-rest/process-definition/key/dummy/start"; @@ -93,7 +90,7 @@ public class CamundaClientTest { assertEquals(requestClient.getType(), CommonConstants.CAMUNDA); assertEquals(statusCode, HttpStatus.SC_OK); - props.setProperty (CommonConstants.CAMUNDA_AUTH, "ABCD1234"); + props.setProperty(CommonConstants.CAMUNDA_AUTH, "ABCD1234"); requestClient = RequestClientFactory.getRequestClient(orchestrationURI, props); requestClient.setClient(mockHttpClient); response = requestClient.post(null, "reqId", null, null, null, null); @@ -104,8 +101,8 @@ public class CamundaClientTest { private HttpResponse createResponse(int respStatus, String respBody) { HttpResponse response = new BasicHttpResponse( - new BasicStatusLine( - new ProtocolVersion("HTTP", 1, 1), respStatus, "")); + new BasicStatusLine( + new ProtocolVersion("HTTP", 1, 1), respStatus, "")); response.setStatusCode(respStatus); try { response.setEntity(new StringEntity(respBody)); @@ -117,7 +114,4 @@ public class CamundaClientTest { } - - - } diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaRequestTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaRequestTest.java index 753ce9dee8..47252e92ad 100644 --- a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaRequestTest.java +++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaRequestTest.java @@ -21,7 +21,6 @@ package org.openecomp.mso.camunda.tests; - import static org.junit.Assert.assertEquals; import java.io.IOException; @@ -38,44 +37,42 @@ import org.openecomp.mso.apihandler.common.CommonConstants; /** * This class implements test methods of Camunda Beans. - * - * */ public class CamundaRequestTest { - @Test - public final void testSerialization() throws JsonGenerationException, - JsonMappingException, IOException { - CamundaRequest camundaRequest = new CamundaRequest(); - CamundaInput camundaInput = new CamundaInput(); - CamundaInput host = new CamundaInput(); - CamundaInput schema = new CamundaInput(); - CamundaInput reqid = new CamundaInput(); - CamundaInput svcid = new CamundaInput(); - CamundaInput timeout = new CamundaInput(); - camundaInput - .setValue(" 155415ab-b4a7-4382-b4c6-d17d950604Layer3ServiceActivateRequestOMXhttps://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws50515631 SDN-ETHERNET-INTERNETHI/VLXM/950604//SW_INTERNETSubName01 MTSNJA4LCP1 "); - camundaRequest.setServiceInput(camundaInput); - host.setValue("localhost"); - camundaRequest.setHost(host); - schema.setValue("v1"); - camundaRequest.setSchema(schema); - reqid.setValue("reqid123"); - camundaRequest.setReqid(reqid); - svcid.setValue("svcid123"); - camundaRequest.setSvcid(svcid); - timeout.setValue(""); - camundaRequest.setTimeout(timeout); - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true); + @Test + public final void testSerialization() throws JsonGenerationException, + JsonMappingException, IOException { + CamundaRequest camundaRequest = new CamundaRequest(); + CamundaInput camundaInput = new CamundaInput(); + CamundaInput host = new CamundaInput(); + CamundaInput schema = new CamundaInput(); + CamundaInput reqid = new CamundaInput(); + CamundaInput svcid = new CamundaInput(); + CamundaInput timeout = new CamundaInput(); + camundaInput + .setValue(" 155415ab-b4a7-4382-b4c6-d17d950604Layer3ServiceActivateRequestOMXhttps://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws50515631 SDN-ETHERNET-INTERNETHI/VLXM/950604//SW_INTERNETSubName01 MTSNJA4LCP1 "); + camundaRequest.setServiceInput(camundaInput); + host.setValue("localhost"); + camundaRequest.setHost(host); + schema.setValue("v1"); + camundaRequest.setSchema(schema); + reqid.setValue("reqid123"); + camundaRequest.setReqid(reqid); + svcid.setValue("svcid123"); + camundaRequest.setSvcid(svcid); + timeout.setValue(""); + camundaRequest.setTimeout(timeout); + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true); - String json = mapper.writeValueAsString(camundaRequest); - System.out.println(json); - assertEquals( - "{\"variables\":{\""+CommonConstants.CAMUNDA_SERVICE_INPUT+"\":{\"value\":\" 155415ab-b4a7-4382-b4c6-d17d950604Layer3ServiceActivateRequestOMXhttps://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws50515631 SDN-ETHERNET-INTERNETHI/VLXM/950604//SW_INTERNETSubName01 MTSNJA4LCP1 \",\"type\":\"String\"}" + - ",\"host\":{\"value\":\"localhost\",\"type\":\"String\"},\"mso-schema-version\":{\"value\":\"v1\",\"type\":\"String\"},\"mso-request-id\":{\"value\":\"reqid123\",\"type\":\"String\"},\"mso-service-instance-id\":{\"value\":\"svcid123\",\"type\":\"String\"},\"mso-service-request-timeout\":{\"value\":\"\",\"type\":\"String\"}}}", - json); + String json = mapper.writeValueAsString(camundaRequest); + System.out.println(json); + assertEquals( + "{\"variables\":{\"" + CommonConstants.CAMUNDA_SERVICE_INPUT + "\":{\"value\":\" 155415ab-b4a7-4382-b4c6-d17d950604Layer3ServiceActivateRequestOMXhttps://localhost:22443/Services/com/cingular/csi/sdn/SendManagedNetworkStatusNotification.jws50515631 SDN-ETHERNET-INTERNETHI/VLXM/950604//SW_INTERNETSubName01 MTSNJA4LCP1 \",\"type\":\"String\"}" + + ",\"host\":{\"value\":\"localhost\",\"type\":\"String\"},\"mso-schema-version\":{\"value\":\"v1\",\"type\":\"String\"},\"mso-request-id\":{\"value\":\"reqid123\",\"type\":\"String\"},\"mso-service-instance-id\":{\"value\":\"svcid123\",\"type\":\"String\"},\"mso-service-request-timeout\":{\"value\":\"\",\"type\":\"String\"}}}", + json); - } + } } diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaResponseTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaResponseTest.java index c561f1a245..bc51685baf 100644 --- a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaResponseTest.java +++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/CamundaResponseTest.java @@ -35,25 +35,23 @@ import org.openecomp.mso.apihandler.camundabeans.CamundaResponse; /** * This class implements test methods of Camunda Beans. - * - * */ public class CamundaResponseTest { - @Test - public final void testDeserialization() throws JsonGenerationException, - JsonMappingException, IOException { - ObjectMapper mapper = new ObjectMapper(); // can reuse, share globally - mapper.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY); - - String responseBody = "{ \"response\": \"xml\","+ - "\"messageCode\": 200,"+ - "\"message\": \"Successfully started the process\"," + - "\"processInstanceID\":null,\"variables\":null}"; - - CamundaResponse response = mapper.readValue(responseBody, CamundaResponse.class); - assertEquals(response.toString(), "CamundaResponse [response=xml, messageCode=200, message=Successfully started the process]"); - - } + @Test + public final void testDeserialization() throws JsonGenerationException, + JsonMappingException, IOException { + ObjectMapper mapper = new ObjectMapper(); // can reuse, share globally + mapper.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + + String responseBody = "{ \"response\": \"xml\"," + + "\"messageCode\": 200," + + "\"message\": \"Successfully started the process\"," + + "\"processInstanceID\":null,\"variables\":null}"; + + CamundaResponse response = mapper.readValue(responseBody, CamundaResponse.class); + assertEquals(response.toString(), "CamundaResponse [response=xml, messageCode=200, message=Successfully started the process]"); + + } } diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/ResponseHandlerTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/ResponseHandlerTest.java index 99a83d3ed9..d4d563a88b 100644 --- a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/ResponseHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/camunda/tests/ResponseHandlerTest.java @@ -40,90 +40,88 @@ import org.openecomp.mso.apihandler.common.ResponseHandler; /** * This class implements test methods of CamundaResoponseHandler. - * - * */ public class ResponseHandlerTest { @Test - public void tesParseCamundaResponse () throws JsonGenerationException, JsonMappingException, IOException { + public void tesParseCamundaResponse() throws JsonGenerationException, JsonMappingException, IOException { // String body // ="{\"links\":[{\"method\":\"GET\",\"href\":\"http://localhost:9080/engine-rest/process-instance/2047c658-37ae-11e5-9505-7a1020524153\",\"rel\":\"self\"}],\"id\":\"2047c658-37ae-11e5-9505-7a1020524153\",\"definitionId\":\"dummy:10:73298961-37ad-11e5-9505-7a1020524153\",\"businessKey\":null,\"caseInstanceId\":null,\"ended\":true,\"suspended\":false}"; String body = "{ \"response\": \"xml\"," + "\"messageCode\": 200," - + "\"message\": \"Successfully started the process\"}"; + + "\"message\": \"Successfully started the process\"}"; - HttpResponse response = createResponse (200, body, "application/json"); + HttpResponse response = createResponse(200, body, "application/json"); - ResponseHandler respHandler = new ResponseHandler (response, 1); + ResponseHandler respHandler = new ResponseHandler(response, 1); - int status = respHandler.getStatus (); - assertEquals (status, HttpStatus.SC_ACCEPTED); - assertEquals (respHandler.getResponse ().getMessage (), "Successfully started the process"); + int status = respHandler.getStatus(); + assertEquals(status, HttpStatus.SC_ACCEPTED); + assertEquals(respHandler.getResponse().getMessage(), "Successfully started the process"); } @Test - public void tesParseBpelResponse () throws JsonGenerationException, JsonMappingException, IOException { + public void tesParseBpelResponse() throws JsonGenerationException, JsonMappingException, IOException { String body = "" - + "req5" - + "Layer3ServiceActivateRequest" - + "OMX" - + "n" - + ""; - - HttpResponse response = createResponse (200, body, "text/xml"); - - ResponseHandler respHandler = new ResponseHandler (response, 0); - - int status = respHandler.getStatus (); - assertEquals (status, HttpStatus.SC_ACCEPTED); - assertTrue (respHandler.getResponseBody () != null); + + "xmlns:reqtype=\"http://org.openecomp/mso/request/types/v1\"" + + "xmlns:aetgt=\"http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd\"" + + "xmlns:types=\"http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd\">" + + "req5" + + "Layer3ServiceActivateRequest" + + "OMX" + + "n" + + ""; + + HttpResponse response = createResponse(200, body, "text/xml"); + + ResponseHandler respHandler = new ResponseHandler(response, 0); + + int status = respHandler.getStatus(); + assertEquals(status, HttpStatus.SC_ACCEPTED); + assertTrue(respHandler.getResponseBody() != null); } @Test - public void tes404ErrorResponse () throws JsonGenerationException, JsonMappingException, IOException { + public void tes404ErrorResponse() throws JsonGenerationException, JsonMappingException, IOException { + - - HttpResponse response = createResponse (HttpStatus.SC_NOT_FOUND, "error", "text/html"); - ResponseHandler respHandler = new ResponseHandler (response, 1); + HttpResponse response = createResponse(HttpStatus.SC_NOT_FOUND, "error", "text/html"); + ResponseHandler respHandler = new ResponseHandler(response, 1); - int status = respHandler.getStatus (); + int status = respHandler.getStatus(); - assertEquals (HttpStatus.SC_NOT_IMPLEMENTED, status); + assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, status); } @Test - public void tesGenricErrorResponse () throws JsonGenerationException, JsonMappingException, IOException { + public void tesGenricErrorResponse() throws JsonGenerationException, JsonMappingException, IOException { String body = "{ \"response\": \"xml\"," + "\"messageCode\": 500," - + "\"message\": \"Something went wrong\"}"; + + "\"message\": \"Something went wrong\"}"; - HttpResponse response = createResponse (500, body, "application/json"); + HttpResponse response = createResponse(500, body, "application/json"); - ResponseHandler respHandler = new ResponseHandler (response, 1); + ResponseHandler respHandler = new ResponseHandler(response, 1); - int status = respHandler.getStatus (); - assertEquals (HttpStatus.SC_BAD_GATEWAY, status); - assertEquals (respHandler.getResponse ().getMessage (), "Something went wrong"); - System.out.println (respHandler.getResponseBody ()); + int status = respHandler.getStatus(); + assertEquals(HttpStatus.SC_BAD_GATEWAY, status); + assertEquals(respHandler.getResponse().getMessage(), "Something went wrong"); + System.out.println(respHandler.getResponseBody()); } - private HttpResponse createResponse (int respStatus, String respBody, String contentType) { - HttpResponse response = new BasicHttpResponse (new BasicStatusLine (new ProtocolVersion ("HTTP", 1, 1), - respStatus, - "")); - response.setStatusCode (respStatus); + private HttpResponse createResponse(int respStatus, String respBody, String contentType) { + HttpResponse response = new BasicHttpResponse(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), + respStatus, + "")); + response.setStatusCode(respStatus); try { - response.setEntity (new StringEntity (respBody)); - response.setHeader ("Content-Type", contentType); + response.setEntity(new StringEntity(respBody)); + response.setHeader("Content-Type", contentType); } catch (Exception e) { - e.printStackTrace (); + e.printStackTrace(); } return response; } -- cgit 1.2.3-korg