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 2016/08/15 20:54:43 UTC
[1/2] logging-log4j2 git commit: Forgot to remove import.
Repository: logging-log4j2
Updated Branches:
refs/heads/master c29ce4bb9 -> 927a593d1
Forgot to remove import.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f2fdaf97
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f2fdaf97
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f2fdaf97
Branch: refs/heads/master
Commit: f2fdaf9712492a17486d1c3dcadc75288888376d
Parents: c29ce4b
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 15 13:27:35 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 15 13:27:35 2016 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/pattern/MdcPatternConverterTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f2fdaf97/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java
index caa130d..a774461 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.junit.ThreadContextMapRule;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.SimpleMessage;
-import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
[2/2] logging-log4j2 git commit: Use a ThreadContextRule to clean up
tests.
Posted by gg...@apache.org.
Use a ThreadContextRule to clean up tests.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/927a593d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/927a593d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/927a593d
Branch: refs/heads/master
Commit: 927a593d1026461cf108740271e4dbbb3f353f96
Parents: f2fdaf9
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 15 13:54:42 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 15 13:54:42 2016 -0700
----------------------------------------------------------------------
.../log4j/core/pattern/RegexReplacementTest.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/927a593d/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
index ec526a2..8d68d5c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
@@ -16,19 +16,22 @@
*/
package org.apache.logging.log4j.core.pattern;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.core.util.Constants;
import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.junit.ThreadContextMapRule;
import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
*
*/
@@ -42,17 +45,15 @@ public class RegexReplacementTest {
@ClassRule
public static LoggerContextRule context = new LoggerContextRule(CONFIG);
+ @Rule
+ public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule();
+
@Before
public void setUp() throws Exception {
app = context.getListAppender("List").clear();
app2 = context.getListAppender("List2").clear();
}
- @After
- public void tearDown() throws Exception {
- ThreadContext.clearMap();
- }
-
org.apache.logging.log4j.Logger logger = context.getLogger("LoggerTest");
org.apache.logging.log4j.Logger logger2 = context.getLogger("ReplacementTest");