You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/06/29 17:29:24 UTC
logging-log4j2 git commit: Unit tests for Logger.isEnabled(Marker)
Repository: logging-log4j2
Updated Branches:
refs/heads/master a31582411 -> da3550d14
Unit tests for Logger.isEnabled(Marker)
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/da3550d1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/da3550d1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/da3550d1
Branch: refs/heads/master
Commit: da3550d144ad76cb87f280ebaf8118ed4ebd99f5
Parents: a315824
Author: Mikael St�ldal <mi...@magine.com>
Authored: Wed Jun 29 19:29:15 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Wed Jun 29 19:29:15 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/Logger.java | 3 +
.../org/apache/logging/log4j/LoggerTest.java | 62 +++++++++++++++++---
2 files changed, 56 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/da3550d1/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java b/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
index f59d7dd..30f0d59 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
@@ -2329,6 +2329,9 @@ public interface Logger {
/**
* Checks whether this Logger is enabled for the given Level and Marker.
+ * <p>
+ * Note that passing in {@link Level#OFF OFF} always returns {@code true}.
+ * </p>
*
* @param level The Level to check
* @param marker The Marker to check
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/da3550d1/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
index b01cc17..c66490d 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
@@ -16,15 +16,6 @@
*/
package org.apache.logging.log4j;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.endsWith;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import java.util.Date;
import java.util.List;
import java.util.Locale;
@@ -43,6 +34,12 @@ import org.apache.logging.log4j.util.Strings;
import org.apache.logging.log4j.util.Supplier;
import org.junit.Before;
import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.endsWith;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.junit.Assert.*;
/**
*
*/
@@ -57,6 +54,7 @@ public class LoggerTest {
}
private final TestLogger logger = (TestLogger) LogManager.getLogger("LoggerTest");
+ private final Marker marker = MarkerManager.getMarker("test");
private final List<String> results = logger.getEntries();
@Test
@@ -490,6 +488,52 @@ public class LoggerTest {
}
@Test
+ public void isAllEnabledWithMarker() {
+ assertTrue("Incorrect level", logger.isEnabled(Level.ALL, marker));
+ }
+
+ @Test
+ public void isDebugEnabledWithMarker() {
+ assertTrue("Incorrect level", logger.isDebugEnabled(marker));
+ assertTrue("Incorrect level", logger.isEnabled(Level.DEBUG, marker));
+ }
+
+ @Test
+ public void isErrorEnabledWithMarker() {
+ assertTrue("Incorrect level", logger.isErrorEnabled(marker));
+ assertTrue("Incorrect level", logger.isEnabled(Level.ERROR, marker));
+ }
+
+ @Test
+ public void isFatalEnabledWithMarker() {
+ assertTrue("Incorrect level", logger.isFatalEnabled(marker));
+ assertTrue("Incorrect level", logger.isEnabled(Level.FATAL, marker));
+ }
+
+ @Test
+ public void isInfoEnabledWithMarker() {
+ assertTrue("Incorrect level", logger.isInfoEnabled(marker));
+ assertTrue("Incorrect level", logger.isEnabled(Level.INFO, marker));
+ }
+
+ @Test
+ public void isOffEnabledWithMarker() {
+ assertTrue("Incorrect level", logger.isEnabled(Level.OFF, marker));
+ }
+
+ @Test
+ public void isTraceEnabledWithMarker() {
+ assertTrue("Incorrect level", logger.isTraceEnabled(marker));
+ assertTrue("Incorrect level", logger.isEnabled(Level.TRACE, marker));
+ }
+
+ @Test
+ public void isWarnEnabledWithMarker() {
+ assertTrue("Incorrect level", logger.isWarnEnabled(marker));
+ assertTrue("Incorrect level", logger.isEnabled(Level.WARN, marker));
+ }
+
+ @Test
public void mdc() {
ThreadContext.put("TestYear", Integer.valueOf(2010).toString());