From 7bfc426a678fa9523dba098f81d9d7d94e8f44de Mon Sep 17 00:00:00 2001
From: bennidi <b.diedrichsen@googlemai.com>
Date: Wed, 3 Jul 2013 10:28:12 +0200
Subject: [PATCH] added logging in tests

---
 pom.xml                                       | 14 ++++++++
 .../engio/mbassy/bus/MessagePublication.java  |  2 +-
 .../engio/mbassy/common/AssertSupport.java    | 28 +++++++++++++++-
 src/test/resources/log4j.xml                  | 32 +++++++++++++++++++
 4 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/log4j.xml

diff --git a/pom.xml b/pom.xml
index f58d6d8..4aa19c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,20 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.5</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <!--  Local repository (for testing)
diff --git a/src/main/java/net/engio/mbassy/bus/MessagePublication.java b/src/main/java/net/engio/mbassy/bus/MessagePublication.java
index d120c29..eb69ec9 100644
--- a/src/main/java/net/engio/mbassy/bus/MessagePublication.java
+++ b/src/main/java/net/engio/mbassy/bus/MessagePublication.java
@@ -31,7 +31,7 @@ public class MessagePublication {
 
     private Object message;
 
-    private State state = State.Scheduled;
+    private State state = State.Initial;
 
     private boolean delivered = false;
 
diff --git a/src/test/java/net/engio/mbassy/common/AssertSupport.java b/src/test/java/net/engio/mbassy/common/AssertSupport.java
index aed8ae0..1684438 100644
--- a/src/test/java/net/engio/mbassy/common/AssertSupport.java
+++ b/src/test/java/net/engio/mbassy/common/AssertSupport.java
@@ -1,6 +1,12 @@
 package net.engio.mbassy.common;
 
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.ref.WeakReference;
 
@@ -9,8 +15,25 @@ import java.lang.ref.WeakReference;
  */
 public class AssertSupport {
 
-    // Internal state
     private Runtime runtime = Runtime.getRuntime();
+    protected Logger logger = LoggerFactory.getLogger(getClass().getSimpleName());
+    private long testExecutionStart;
+
+    @Rule
+    public TestName name = new TestName();
+
+
+    @Before
+    public void beforeTest(){
+        logger.info("Running test " + getTestName());
+        testExecutionStart = System.currentTimeMillis();
+    }
+
+    @After
+    public void afterTest(){
+        logger.info(String.format("Finished " + getTestName() + ": " + (System.currentTimeMillis() - testExecutionStart) + " ms"));
+    }
+
 
     public void pause(long ms) {
         try {
@@ -24,6 +47,9 @@ public class AssertSupport {
         pause(10);
     }
 
+    public String getTestName(){
+        return getClass().getSimpleName() + "." + name.getMethodName();
+    }
 
     public void runGC() {
         WeakReference ref = new WeakReference<Object>(new Object());
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
new file mode 100644
index 0000000..1061005
--- /dev/null
+++ b/src/test/resources/log4j.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p - %m%n"/>
+		</layout>
+	</appender>
+
+	<category name="org.springframework" additivity="false">
+		<priority value="info"/>
+		<appender-ref ref="console"/>
+	</category>
+
+	<category name="de.safetynet" additivity="false">
+		<priority value="info"/>
+		<appender-ref ref="console"/>
+	</category>
+
+	<category name="de.safetynet.tracking" additivity="false">
+		<priority value="debug"/>
+		<appender-ref ref="console"/>
+	</category>
+
+	<root>
+		<priority value ="info" />
+		<appender-ref ref="console"/>
+	</root>
+
+</log4j:configuration>
\ No newline at end of file