inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
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
This commit is contained in:
Erik Winlof
2014-09-04 07:08:34 +00:00
parent ce18643be9
commit 03cce24c7a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/test-java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java
View File

@@ -146,8 +146,8 @@ public class ActivitiTimerExecutionTest extends BaseSpringTest
WorkflowDefinition definition = deployDefinition("activiti/testTimerTransaction.bpmn20.xml"); WorkflowDefinition definition = deployDefinition("activiti/testTimerTransaction.bpmn20.xml");
// Start the test timer transaction process, with 'error' = false, expecting a timer job // Start the test timer transaction process, with 'error' = true, expecting a timer job
// to be executed without an error, with task timer is assigned to assigned to USER1 // to be executed with an error, with task timer is assigned to assigned to USER1
Map<QName, Serializable> params = new HashMap<QName, Serializable>(); Map<QName, Serializable> params = new HashMap<QName, Serializable>();
params.put(QName.createQName("error"), Boolean.TRUE); params.put(QName.createQName("error"), Boolean.TRUE);
params.put(QName.createQName("theTaskAssignee"), USER1); params.put(QName.createQName("theTaskAssignee"), USER1);
@@ -181,10 +181,6 @@ public class ActivitiTimerExecutionTest extends BaseSpringTest
} }
assertNotNull("Job should have exception message set", timer.getExceptionMessage()); 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 // Check if exception is the one we deliberately caused
String fullExceptionStacktrace = activitiProcessEngine.getManagementService().getJobExceptionStacktrace(timer.getId()); String fullExceptionStacktrace = activitiProcessEngine.getManagementService().getJobExceptionStacktrace(timer.getId());
assertTrue(fullExceptionStacktrace.contains("Activiti engine rocks!")); assertTrue(fullExceptionStacktrace.contains("Activiti engine rocks!"));