From c89bee1ff4b77d52f26fa8529b3599879d4e722f Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 16 May 2014 17:43:48 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 69761: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 69649: Merged DEV to V4.2-BUG-FIX 69604: MNT-11378: Intermittent test failures: ProcessWorkflowApiTest and TaskWorkflowApiTest - Add logging to find out cause of failing on bamboo. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/rest/api/tests/AbstractTestApi.java | 13 +++++++++---- .../workflow/api/tests/ProcessWorkflowApiTest.java | 6 +++++- .../workflow/api/tests/TaskWorkflowApiTest.java | 4 ++-- source/test-resources/log4j.properties | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/AbstractTestApi.java b/source/test-java/org/alfresco/rest/api/tests/AbstractTestApi.java index 88fd5316e0..04ab16bc80 100644 --- a/source/test-java/org/alfresco/rest/api/tests/AbstractTestApi.java +++ b/source/test-java/org/alfresco/rest/api/tests/AbstractTestApi.java @@ -76,10 +76,15 @@ public abstract class AbstractTestApi protected void log(String msg) { - if(logger.isDebugEnabled()) - { - logger.debug(msg); - } + log(msg, null); + } + + protected void log(String msg, Throwable t) + { + if(logger.isDebugEnabled()) + { + logger.debug(msg, t); + } } protected Paging getPaging(Integer skipCount, Integer maxItems) diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java b/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java index 72118c2f9e..1cf0cd7776 100644 --- a/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java +++ b/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java @@ -2154,13 +2154,17 @@ public class ProcessWorkflowApiTest extends EnterpriseWorkflowTestApi { activitiProcessEngine.getRuntimeService().deleteProcessInstance(processInstanceId, null); } - catch(Exception e) {} + catch(Exception e) + { + log("Error while cleaning up process instance", e); + } activitiProcessEngine.getHistoryService().deleteHistoricProcessInstance(processInstanceId); } } catch (Throwable t) { // Ignore error during cleanup + log("Error while cleaning up process instance", t); } } } diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java index 1e14410d26..e5d7ab46c9 100644 --- a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java +++ b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java @@ -3880,7 +3880,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi catch(Throwable t) { // Ignore error during cleanup to prevent swallowing potential assetion-exception - log("Error while cleaning up process instance"); + log("Error while cleaning up process instance", t); } } @@ -3898,7 +3898,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi catch(Throwable t) { // Ignore error during cleanup to prevent swallowing potential assetion-exception - log("Error while cleaning up process instance"); + log("Error while cleaning up process instance", t); } } } diff --git a/source/test-resources/log4j.properties b/source/test-resources/log4j.properties index 8bc143d00b..ae6e69fa4e 100644 --- a/source/test-resources/log4j.properties +++ b/source/test-resources/log4j.properties @@ -5,5 +5,5 @@ log4j.appender.Console.layout=org.apache.log4j.PatternLayout log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n log4j.logger.org.alfresco=WARN -#log4j.logger.org.alfresco.rest.api=DEBUG +log4j.logger.org.alfresco.rest.api=DEBUG log4j.logger.org.eclipse.jetty.util.log=INFO \ No newline at end of file