From 5e7873ebd45790d9d72eb9d312de4611dc97f796 Mon Sep 17 00:00:00 2001 From: "bernd.ruecker" Date: Wed, 25 Jul 2012 16:08:37 +0000 Subject: [PATCH] ACT-1202: Fixed remaining test case and adjusted to write audit log for start event on level "activity" --- .../history/handler/HistoryParseListener.java | 2 +- .../history/HistoricActivityInstanceTest.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/handler/HistoryParseListener.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/handler/HistoryParseListener.java index eb3974d354..8a5c83b2dc 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/handler/HistoryParseListener.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/handler/HistoryParseListener.java @@ -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); } } diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/history/HistoricActivityInstanceTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/history/HistoricActivityInstanceTest.java index 2ae8ddf5ce..cf8e5e5fe4 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/history/HistoricActivityInstanceTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/history/HistoricActivityInstanceTest.java @@ -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()); } -- GitLab