Merge "Reorder modifiers"

[so.git] / bpmn / MSOInfrastructureBPMN / src / test / java / org / openecomp / mso / bpmn / infrastructure / DoCreateSIRollbackTest.java

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java
index 852c8f9..8a6c61c 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java
@@ -84,7 +84,7 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
                mockUpdateRequestDB(200, "DBUpdateResponse.xml");\r
                String businessKey = UUID.randomUUID().toString();\r
 \r
-               Map<String, Object> variables =  new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                setupVariables(variables);\r
                invokeSubProcess("DoCreateServiceInstanceRollback", businessKey, variables);\r
                injectSDNCCallbacks(callbacks, "deactivate");\r
@@ -136,12 +136,12 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
                                        "<service-information>" + EOL + \r
                                        "<service-id/>" + EOL + \r
                                        "<subscription-service-type>123456789</subscription-service-type>" + EOL + \r
-                                       "<onap-model-information>" + EOL + \r
+                                       "<ecomp-model-information>" + EOL + \r
                                        "<model-invariant-uuid/>" + EOL + \r
                                        "<model-uuid/>" + EOL + \r
                                        "<model-version/>" + EOL + \r
                                        "<model-name/>" + EOL + \r
-                                       "</onap-model-information>" + EOL + \r
+                                       "</ecomp-model-information>" + EOL + \r
                                        "<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>" + EOL + \r
                                        "<subscriber-name/>" + EOL + \r
                                        "<global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>" + EOL + \r
@@ -174,12 +174,12 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
                                "<service-information>" + EOL + \r
                                "<service-id/>" + EOL + \r
                                "<subscription-service-type>123456789</subscription-service-type>" + EOL + \r
-                               "<onap-model-information>" + EOL + \r
+                               "<ecomp-model-information>" + EOL + \r
                                "<model-invariant-uuid/>" + EOL + \r
                                "<model-uuid/>" + EOL + \r
                                "<model-version/>" + EOL + \r
                                "<model-name/>" + EOL + \r
-                               "</onap-model-information>" + EOL + \r
+                               "</ecomp-model-information>" + EOL + \r
                                "<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>" + EOL + \r
                                "<subscriber-name/>" + EOL + \r
                                "<global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>" + EOL + \r
@@ -196,4 +196,4 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
                variables.put("rollbackData",rollbackData);\r
                                \r
        }\r
-}
+}\r