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

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);

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);
     }