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 3c10872..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
@@ -1,3 +1,23 @@
+/*-\r
+ * ============LICENSE_START=======================================================\r
+ * ONAP - SO\r
+ * ================================================================================\r
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * ================================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END=========================================================\r
+ */\r
+\r
 package org.openecomp.mso.bpmn.infrastructure;\r
 \r
 import static org.junit.Assert.assertEquals;\r
@@ -58,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
@@ -94,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
@@ -113,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
@@ -148,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