diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/logging/mdc/MDCLoggingTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/logging/mdc/MDCLoggingTest.java index b523032ca57d7013f73375488bf36d4c53ebeb3e..908ae5620d22cf00a564d27385207d5a0188121f 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/logging/mdc/MDCLoggingTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/logging/mdc/MDCLoggingTest.java @@ -15,41 +15,40 @@ public class MDCLoggingTest extends PluggableActivitiTestCase { MemoryLogAppender console = new MemoryLogAppender(); List appenders = null; - + private void setCustomLogger() { String PATTERN = "Modified Log *** ProcessDefinitionId=%X{mdcProcessDefinitionID} executionId=%X{mdcExecutionId} mdcProcessInstanceID=%X{mdcProcessInstanceID} mdcBusinessKey=%X{mdcBusinessKey} mdcTaskId=%X{mdcTaskId} %m%n"; console.setLayout(new PatternLayout(PATTERN)); - console.setThreshold(Level.INFO); + console.setThreshold(Level.DEBUG); console.activateOptions(); console.setName("MemoryAppender"); - + appenders = new ArrayList(); - Enumeration appendersEnum = Logger.getRootLogger().getAllAppenders(); - + Enumeration appendersEnum = Logger.getRootLogger().getAllAppenders(); + while (appendersEnum.hasMoreElements()) { - Appender object = (Appender ) appendersEnum.nextElement(); - appenders.add(object); - } - + Appender object = (Appender) appendersEnum.nextElement(); + appenders.add(object); + } + removeAppenders(); - + Logger.getRootLogger().addAppender(console); } - - + private void removeAppenders() { - Enumeration< ? > appendersEnum = Logger.getRootLogger().getAllAppenders(); - while (appendersEnum.hasMoreElements()) { - Appender object = (Appender ) appendersEnum.nextElement(); - Logger.getRootLogger().removeAppender(object); - } + Enumeration appendersEnum = Logger.getRootLogger().getAllAppenders(); + while (appendersEnum.hasMoreElements()) { + Appender object = (Appender) appendersEnum.nextElement(); + Logger.getRootLogger().removeAppender(object); + } } - + private void restoreLoggers() { - removeAppenders(); + removeAppenders(); - for (Appender appender:appenders) { - Logger.getRootLogger().addAppender(appender); + for (Appender appender : appenders) { + Logger.getRootLogger().addAppender(appender); } } @@ -61,28 +60,27 @@ public class MDCLoggingTest extends PluggableActivitiTestCase { runtimeService.startProcessInstanceByKey("testLoggerProcess"); fail("Expected exception"); } catch (Exception e) { - // expected exception + // expected exception } - String messages = console.toString(); - - assertTrue(messages.contains( - "ProcessDefinitionId=" + TestService.processDefinitionId)); - assertTrue(messages.contains( - "executionId=" + TestService.executionId)); - assertTrue(messages.contains( - "mdcProcessInstanceID=" + TestService.processInstanceId)); - assertTrue(messages.contains( - "mdcBusinessKey=" - + (TestService.businessKey == null ? "" - : TestService.businessKey))); - console.clear(); - restoreLoggers(); - + String messages = console.toString(); + System.out.println("---:" + messages); + + assertTrue(messages.contains("ProcessDefinitionId=" + + TestService.processDefinitionId)); + assertTrue(messages.contains("executionId=" + TestService.executionId)); + assertTrue(messages.contains("mdcProcessInstanceID=" + + TestService.processInstanceId)); + assertTrue(messages.contains("mdcBusinessKey=" + + (TestService.businessKey == null ? "" + : TestService.businessKey))); + console.clear(); + restoreLoggers(); + try { runtimeService.startProcessInstanceByKey("testLoggerProcess"); fail("Expected exception"); } catch (Exception e) { - // expected exception + // expected exception } assertFalse(console.toString().contains( "ProcessDefinitionId=" + TestService.processDefinitionId)); diff --git a/modules/activiti-engine/src/test/resources/log4j.properties b/modules/activiti-engine/src/test/resources/log4j.properties index 8dba0edd4070c0cd021d895c1c55f33eae44f4e0..44b10c43d037452fd5e895f48d931c7ca00b5f66 100644 --- a/modules/activiti-engine/src/test/resources/log4j.properties +++ b/modules/activiti-engine/src/test/resources/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootLogger=INFO, CA +log4j.rootLogger=DEBUG, CA # ConsoleAppender log4j.appender.CA=org.apache.log4j.ConsoleAppender