Reduce log noise/warnings format to conventions

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

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVnfTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVnfTest.java
index 8caa9f2..95c275f 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVnfTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVnfTest.java
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and 
  * limitations under the License. 
  * ============LICENSE_END========================================================= 
- */ 
+ */
 
 package org.openecomp.mso.bpmn.infrastructure;
 
@@ -40,101 +40,100 @@ import org.openecomp.mso.bpmn.common.WorkflowTest;
 
 /**
  * Please describe the DeleteVnfInfra.java class
- *
  */
 public class DoDeleteVnfTest extends WorkflowTest {
 
-       
-       @Test
-       @Deployment(resources = {"subprocess/GenericGetVnf.bpmn", "subprocess/GenericDeleteVnf.bpmn", "subprocess/DoDeleteVnf.bpmn"})
-       public void testDoDeleteVnf_success() throws Exception{
-               
-               MockGetGenericVnfByIdWithDepth("testVnfId123", 1, "GenericFlows/getGenericVnfByNameResponse.xml");
-               MockDeleteGenericVnf("testVnfId123", "testReVer123");
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-               
-               String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<>();
-               setVariables(variables);
-               invokeSubProcess("DoDeleteVnf", businessKey, variables);
-               // Disabled until SDNC support is there
+
+    @Test
+    @Deployment(resources = {"subprocess/GenericGetVnf.bpmn", "subprocess/GenericDeleteVnf.bpmn", "subprocess/DoDeleteVnf.bpmn"})
+    public void testDoDeleteVnf_success() throws Exception {
+
+        MockGetGenericVnfByIdWithDepth("testVnfId123", 1, "GenericFlows/getGenericVnfByNameResponse.xml");
+        MockDeleteGenericVnf("testVnfId123", "testReVer123");
+        mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+
+        String businessKey = UUID.randomUUID().toString();
+        Map<String, Object> variables = new HashMap<>();
+        setVariables(variables);
+        invokeSubProcess("DoDeleteVnf", businessKey, variables);
+        // Disabled until SDNC support is there
 //             injectSDNCCallbacks(callbacks, "assign");               
 //             injectSDNCCallbacks(callbacks, "activate");
 
-               waitForProcessEnd(businessKey, 10000);
-                               
-               Assert.assertTrue(isProcessEnded(businessKey));
-               String found = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "GENGV_FoundIndicator") ;
-               String inUse = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "DoDVNF_vnfInUse");
-               String workflowException = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "WorkflowException");
-
-               assertEquals("true", found);
-               assertEquals("false", inUse);
-               assertEquals(null, workflowException);
-       }
-
-       @Test
-       @Deployment(resources = {"subprocess/GenericGetVnf.bpmn", "subprocess/GenericDeleteVnf.bpmn", "subprocess/DoDeleteVnf.bpmn"})
-       public void testDeleteVnfInfra_success_vnfNotFound() throws Exception{
-
-               MockDeleteGenericVnf("testVnfId123", "testReVer123", 404);
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-               
-               String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<>();
-               setVariables(variables);
-
-               invokeSubProcess("DoDeleteVnf", businessKey, variables);
-               // Disabled until SDNC support is there
+        waitForProcessEnd(businessKey, 10000);
+
+        Assert.assertTrue(isProcessEnded(businessKey));
+        String found = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "GENGV_FoundIndicator");
+        String inUse = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "DoDVNF_vnfInUse");
+        String workflowException = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "WorkflowException");
+
+        assertEquals("true", found);
+        assertEquals("false", inUse);
+        assertEquals(null, workflowException);
+    }
+
+    @Test
+    @Deployment(resources = {"subprocess/GenericGetVnf.bpmn", "subprocess/GenericDeleteVnf.bpmn", "subprocess/DoDeleteVnf.bpmn"})
+    public void testDeleteVnfInfra_success_vnfNotFound() throws Exception {
+
+        MockDeleteGenericVnf("testVnfId123", "testReVer123", 404);
+        mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+
+        String businessKey = UUID.randomUUID().toString();
+        Map<String, Object> variables = new HashMap<>();
+        setVariables(variables);
+
+        invokeSubProcess("DoDeleteVnf", businessKey, variables);
+        // Disabled until SDNC support is there
 //             injectSDNCCallbacks(callbacks, "assign");               
 //             injectSDNCCallbacks(callbacks, "activate");
 
-               waitForProcessEnd(businessKey, 10000);
-               
-               Assert.assertTrue(isProcessEnded(businessKey));
-               String found = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "GENGV_FoundIndicator") ;
-               String inUse = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "DoDVNF_vnfInUse");
-               String workflowException = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "WorkflowException");
+        waitForProcessEnd(businessKey, 10000);
 
