Author: davsclaus
Date: Tue Nov 22 12:31:45 2011
New Revision: 1204955
URL: http://svn.apache.org/viewvc?rev=1204955&view=rev
Log:
CAMEL-4607: Added support for sl4j Marker to log DSL. Thanks to Taariq for the
patch.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java?rev=1204955&r1=1204954&r2=1204955&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
Tue Nov 22 12:31:45 2011
@@ -20,6 +20,7 @@ import junit.framework.TestCase;
import org.apache.camel.util.CamelLogger;
import org.easymock.EasyMock;
import org.slf4j.Logger;
+import org.slf4j.Marker;
public class ThroughPutLoggerTest extends TestCase {
@@ -27,9 +28,9 @@ public class ThroughPutLoggerTest extend
Logger logger = EasyMock.createMock(Logger.class);
logger.isInfoEnabled();
EasyMock.expectLastCall().andReturn(true).atLeastOnce();
- logger.info(EasyMock.startsWith("Received: 10"));
+ logger.info(EasyMock.<Marker>isNull(), EasyMock.startsWith("Received:
10"));
EasyMock.expectLastCall().once();
- logger.info(EasyMock.startsWith("Received: 20"));
+ logger.info(EasyMock.<Marker>isNull(), EasyMock.startsWith("Received:
20"));
EasyMock.expectLastCall().once();
EasyMock.replay(logger);
ThroughputLogger underTest = new ThroughputLogger(new
CamelLogger(logger));