You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ca...@apache.org on 2017/02/15 16:00:04 UTC
svn commit: r1783116 - in /jackrabbit/oak/branches/1.4: ./
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java
Author: catholicon
Date: Wed Feb 15 16:00:04 2017
New Revision: 1783116
URL: http://svn.apache.org/viewvc?rev=1783116&view=rev
Log:
OAK-5663: Improve LogCutomizer to allow filtering on log messages too (backported r1783089 from trunk)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 15 16:00:04 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457
,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767704,1768446,1768637,1769078,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773190,1774497,1775474,1775622,1775628,1775757,1778423,1778968,1779478,1780388,1780538,1780543,1781068,1781075,1781
386,1781846,1781907
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457
,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767704,1768446,1768637,1769078,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773190,1774497,1775474,1775622,1775628,1775757,1778423,1778968,1779478,1780388,1780538,1780543,1781068,1781075,1781
386,1781846,1781907,1783089
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java?rev=1783116&r1=1783115&r2=1783116&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java (original)
+++ jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java Wed Feb 15 16:00:04 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.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java?rev=1783116&r1=1783115&r2=1783116&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java Wed Feb 15 16:00:04 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();
}
}