提交 c8c5e52d 编写于 作者: J Joram Barrez

Fix for failing Jenkins

上级 2a444277
......@@ -19,7 +19,7 @@ public class MDCLoggingTest extends PluggableActivitiTestCase {
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");
......@@ -27,7 +27,7 @@ public class MDCLoggingTest extends PluggableActivitiTestCase {
Enumeration<?> appendersEnum = Logger.getRootLogger().getAllAppenders();
while (appendersEnum.hasMoreElements()) {
Appender object = (Appender ) appendersEnum.nextElement();
Appender object = (Appender) appendersEnum.nextElement();
appenders.add(object);
}
......@@ -36,11 +36,10 @@ public class MDCLoggingTest extends PluggableActivitiTestCase {
Logger.getRootLogger().addAppender(console);
}
private void removeAppenders() {
Enumeration< ? > appendersEnum = Logger.getRootLogger().getAllAppenders();
Enumeration<?> appendersEnum = Logger.getRootLogger().getAllAppenders();
while (appendersEnum.hasMoreElements()) {
Appender object = (Appender ) appendersEnum.nextElement();
Appender object = (Appender) appendersEnum.nextElement();
Logger.getRootLogger().removeAppender(object);
}
}
......@@ -48,7 +47,7 @@ public class MDCLoggingTest extends PluggableActivitiTestCase {
private void restoreLoggers() {
removeAppenders();
for (Appender appender:appenders) {
for (Appender appender : appenders) {
Logger.getRootLogger().addAppender(appender);
}
}
......@@ -64,15 +63,14 @@ public class MDCLoggingTest extends PluggableActivitiTestCase {
// 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="
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();
......
log4j.rootLogger=INFO, CA
log4j.rootLogger=DEBUG, CA
# ConsoleAppender
log4j.appender.CA=org.apache.log4j.ConsoleAppender
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册