svn commit: r1846396 - /jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java

[re...@apache.org]

Author: reschke
Date: Mon Nov 12 11:13:31 2018
New Revision: 1846396

URL: http://svn.apache.org/viewvc?rev=1846396&view=rev
Log:
OAK-7892: LogCustomizer should support slf4j log levels

Modified:
    jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java

Modified: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java?rev=1846396&r1=1846395&r2=1846396&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java Mon Nov 12 11:13:31 2018
@@ -93,11 +93,21 @@ public class LogCustomizer {
             return this;
         }
 
+        public LogCustomizerBuilder enable(org.slf4j.event.Level level) {
+            this.enableLevel = fromSlf4jLevel(level);
+            return this;
+        }
+
         public LogCustomizerBuilder filter(Level level) {
             this.filterLevel = level;
             return this;
         }
 
+        public LogCustomizerBuilder filter(org.slf4j.event.Level level) {
+            this.filterLevel = fromSlf4jLevel(level);
+            return this;
+        }
+
         public LogCustomizerBuilder exactlyMatches(String message) {
             this.matchExactMessage = message;
             return this;
@@ -116,6 +126,23 @@ public class LogCustomizer {
         public LogCustomizer create() {
             return new LogCustomizer(name, enableLevel, filterLevel, matchExactMessage, matchContainsMessage, matchRegexMessage);
         }
+
+        private static Level fromSlf4jLevel(org.slf4j.event.Level level) {
+            switch (level) {
+                case DEBUG:
+                    return Level.DEBUG;
+                case ERROR:
+                    return Level.ERROR;
+                case INFO:
+                    return Level.INFO;
+                case TRACE:
+                    return Level.TRACE;
+                case WARN:
+                    return Level.WARN;
+                default:
+                    throw new IllegalArgumentException("Log level not supported: " + level);
+            }
+        }
     }
 
     private final Logger logger;