Merge "Add junit test coverage and fix bugs in VCPE"

1 files changed, 14 insertions, 0 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
index 9057904da3..f60d984a6d 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
@@ -21,6 +21,9 @@
 package org.openecomp.mso.bpmn.common;

 

 import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertNull;

+import static org.junit.Assert.assertTrue;

 import static org.junit.Assert.fail;

 import static org.mockito.Matchers.any;

 import static org.mockito.Mockito.doAnswer;

@@ -77,7 +80,18 @@ public class BPMNUtil {
 			    .getValue();

 		return (T) responseData;

 	}

+

+	

+	public static void assertAnyProcessInstanceFinished(ProcessEngineServices processEngineServices, String processDefinitionID) {

+		String pID = getProcessInstanceId(processEngineServices,

+				processDefinitionID);

+		assertNotNull(pID);

+	    assertTrue(processEngineServices.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pID).finished().count() > 0);

+	}

 	

+	public static void assertNoProcessInstance(ProcessEngineServices processEngineServices, String processDefinitionID) {

+		assertNull(getProcessInstanceId(processEngineServices, processDefinitionID));

+	}

 	

 	public static void assertProcessInstanceFinished(ProcessEngineServices processEngineServices, String pid) {

 	    assertEquals(1, processEngineServices.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pid).finished().count());