From f0dc8623294868179f1264a6ef80980dd990a313 Mon Sep 17 00:00:00 2001 From: "Chan, Mercy" Date: Thu, 29 Aug 2019 16:12:22 -0400 Subject: added fix for missing Error from SDNC prefix added fix for missing Error from SDNC prefix to SDNC callback flow reverted implementation from bpmn-tasks package and moved them to apih side, added junit test renamed error message constant, removed regex check, add error message porefix directly to actual message Issue-ID: SO-2267 Signed-off-by: Benjamin, Max (mb388a) Change-Id: I440cf9eff12571f576fcc5f2d28d9f2c8130e4b6 --- .../apihandlerinfra/OrchestrationRequestsUnitTest.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'mso-api-handlers/mso-api-handler-infra/src/test') diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java index f672648a6b..627bbc631d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsUnitTest.java @@ -25,6 +25,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doReturn; import javax.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; @@ -231,6 +232,21 @@ public class OrchestrationRequestsUnitTest { assertThat(actual, sameBeanAs(expected)); } + @Test + public void mapRequestStatusAndExtSysErrSrcToRequestErrorMessageTest() throws ApiException { + InstanceReferences instanceReferences = new InstanceReferences(); + instanceReferences.setServiceInstanceId(SERVICE_INSTANCE_ID); + iar.setExtSystemErrorSource(ROLLBACK_EXT_SYSTEM_ERROR_SOURCE); + iar.setFlowStatus(null); + iar.setStatusMessage("Error retrieving cloud region from AAI"); + + Request actual = orchestrationRequests.mapInfraActiveRequestToRequest(iar, includeCloudRequest, + OrchestrationRequestFormat.DETAIL.toString()); + + assertTrue(actual.getRequestStatus().getStatusMessage() + .contains("Error Source: " + ROLLBACK_EXT_SYSTEM_ERROR_SOURCE)); + } + @Test public void mapRequestStatusAndExtSysErrSrcToRequestFlowStatusSuccessfulCompletionTest() throws ApiException { InstanceReferences instanceReferences = new InstanceReferences(); -- cgit 1.2.3-korg