Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "Reorder modifiers"
[so.git] / bpmn / MSOCommonBPMN / src / test / java / org / openecomp / mso / bpmn / common / GenericGetServiceTest.java
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 82cceb0..6da6924 100644 (file)
--- 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
@@ -56,10 +56,10 @@ public class GenericGetServiceTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericGetService.bpmn"})\r
        public void testGenericGetService_success_serviceInstance() throws Exception{\r
                MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");\r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
                String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");\r
@@ -81,11 +81,11 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -109,11 +109,11 @@ public class GenericGetServiceTest extends WorkflowTest {
                MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByName.xml");\r
                MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, null, "1604-MVM-26", null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -139,11 +139,11 @@ public class GenericGetServiceTest extends WorkflowTest {
                MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlById.xml");\r
                MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -168,11 +168,11 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockGetServiceInstance_404("SDN-ETHERNET-INTERNET", "123456789", "MIS%2F1604%2F0026%2FSW_INTERNET");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -192,11 +192,11 @@ public class GenericGetServiceTest extends WorkflowTest {
        public void testGenericGetService_success_serviceSubscription404() throws Exception{\r
                MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", 404);\r
                \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -219,11 +219,11 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceByName_404("1604-MVM-26");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "", "1604-MVM-26", null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -246,11 +246,11 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceById_404("MIS%2F1604%2F0026%2FSW_INTERNET");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -273,11 +273,11 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", " ");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -297,11 +297,11 @@ public class GenericGetServiceTest extends WorkflowTest {
        public void testGenericGetService_success_serviceInstanceByNameEmpty() throws Exception{\r
                MockNodeQueryServiceInstanceByName("1604-MVM-26", "");\r
                \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "", "1604-MVM-26", null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -324,11 +324,11 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceById("MIS[%]2F1604[%]2F0026[%]2FSW_INTERNET", "");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -350,11 +350,11 @@ public class GenericGetServiceTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericGetService.bpmn"})\r
        public void testGenericGetService_error_serviceInstanceInvalidVariables() throws Exception{\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -375,11 +375,11 @@ public class GenericGetServiceTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericGetService.bpmn"})\r
        public void testGenericGetService_success_serviceSubscriptionInvalidVariables() throws Exception{\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -403,11 +403,11 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockGetServiceInstance_500("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -430,11 +430,11 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceById_500("MIS%2F1604%2F0026%2FSW_INTERNET");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -459,11 +459,11 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceByName_500("1604-MVM-26");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, null, "1604-MVM-26", null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -489,11 +489,11 @@ public class GenericGetServiceTest extends WorkflowTest {
         MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByNameMultiCustomer.xml");\r
         MockGetServiceInstance("XyCorporation", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
 \r
-        Map<String, String> variables = new HashMap<String, String>();\r
+        Map<String, String> variables = new HashMap<>();\r
         setVariablesInstance(variables, null, "1604-MVM-26", "XyCorporation", null);\r
 \r
         WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-        waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+        waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
         String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
         String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
@@ -517,11 +517,11 @@ public class GenericGetServiceTest extends WorkflowTest {
                MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByNameMultiCustomer.xml");\r
                MockGetServiceInstance("CorporationNotPresent", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, null, "1604-MVM-26", "CorporationNotPresent", null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
-               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
+               waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());\r
 \r
                String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");\r
                String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");\r
Service Orchestrator