Author: catholicon
Date: Wed Feb 15 15:57:34 2017
New Revision: 1783115
URL: http://svn.apache.org/viewvc?rev=1783115&view=rev
Log:
OAK-5663: Improve LogCutomizer to allow filtering on log messages too
(backported r1783089 from trunk)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 15 15:57:34 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782990,1783061
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782990,1783061,1783089
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java?rev=1783115&r1=1783114&r2=1783115&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
Wed Feb 15 15:57:34 2017
@@ -80,6 +80,9 @@ public class LogCustomizer {
private final String name;
private Level enableLevel;
private Level filterLevel;
+ private String matchExactMessage;
+ private String matchContainsMessage;
+ private String matchRegexMessage;
private LogCustomizerBuilder(String name) {
this.name = name;
@@ -95,8 +98,23 @@ public class LogCustomizer {
return this;
}
+ public LogCustomizerBuilder exactlyMatches(String message) {
+ this.matchExactMessage = message;
+ return this;
+ }
+
+ public LogCustomizerBuilder contains(String message) {
+ this.matchContainsMessage = message;
+ return this;
+ }
+
+ public LogCustomizerBuilder matchesRegex(String message) {
+ this.matchRegexMessage = message;
+ return this;
+ }
+
public LogCustomizer create() {
- return new LogCustomizer(name, enableLevel, filterLevel);
+ return new LogCustomizer(name, enableLevel, filterLevel,
matchExactMessage, matchContainsMessage, matchRegexMessage);
}
}
@@ -109,7 +127,8 @@ public class LogCustomizer {
private final Appender<ILoggingEvent> customLogger;
private LogCustomizer(String name, Level enableLevel,
- final Level filterLevel) {
+ final Level filterLevel,
+ final String matchExactMessage, final String
matchContainsMessage, final String matchRegexMessage) {
this.logger = getLogger(name);
if (enableLevel != null) {
this.enableLevel = enableLevel;
@@ -122,10 +141,32 @@ public class LogCustomizer {
customLogger = new AppenderBase<ILoggingEvent>() {
@Override
protected void append(ILoggingEvent e) {
+ boolean logLevelOk = false;
if (filterLevel == null) {
- logs.add(e.getFormattedMessage());
+ logLevelOk = true;
} else if (e.getLevel().isGreaterOrEqual(filterLevel)) {
- logs.add(e.getFormattedMessage());
+ logLevelOk = true;
+ }
+
+ if(logLevelOk) {
+ boolean messageMatchOk = true;
+ String message = e.getFormattedMessage();
+
+ if (messageMatchOk && matchExactMessage != null &&
!matchExactMessage.equals(message)) {
+ messageMatchOk = false;
+ }
+
+ if (messageMatchOk && matchContainsMessage != null &&
!message.contains(matchContainsMessage)) {
+ messageMatchOk = false;
+ }
+
+ if (messageMatchOk && matchRegexMessage != null &&
!message.matches(matchRegexMessage)) {
+ messageMatchOk = false;
+ }
+
+ if (messageMatchOk) {
+ logs.add(e.getFormattedMessage());
+ }
}
}
};
Modified:
jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java?rev=1783115&r1=1783114&r2=1783115&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java
Wed Feb 15 15:57:34 2017
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.commons.junit;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.matchers.JUnitMatchers.containsString;
@@ -74,6 +75,90 @@ public class LogCustomizerTest {
} finally {
custom.finished();
+ }
+ }
+
+ @Test
+ public void testExactMatch() {
+ LogCustomizer custom = LogCustomizer
+
.forLogger("org.apache.jackrabbit.oak.commons.junit.LogCustomizerTest")
+ .exactlyMatches("Test Message")
+ .create();
+
+ try {
+ custom.starting();
+ LOG.info("test message");
+ LOG.info("test message 1");
+ LOG.info("1 test message");
+
+ List<String> logs = custom.getLogs();
+ assertTrue(logs.isEmpty());
+
+ LOG.info("Test Message");
+ assertEquals(1, logs.size());
+
+ } finally {
+ custom.finished();
+ }
+ }
+
+
+ @Test
+ public void testContainsMatch() {
+ LogCustomizer custom = LogCustomizer
+
.forLogger("org.apache.jackrabbit.oak.commons.junit.LogCustomizerTest")
+ .contains("Test Message")
+ .create();
+
+ try {
+ custom.starting();
+ LOG.info("test message");
+ LOG.info("test message 1");
+ LOG.info("1 test message");
+
+ List<String> logs = custom.getLogs();
+ assertTrue(logs.isEmpty());
+
+ LOG.info("Test Message");
+ assertEquals(1, logs.size());
+
+ LOG.info("1Test Message");
+ LOG.info("1Test Message2");
+ LOG.info("1 Test Message");
+ assertEquals(4, logs.size());
+
+ } finally {
+ custom.finished();
+ }
+ }
+
+
+ @Test
+ public void testRegexMatch() {
+ LogCustomizer custom = LogCustomizer
+
.forLogger("org.apache.jackrabbit.oak.commons.junit.LogCustomizerTest")
+ .matchesRegex("^Length is [0-9]* units.$")
+ .create();
+
+ try {
+ custom.starting();
+ LOG.info("test message");
+ LOG.info("test message 1");
+ LOG.info("1 test message");
+ LOG.info("1 Length is 10 units.");
+ LOG.info("Length is 10 units.1");
+ LOG.info("Length is abc units.");
+
+ List<String> logs = custom.getLogs();
+ assertTrue(logs.isEmpty());
+
+ LOG.info("Length is 1 units.");
+ LOG.info("Length is 20 units.");
+ LOG.info("Length is units.");
+ assertEquals(3, logs.size());
+
+ } finally {
+ custom.finished();
}
}
