AT&T 1712 and 1802 release code

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

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVnfAndModulesTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVnfAndModulesTest.java
index b2afc87..dc0af41 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVnfAndModulesTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVnfAndModulesTest.java
@@ -78,7 +78,7 @@ public class DoCreateVnfAndModulesTest extends WorkflowTest {
        }\r
 \r
        @Test\r
-    @Ignore // IGNORED FOR 1710 MERGE TO ONAP\r
+    \r
        @Deployment(resources = {"subprocess/GenericGetService.bpmn",\r
                        "subprocess/GenericGetVnf.bpmn",\r
                        "subprocess/GenericPutVnf.bpmn", \r
@@ -114,7 +114,7 @@ public class DoCreateVnfAndModulesTest extends WorkflowTest {
                mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
 \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                setVariablesSuccess(variables, "", "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");\r
                invokeSubProcess("DoCreateVnfAndModules", businessKey, variables);\r
 \r
@@ -133,7 +133,7 @@ public class DoCreateVnfAndModulesTest extends WorkflowTest {
        }\r
        \r
        @Test\r
-    @Ignore // IGNORED FOR 1710 MERGE TO ONAP\r
+    \r
        @Deployment(resources = {"subprocess/GenericGetService.bpmn",\r
                        "subprocess/GenericGetVnf.bpmn",\r
                        "subprocess/GenericPutVnf.bpmn", \r
@@ -168,7 +168,7 @@ public class DoCreateVnfAndModulesTest extends WorkflowTest {
                mockSDNCAdapter("VfModularity/StandardSDNCSynchResponse.xml");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                setVariablesAddonSuccess(variables, "", "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");\r
                invokeSubProcess("DoCreateVnfAndModules", businessKey, variables);\r
 \r