From 03cce24c7a833b14613a0bd39823baec63acc306 Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Thu, 4 Sep 2014 07:08:34 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 82420: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 80335: ACE-2276 - Regression was a deliberate bug fix in activiti. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83257 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../workflow/activiti/ActivitiTimerExecutionTest.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source/test-java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java b/source/test-java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java index f0dedfd70b..b587583c81 100644 --- a/source/test-java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java +++ b/source/test-java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java @@ -146,8 +146,8 @@ public class ActivitiTimerExecutionTest extends BaseSpringTest WorkflowDefinition definition = deployDefinition("activiti/testTimerTransaction.bpmn20.xml"); - // Start the test timer transaction process, with 'error' = false, expecting a timer job - // to be executed without an error, with task timer is assigned to assigned to USER1 + // Start the test timer transaction process, with 'error' = true, expecting a timer job + // to be executed with an error, with task timer is assigned to assigned to USER1 Map params = new HashMap(); params.put(QName.createQName("error"), Boolean.TRUE); params.put(QName.createQName("theTaskAssignee"), USER1); @@ -180,11 +180,7 @@ public class ActivitiTimerExecutionTest extends BaseSpringTest .processInstanceId(processInstanceId).singleResult(); } assertNotNull("Job should have exception message set", timer.getExceptionMessage()); - - // MER WHAT IS THIS DOING ? - // Regression in 5.16.1 - // assertEquals(0, timer.getRetries()); - + // Check if exception is the one we deliberately caused String fullExceptionStacktrace = activitiProcessEngine.getManagementService().getJobExceptionStacktrace(timer.getId()); assertTrue(fullExceptionStacktrace.contains("Activiti engine rocks!"));