You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/05/21 20:27:09 UTC
svn commit: r1596642 -
/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java
Author: ggregory
Date: Wed May 21 18:27:09 2014
New Revision: 1596642
URL: http://svn.apache.org/r1596642
Log:
Clear all markers before and after tests.
Modified:
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java
Modified: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java?rev=1596642&r1=1596641&r2=1596642&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java Wed May 21 18:27:09 2014
@@ -18,6 +18,8 @@ package org.apache.logging.slf4j;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -27,6 +29,12 @@ import static org.junit.Assert.*;
*/
public class MarkerTest {
+ @Before
+ @After
+ public void clearMarkers() {
+ MarkerManager.clear();
+ }
+
@Test
public void testMarker() {
final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker("TEST");
@@ -39,4 +47,6 @@ public class MarkerTest {
assertTrue("TEST is not an instance of PARENT in Log4j", log4jMarker.isInstanceOf(log4jParent));
assertTrue("TEST is not an instance of PARENT in SLF4J", slf4jMarker.contains(slf4jParent));
}
+
+
}