-               assertEquals("false", found);
-               assertEquals("false", inUse);
-               assertEquals(null, workflowException);
-       }
+        Assert.assertTrue(isProcessEnded(businessKey));
+        String found = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "GENGV_FoundIndicator");
+        String inUse = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "DoDVNF_vnfInUse");
+        String workflowException = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "WorkflowException");
 
-       @Test
-       @Deployment(resources = {"subprocess/GenericGetVnf.bpmn", "subprocess/GenericDeleteVnf.bpmn", "subprocess/DoDeleteVnf.bpmn"})
-       public void testDeleteVnfInfra_error_vnfInUse() throws Exception{
+        assertEquals("false", found);
+        assertEquals("false", inUse);
+        assertEquals(null, workflowException);
+    }
 
-               MockGetGenericVnfByIdWithDepth("testVnfId123", 1, "GenericFlows/getGenericVnfResponse_hasRelationships.xml");
-               MockDeleteGenericVnf("testVnfId123", "testReVer123");
-               mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
+    @Test
+    @Deployment(resources = {"subprocess/GenericGetVnf.bpmn", "subprocess/GenericDeleteVnf.bpmn", "subprocess/DoDeleteVnf.bpmn"})
+    public void testDeleteVnfInfra_error_vnfInUse() throws Exception {
 
-               String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<>();
-               setVariables(variables);
+        MockGetGenericVnfByIdWithDepth("testVnfId123", 1, "GenericFlows/getGenericVnfResponse_hasRelationships.xml");
+        MockDeleteGenericVnf("testVnfId123", "testReVer123");
+        mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
 
-               invokeSubProcess("DoDeleteVnf", businessKey, variables);
+        String businessKey = UUID.randomUUID().toString();
+        Map<String, Object> variables = new HashMap<>();
+        setVariables(variables);
+
+        invokeSubProcess("DoDeleteVnf", businessKey, variables);
 //             Disabled until SDNC support is there
 //             injectSDNCCallbacks(callbacks, "assign");               
 //             injectSDNCCallbacks(callbacks, "activate");
 
-               waitForProcessEnd(businessKey, 10000);
-               
-               Assert.assertTrue(isProcessEnded(businessKey));
-
-               String found = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "GENGV_FoundIndicator") ;
-               String inUse = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "DoDVNF_vnfInUse");
-               String workflowException = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "WorkflowException");
-               String exWfex = "WorkflowException[processKey=DoDeleteVnf,errorCode=5000,errorMessage=Can't Delete Generic Vnf. Generic Vnf is still in use.]";
-
-               assertEquals("true", found);
-               assertEquals("true", inUse);
-               assertEquals(exWfex, workflowException);
-       }
-
-       private void setVariables(Map<String, Object> variables) {
-               variables.put("mso-request-id", "123");
-               variables.put("isDebugLogEnabled", "true");             
-               variables.put("vnfId","testVnfId123");
-       }
+        waitForProcessEnd(businessKey, 10000);
+
+        Assert.assertTrue(isProcessEnded(businessKey));
+
+        String found = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "GENGV_FoundIndicator");
+        String inUse = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "DoDVNF_vnfInUse");
+        String workflowException = BPMNUtil.getVariable(processEngineRule, "DoDeleteVnf", "WorkflowException");
+        String exWfex = "WorkflowException[processKey=DoDeleteVnf,errorCode=5000,errorMessage=Can't Delete Generic Vnf. Generic Vnf is still in use.]";
+
+        assertEquals("true", found);
+        assertEquals("true", inUse);
+        assertEquals(exWfex, workflowException);
+    }
+
+    private void setVariables(Map<String, Object> variables) {
+        variables.put("mso-request-id", "123");
+        variables.put("isDebugLogEnabled", "true");
+        variables.put("vnfId", "testVnfId123");
+    }
 }