package org.openecomp.mso.bpmn.common;\r
\r
import static org.junit.Assert.assertEquals;\r
+import static org.junit.Assert.assertNotNull;\r
+import static org.junit.Assert.assertNull;\r
+import static org.junit.Assert.assertTrue;\r
import static org.junit.Assert.fail;\r
import static org.mockito.Matchers.any;\r
import static org.mockito.Mockito.doAnswer;\r
import org.jboss.resteasy.spi.AsynchronousResponse;\r
import org.mockito.invocation.InvocationOnMock;\r
import org.mockito.stubbing.Answer;\r
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncCommonResource;\r
import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;\r
import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;\r
import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;\r
}\r
\r
@SuppressWarnings("unchecked")\r
- public static <T extends Object> T getRawVariable(ProcessEngineServices processEngineServices, String processDefinitionID, String name) {\r
+ public static <T> T getRawVariable(ProcessEngineServices processEngineServices, String processDefinitionID, String name) {\r
String pID = getProcessInstanceId(processEngineServices,\r
processDefinitionID);\r
assertProcessInstanceFinished(processEngineServices, pID);\r
.getValue();\r
return (T) responseData;\r
}\r
+\r
+ \r
+ public static void assertAnyProcessInstanceFinished(ProcessEngineServices processEngineServices, String processDefinitionID) {\r
+ String pID = getProcessInstanceId(processEngineServices,\r
+ processDefinitionID);\r
+ assertNotNull(pID);\r
+ assertTrue(processEngineServices.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pID).finished().count() > 0);\r
+ }\r
\r
+ public static void assertNoProcessInstance(ProcessEngineServices processEngineServices, String processDefinitionID) {\r
+ assertNull(getProcessInstanceId(processEngineServices, processDefinitionID));\r
+ }\r
\r
public static void assertProcessInstanceFinished(ProcessEngineServices processEngineServices, String pid) {\r
assertEquals(1, processEngineServices.getHistoryService().createHistoricProcessInstanceQuery().processInstanceId(pid).finished().count());\r
\r
\r
private static void buildVariable(String key, String value, Map<String,Object> variableValueType) {\r
- Map<String, Object> host = new HashMap<String, Object>();\r
+ Map<String, Object> host = new HashMap<>();\r
host.put("value", value);\r
host.put("type", "String");\r
variableValueType.put(key, host);\r
WorkflowResource workflowResource = new WorkflowResource();\r
VariableMapImpl variableMap = new VariableMapImpl();\r
\r
- Map<String, Object> variableValueType = new HashMap<String, Object>();\r
+ Map<String, Object> variableValueType = new HashMap<>();\r
for (String key : variables.keySet()) {\r
buildVariable(key, variables.get(key), variableValueType);\r
}\r
* @param variables\r
*/\r
private static void executeAsyncFlow(ProcessEngineServices processEngineServices, String processKey, AsynchronousResponse asyncResponse, Map<String,String> variables) {\r
- WorkflowAsyncResource workflowResource = new WorkflowAsyncCommonResource();\r
+ WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();\r
VariableMapImpl variableMap = new VariableMapImpl();\r
\r
- Map<String, Object> variableValueType = new HashMap<String, Object>();\r
+ Map<String, Object> variableValueType = new HashMap<>();\r
for (String key : variables.keySet()) {\r
buildVariable(key, variables.get(key), variableValueType);\r
}\r