提交 5e7873eb 编写于 作者: B bernd.ruecker

ACT-1202: Fixed remaining test case and adjusted to write audit log for start...

ACT-1202: Fixed remaining test case and adjusted to write audit log for start event on level "activity"
上级 ea1743c1
......@@ -105,7 +105,7 @@ public class HistoryParseListener implements BpmnParseListener {
}
public void parseStartEvent(Element startEventElement, ScopeImpl scope, ActivityImpl activity) {
if (fullHistoryEnabled(historyLevel)) {
if (activityHistoryEnabled(activity, historyLevel)) {
activity.addExecutionListener(org.activiti.engine.impl.pvm.PvmEvent.EVENTNAME_END, START_EVENT_END_HANDLER);
}
}
......
......@@ -100,9 +100,9 @@ public class HistoricActivityInstanceTest extends PluggableActivitiTestCase {
assertEquals(0, historyService.createHistoricActivityInstanceQuery().executionId("nonExistingExecutionId").list().size());
if (processEngineConfiguration.getHistoryLevel()==ProcessEngineConfigurationImpl.HISTORYLEVEL_FULL) {
assertEquals(2, historyService.createHistoricActivityInstanceQuery().executionId(processInstance.getId()).list().size());
assertEquals(3, historyService.createHistoricActivityInstanceQuery().executionId(processInstance.getId()).list().size());
} else if (processEngineConfiguration.getHistoryLevel()>=ProcessEngineConfigurationImpl.HISTORYLEVEL_ACTIVITY) {
assertEquals(1, historyService.createHistoricActivityInstanceQuery().executionId(processInstance.getId()).list().size());
assertEquals(3, historyService.createHistoricActivityInstanceQuery().executionId(processInstance.getId()).list().size());
} else {
assertEquals(0, historyService.createHistoricActivityInstanceQuery().executionId(processInstance.getId()).list().size());
}
......@@ -110,9 +110,9 @@ public class HistoricActivityInstanceTest extends PluggableActivitiTestCase {
assertEquals(0, historyService.createHistoricActivityInstanceQuery().processInstanceId("nonExistingProcessInstanceId").list().size());
if (processEngineConfiguration.getHistoryLevel()==ProcessEngineConfigurationImpl.HISTORYLEVEL_FULL) {
assertEquals(2, historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstance.getId()).list().size());
assertEquals(3, historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstance.getId()).list().size());
} else if (processEngineConfiguration.getHistoryLevel()>=ProcessEngineConfigurationImpl.HISTORYLEVEL_ACTIVITY) {
assertEquals(1, historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstance.getId()).list().size());
assertEquals(3, historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstance.getId()).list().size());
} else {
assertEquals(0, historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstance.getId()).list().size());
}
......@@ -120,9 +120,9 @@ public class HistoricActivityInstanceTest extends PluggableActivitiTestCase {
assertEquals(0, historyService.createHistoricActivityInstanceQuery().processDefinitionId("nonExistingProcessDefinitionId").list().size());
if (processEngineConfiguration.getHistoryLevel()==ProcessEngineConfigurationImpl.HISTORYLEVEL_FULL) {
assertEquals(2, historyService.createHistoricActivityInstanceQuery().processDefinitionId(processInstance.getProcessDefinitionId()).list().size());
assertEquals(3, historyService.createHistoricActivityInstanceQuery().processDefinitionId(processInstance.getProcessDefinitionId()).list().size());
} else if (processEngineConfiguration.getHistoryLevel()>=ProcessEngineConfigurationImpl.HISTORYLEVEL_ACTIVITY) {
assertEquals(1, historyService.createHistoricActivityInstanceQuery().processDefinitionId(processInstance.getProcessDefinitionId()).list().size());
assertEquals(3, historyService.createHistoricActivityInstanceQuery().processDefinitionId(processInstance.getProcessDefinitionId()).list().size());
} else {
assertEquals(0, historyService.createHistoricActivityInstanceQuery().processDefinitionId(processInstance.getProcessDefinitionId()).list().size());
}
......@@ -130,9 +130,9 @@ public class HistoricActivityInstanceTest extends PluggableActivitiTestCase {
assertEquals(0, historyService.createHistoricActivityInstanceQuery().unfinished().list().size());
if (processEngineConfiguration.getHistoryLevel()==ProcessEngineConfigurationImpl.HISTORYLEVEL_FULL) {
assertEquals(2, historyService.createHistoricActivityInstanceQuery().finished().list().size());
assertEquals(3, historyService.createHistoricActivityInstanceQuery().finished().list().size());
} else if (processEngineConfiguration.getHistoryLevel()>=ProcessEngineConfigurationImpl.HISTORYLEVEL_ACTIVITY) {
assertEquals(1, historyService.createHistoricActivityInstanceQuery().finished().list().size());
assertEquals(3, historyService.createHistoricActivityInstanceQuery().finished().list().size());
} else {
assertEquals(0, historyService.createHistoricActivityInstanceQuery().finished().list().size());
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册