X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bpmn%2FMSOCommonBPMN%2Fsrc%2Ftest%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fbpmn%2Fcommon%2FGenericDeleteVnfTest.java;h=a318be5b10ad08ec4d15e10d5a0237e204fde74d;hb=41e5bdb09cf638de2320eeed43c3f2c28ca645a7;hp=473f6c8195f75ad19d2975e091088a1d2854ecc8;hpb=c01a3d84bc4d4129607a96220f4969e738ce760c;p=so.git

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 473f6c8195..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
@@ -51,11 +51,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 	public void testGenericDeleteVnf_success_genericVnf() throws Exception{
 		MockDeleteGenericVnf("testVnfId123", "testReVer123");
 
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		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);
 
@@ -66,11 +66,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 	public void testGenericDeleteVnf_success_vce() throws Exception{
 		MockDeleteVce("testVnfId123", "testReVer123", 204);
 
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		setVariables(variables, "testVnfId123", "vce", "testReVer123");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "true", "true", null);
 
@@ -83,11 +83,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		MockGetGenericVnfById("/testVnfId123", "GenericFlows/getGenericVnfByNameResponse.xml", 200);
 		MockDeleteGenericVnf("testVnfId123", "testReVer123");
 
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		setVariables(variables, "testVnfId123", "generic-vnf", "");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "true", "false", null);
 
@@ -99,11 +99,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 		MockDeleteVce("testVnfId123", "testReVer123", 204);
 		MockGetVceById("testVnfId123", "GenericFlows/getVceResponse.xml");
 
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		setVariables(variables, "testVnfId123", "vce", null);
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "true", "false", null);
 
@@ -114,11 +114,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 	public void testGenericDeleteVnf_success_genericVnf404() throws Exception{
 		MockDeleteGenericVnf("testVnfId123", "testReVer123", 404);
 
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		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);
 
@@ -129,11 +129,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 	public void testGenericDeleteVnf_success_vce404() throws Exception{
 		MockDeleteVce("testVnfId123", "testReVer123", 404);
 
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		setVariables(variables, "testVnfId123", "vce", "testReVer123");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "false", "true", null);
 
@@ -144,11 +144,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 	public void testGenericDeleteVnf_success_genericVnfNoResourceVersion404() throws Exception{
 		MockGetGenericVnfById_404("testVnfId123");
 
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		setVariables(variables, "testVnfId123", "generic-vnf", "");
 
 		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
 		assertVariables("true", "false", "false", null);
 
@@ -158,11 +158,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 	@Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
 	public void testGenericDeleteVnf_error_missingVariables() throws Exception{
 
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		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!]");
 
@@ -173,11 +173,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 	public void testGenericDeleteVnf_error_genericVnf500() throws Exception{
 
 		MockDeleteGenericVnf_500("testVnfId123", "testReVer123");
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		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]");
 
@@ -188,11 +188,11 @@ public class GenericDeleteVnfTest extends WorkflowTest {
 	public void testGenericDeleteVnf_error_genericVnf412() throws Exception{
 		MockDeleteGenericVnf("testVnfId123", "testReVer123", 412);
 
-		Map<String, String> variables = new HashMap<String, String>();
+		Map<String, String> variables = new HashMap<>();
 		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]");