From d2e69c0d689596033a9c35aa98d37a44e2cc88cb Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Tue, 15 May 2018 13:23:01 -0400 Subject: WorkflowResponse json issues This commit adds some robustness to the interface between the API-H and BPMN, specifically, in how the response is handled. I don't have proof, but there appears to be some randomness to the json provider behavior when used with the jax-rs. Sometimes, the serializer is adding the root element, and sometimes it is not. Maybe there's something wrong with the configuration. Maybe we have competing json providers. I couldn't pin this down. I'm almost certain it is the presence of the root element in the content that causes the API-H code to fail parsing of the BPMN response. This doesn't kill the request, as you might expect, but rather, the API-H passes the BPMN response through to the client (VID, or policy, or whatever). The original problem (SO-586) was "fixed" by "removing the wrapper". This "wrapper" is a needed feature of the interface between BPMN and the API-H. We shouldn't have removed it. The fact that the "fix" appeared to work is due to the behavior I described in the previous paragraph. The API-H chokes on the message, and it passes it through unchanged. Not really what we want. So, I don't know why the jackson/json behavior is flaky and different now, but I can (and did) modify the API-H so it can parse a json message whether or not it has a root element. Note that WorkflowResponse.java (in BPMN) and CamundaResponse.java (in the API-H) are basically the same bean representing the message format. Seems less than ideal to have two different classes. Also note that I changed the name of the "response" attribute of the WorkflowResponse and CamundaResponse classes to "content". Got tired of seeing this nonsense everywhere in the code: response.getResponse() Change-Id: Icaf70f8457de99e493cf882170fe778c620308c9 Issue-ID: SO-586 Issue-ID: SO-618 Signed-off-by: Rob Daugherty --- .../org/openecomp/mso/bpmn/common/BPMNUtil.java | 9 +----- .../mso/bpmn/common/CompleteMsoProcessTest.java | 2 +- .../bpmn/common/ConfirmVolumeGroupTenantTest.java | 4 +-- .../mso/bpmn/common/FalloutHandlerTest.java | 2 +- .../mso/bpmn/common/GenericDeleteServiceTest.java | 18 +++++------ .../mso/bpmn/common/GenericDeleteVnfTest.java | 20 ++++++------ .../mso/bpmn/common/GenericGetServiceTest.java | 36 +++++++++++----------- .../mso/bpmn/common/GenericGetVnfTest.java | 10 +++--- .../mso/bpmn/common/GenericPutVnfTest.java | 12 ++++---- .../mso/bpmn/common/SDNCAdapterV1Test.java | 6 ++-- .../mso/bpmn/common/WorkflowAsyncResourceTest.java | 2 +- .../mso/bpmn/common/WorkflowContextHolderTest.java | 3 +- .../openecomp/mso/bpmn/common/WorkflowTest.java | 6 ---- 13 files changed, 58 insertions(+), 72 deletions(-) (limited to 'bpmn/MSOCommonBPMN/src/test/java') diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java index 1400e6ea77..0bb5186a17 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java @@ -238,14 +238,7 @@ public class BPMNUtil { doAnswer(new Answer() { public Void answer(InvocationOnMock invocation) { Response response = (Response) invocation.getArguments()[0]; - try { - workflowResponse = (WorkflowResponse) response.getEntity(); - } catch (ClassCastException e) { - String workflowResponseString = (String)response.getEntity(); - workflowResponse = new WorkflowResponse(); - workflowResponse.setResponse(workflowResponseString); - workflowResponse.setMessageCode(200); - } + workflowResponse = (WorkflowResponse) response.getEntity(); return null; } }).when(asyncResponse).setResponse(any(Response.class)); diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java index 9d4dac2333..bf69223b52 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java @@ -46,7 +46,7 @@ public class CompleteMsoProcessTest extends WorkflowTest { variables.put("CompleteMsoProcessRequest",inputRequestFile); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "CompleteMsoProcess", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); logEnd(); } diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java index 457128f104..13c400e71e 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java @@ -50,7 +50,7 @@ public class ConfirmVolumeGroupTenantTest extends WorkflowTest { setVariables(variables); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "ConfirmVolumeGroupTenant", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String actualNameMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "groupNamesMatch"); String actualIdMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "tenantIdsMatch"); @@ -70,7 +70,7 @@ public class ConfirmVolumeGroupTenantTest extends WorkflowTest { setVariables(variables); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "ConfirmVolumeGroupTenant", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String actualNameMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "groupNamesMatch"); String actualIdMatch = BPMNUtil.getVariable(processEngineRule, "ConfirmVolumeGroupTenant", "tenantIdsMatch"); diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java index 257cec9b11..c3259a0de5 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java @@ -62,7 +62,7 @@ public class FalloutHandlerTest extends WorkflowTest { variables.put("FalloutHandlerRequest",inputRequestFile); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "FalloutHandler", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); System.out.println("ENDED TEST: " + method); } diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java index 125a9ad916..67ac34c1d0 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java @@ -54,7 +54,7 @@ public class GenericDeleteServiceTest extends WorkflowTest { Map variables = new HashMap<>(); setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator"); String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator"); String resourceVersionProvidedFlag = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_resourceVersionProvidedFlag"); @@ -74,7 +74,7 @@ public class GenericDeleteServiceTest extends WorkflowTest { setVariablesSubscription(variables, "", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator"); String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator"); @@ -98,7 +98,7 @@ public class GenericDeleteServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator"); String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator"); @@ -122,7 +122,7 @@ public class GenericDeleteServiceTest extends WorkflowTest { setVariablesSubscription(variables, null, "1604-MVM-26", "SDN-ETHERNET-INTERNET", null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator"); String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator"); @@ -146,7 +146,7 @@ public class GenericDeleteServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator"); String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator"); @@ -168,7 +168,7 @@ public class GenericDeleteServiceTest extends WorkflowTest { setVariablesSubscription(variables, "", "1604-MVM-26", "SDN-ETHERNET-INTERNET", ""); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator"); String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator"); @@ -193,7 +193,7 @@ public class GenericDeleteServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator"); String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator"); @@ -214,7 +214,7 @@ public class GenericDeleteServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "1234"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator"); String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator"); @@ -240,7 +240,7 @@ public class GenericDeleteServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_SuccessIndicator"); String foundIndicator = BPMNUtil.getVariable(processEngineRule, "GenericDeleteService", "GENDS_FoundIndicator"); diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java index add9a32d61..a318be5b10 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java @@ -55,7 +55,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("true", "true", "true", null); @@ -70,7 +70,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "vce", "testReVer123"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("true", "true", "true", null); @@ -87,7 +87,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "generic-vnf", ""); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("true", "true", "false", null); @@ -103,7 +103,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "vce", null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("true", "true", "false", null); @@ -118,7 +118,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("true", "false", "true", null); @@ -133,7 +133,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "vce", "testReVer123"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("true", "false", "true", null); @@ -148,7 +148,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "generic-vnf", ""); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("true", "false", "false", null); @@ -162,7 +162,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "", "testReVer123"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("false", "false", "true", "WorkflowException[processKey=GenericDeleteVnf,errorCode=500,errorMessage=Incoming Required Variable is Missing or Null!]"); @@ -177,7 +177,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("false", "false", "true", "WorkflowException[processKey=GenericDeleteVnf,errorCode=500,errorMessage=Received a bad response from AAI]"); @@ -192,7 +192,7 @@ public class GenericDeleteVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); assertVariables("false", "false", "true", "WorkflowException[processKey=GenericDeleteVnf,errorCode=412,errorMessage=Delete Vnf Received a resource-version Mismatch Error Response from AAI]"); diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java index 0198395750..6da6924d11 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java @@ -59,7 +59,7 @@ public class GenericGetServiceTest extends WorkflowTest { Map variables = new HashMap<>(); setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl"); @@ -85,7 +85,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -113,7 +113,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, null, "1604-MVM-26", null, null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -143,7 +143,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -172,7 +172,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -196,7 +196,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -223,7 +223,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, "", "1604-MVM-26", null, null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -250,7 +250,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -277,7 +277,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -301,7 +301,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, "", "1604-MVM-26", null, null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -328,7 +328,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -354,7 +354,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -379,7 +379,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -407,7 +407,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -434,7 +434,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -463,7 +463,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, null, "1604-MVM-26", null, null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -493,7 +493,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, null, "1604-MVM-26", "XyCorporation", null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); @@ -521,7 +521,7 @@ public class GenericGetServiceTest extends WorkflowTest { setVariablesInstance(variables, null, "1604-MVM-26", "CorporationNotPresent", null); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator"); diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java index 4922263744..7de493a621 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java @@ -56,7 +56,7 @@ public class GenericGetVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "testVnfName123", "generic-vnf"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator"); @@ -83,7 +83,7 @@ public class GenericGetVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "testVnfName123", "vce"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator"); @@ -110,7 +110,7 @@ public class GenericGetVnfTest extends WorkflowTest { setVariables(variables, "", "testVnfName123", "generic-vnf"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator"); @@ -137,7 +137,7 @@ public class GenericGetVnfTest extends WorkflowTest { setVariables(variables, null, "testVnfName123", "vce"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator"); @@ -166,7 +166,7 @@ public class GenericGetVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", "testVnfName123", "generic-vnf"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_SuccessIndicator"); String found = BPMNUtil.getVariable(processEngineRule, "GenericGetVnf", "GENGV_FoundIndicator"); diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java index 0e0a237090..7c003c986a 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java @@ -55,7 +55,7 @@ public class GenericPutVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator"); String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException"); @@ -75,7 +75,7 @@ public class GenericPutVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", vcePayload, "vce"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator"); String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException"); @@ -95,7 +95,7 @@ public class GenericPutVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", genericVnfPayload, ""); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator"); String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException"); @@ -117,7 +117,7 @@ public class GenericPutVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", genericVnfPayload, ""); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator"); String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException"); @@ -137,7 +137,7 @@ public class GenericPutVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator"); String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException"); @@ -158,7 +158,7 @@ public class GenericPutVnfTest extends WorkflowTest { setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf"); WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables); - waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID()); + waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId()); String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "GENPV_SuccessIndicator"); String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericPutVnf", "WorkflowException"); diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java index 0349b178cb..02e029de46 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java @@ -95,7 +95,7 @@ public class SDNCAdapterV1Test extends WorkflowTest { Response response = workflowResource.startProcessInstanceByKey("sdncAdapter", varMap); WorkflowResponse workflowResponse = (WorkflowResponse) response.getEntity(); - //String pid = workflowResponse.getProcessInstanceID(); + //String pid = workflowResponse.getProcessInstanceId(); //System.out.println("Back from executing process instance with pid=" + pid); return workflowResponse; } @@ -364,7 +364,7 @@ public class SDNCAdapterV1Test extends WorkflowTest { WorkflowResponse response = thread.workflowResponse; Assert.assertNotNull(response); Assert.assertEquals("404 error", response.getMessageCode(),7000); -// assertProcessInstanceFinished(response.getProcessInstanceID()); +// assertProcessInstanceFinished(response.getProcessInstanceId()); //System.out.println("SDNCAdapter bad synchronous response flow Completed!"); } @@ -442,7 +442,7 @@ public class SDNCAdapterV1Test extends WorkflowTest { public void run() { workflowResponse = invokeFlow(workflowRequest); - workflowResponse.getProcessInstanceID(); + workflowResponse.getProcessInstanceId(); } } diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java index 5f91298958..5562cb80ae 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java @@ -48,7 +48,7 @@ public class WorkflowAsyncResourceTest extends WorkflowTest { variables.put("mso-service-request-timeout", "5"); WorkflowResponse workflowResponse = BPMNUtil.executeAsyncWorkflow(processEngineRule, "testAsyncProcess", variables); - assertEquals("Received the request, the process is getting executed, request message SDN-ETHERNET-INTERNET HI/VLXM/950604//SW_INTERNET SubName01 ", workflowResponse.getResponse()); + assertEquals("Received the request, the process is getting executed, request message SDN-ETHERNET-INTERNET HI/VLXM/950604//SW_INTERNET SubName01 ", workflowResponse.getContent()); assertEquals(200, workflowResponse.getMessageCode()); } diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java index 47005c80e1..6e2699a40e 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java @@ -69,7 +69,6 @@ public class WorkflowContextHolderTest { Assert.assertNull(context2); } - @Ignore // broken by SO-586 @Test public void testProcessCallback() { WorkflowContextHolder contextHolder = WorkflowContextHolder.getInstance(); @@ -88,7 +87,7 @@ public class WorkflowContextHolderTest { Assert.assertNotNull(response1.getMessage()); Assert.assertEquals(200,response1.getMessageCode()); Assert.assertEquals("Success", response1.getMessage()); - Assert.assertEquals("Successfully processed request", response1.getResponse()); + Assert.assertEquals("Successfully processed request", response1.getContent()); verify(asyncResponse).setResponse(any(Response.class)); WorkflowContext context1 = contextHolder.getWorkflowContext(workflowContext.getRequestId()); diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java index 8208b43fa5..9b8a249511 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java @@ -473,12 +473,6 @@ public class WorkflowTest { (entity == null ? "null" : entity.getClass().getName()) + ", expected WorkflowResponse"; System.out.println(msg); - - if (entity instanceof String) { - WorkflowResponse toRet = new WorkflowResponse(); - toRet.setResponse((String)entity); - return toRet; - } fail(msg); return null; // unreachable } -- cgit 1.2.3-korg