From c6ce0e4e079eab982aa957b230910683fa6bc66e Mon Sep 17 00:00:00 2001
From: Frederik Heremans <frederik.heremans@alfresco.com>
Date: Wed, 2 May 2012 15:45:45 +0000
Subject: [PATCH] Merged V4.0-BUGFIX to HEAD: 35991: ALF-13901: Incorrect
 workflow-history gathering/displaying on uncompleted tasks in ended parallel
 multi-instance activity 32993: ALF-10278, ALF-13902: Fixed failing test (was
 not using AuthenticationUtil for test-user)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/workflow/activiti/ActivitiTaskComponentTest.java    | 5 ++++-
 .../activiti/properties/ActivitiPropertyConverter.java       | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
index e714145702..e733e0296f 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
@@ -36,6 +36,7 @@ import org.activiti.engine.history.HistoricDetail;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.history.HistoricVariableUpdate;
 import org.activiti.engine.task.Task;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.workflow.BPMEngineRegistry;
 import org.alfresco.repo.workflow.WorkflowModel;
 import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -568,8 +569,10 @@ public class ActivitiTaskComponentTest extends AbstractActivitiComponentTest
         // Set process prop
         runtime.setVariable(task.getExecutionId(), "processVar", "testing");
         
-        // End the task
+        // End the task as TEST_USER
+        AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER);
         workflowEngine.endTask(globalTaskId, null);
+        AuthenticationUtil.setFullyAuthenticatedUser("admin");
 
         // Test query by taskId
         WorkflowTaskQuery taskQuery = createWorkflowTaskQuery(WorkflowTaskState.COMPLETED);
diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
index 258ec49a57..f34f8995d3 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
@@ -517,7 +517,8 @@ public class ActivitiPropertyConverter
     {
         HistoricDetailQuery query = activitiUtil.getHistoryService()
             .createHistoricDetailQuery()
-            .processInstanceId(processId);
+            .processInstanceId(processId)
+            .excludeTaskDetails();
         return getHistoricVariables(query);
     }