From c8c5e52d5591058eabd5e7f078bd7a130019d4a9 Mon Sep 17 00:00:00 2001
From: Joram Barrez <joram.barrez@gmail.com>
Date: Wed, 6 Nov 2013 11:12:42 +0100
Subject: [PATCH] Fix for failing Jenkins

---
 .../test/logging/mdc/MDCLoggingTest.java      | 74 +++++++++----------
 .../src/test/resources/log4j.properties       |  2 +-
 2 files changed, 37 insertions(+), 39 deletions(-)

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 b523032ca5..908ae5620d 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<Appender> 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<Appender>();
-    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 8dba0edd40..44b10c43d0 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
-- 
GitLab