Optimize CharSequence processing for Scala Logger API
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3dadd5f7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3dadd5f7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3dadd5f7 Branch: refs/heads/LOG4J-1181 Commit: 3dadd5f74d0d2e41a4074f50537e577e4932dbcb Parents: e9c36d7 Author: Mikael Ståldal <[email protected]> Authored: Sun Jun 12 13:54:59 2016 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Sun Jun 12 13:54:59 2016 +0200 ---------------------------------------------------------------------- .../org/apache/logging/log4j/scala/Logger.scala | 8 ++-- .../apache/logging/log4j/scala/LoggerTest.scala | 46 +++++++++++--------- .../org/apache/logging/log4j/scala/Logger.scala | 8 ++-- .../apache/logging/log4j/scala/LoggerTest.scala | 46 +++++++++++--------- 4 files changed, 58 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3dadd5f7/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala index a27c1fe..1453841 100644 --- a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala +++ b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.scala -import org.apache.logging.log4j.message.{Message, MessageFactory} +import org.apache.logging.log4j.message.{Message, MessageFactory2} import org.apache.logging.log4j.spi.ExtendedLogger import org.apache.logging.log4j.{Level, Marker} @@ -310,7 +310,7 @@ class Logger(val delegate: ExtendedLogger) { def name: String = delegate.getName - def messageFactory: MessageFactory = delegate.getMessageFactory + def messageFactory: MessageFactory2 = delegate.getMessageFactory.asInstanceOf[MessageFactory2] /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified * level is enabled. @@ -337,7 +337,7 @@ class Logger(val delegate: ExtendedLogger) { * @param cause cause or `null` */ def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = { - delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.newMessage(message), cause) + delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause) } /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified @@ -351,7 +351,7 @@ class Logger(val delegate: ExtendedLogger) { * @param cause cause or `null` */ def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = { - delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.newMessage(message), cause) + delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause) } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3dadd5f7/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala index 75d0a13..a63d7f9 100644 --- a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala +++ b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala @@ -32,7 +32,11 @@ case class Custom(i: Int) class LoggerTest extends FunSuite with Matchers with MockitoSugar { val msg = new ParameterizedMessage("msg {}", 17) - val stringMsg = "string msg" + val cseqMsg = { + val sb = new StringBuilder() + sb.append("cseq msg") + sb + } val objectMsg = Custom(17) val cause = new RuntimeException("cause") val marker = MarkerManager.getMarker("marker") @@ -41,7 +45,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.FATAL)).thenReturn(true) val logger = new Logger(mockLogger) - logger.fatal(stringMsg) + logger.fatal(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.FATAL), eqv(null), any[Message], eqv(null)) } @@ -49,7 +53,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.FATAL)).thenReturn(false) val logger = new Logger(mockLogger) - logger.fatal(stringMsg) + logger.fatal(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -57,7 +61,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.ERROR)).thenReturn(true) val logger = new Logger(mockLogger) - logger.error(stringMsg) + logger.error(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.ERROR), eqv(null), any[Message], eqv(null)) } @@ -65,7 +69,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.ERROR)).thenReturn(false) val logger = new Logger(mockLogger) - logger.error(stringMsg) + logger.error(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -73,7 +77,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.WARN)).thenReturn(true) val logger = new Logger(mockLogger) - logger.warn(stringMsg) + logger.warn(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.WARN), eqv(null), any[Message], eqv(null)) } @@ -81,7 +85,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.WARN)).thenReturn(false) val logger = new Logger(mockLogger) - logger.warn(stringMsg) + logger.warn(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -89,7 +93,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(true) val logger = new Logger(mockLogger) - logger.info(stringMsg) + logger.info(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) } @@ -97,7 +101,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(false) val logger = new Logger(mockLogger) - logger.info(stringMsg) + logger.info(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -105,7 +109,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.DEBUG)).thenReturn(true) val logger = new Logger(mockLogger) - logger.debug(stringMsg) + logger.debug(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.DEBUG), eqv(null), any[Message], eqv(null)) } @@ -113,7 +117,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.DEBUG)).thenReturn(false) val logger = new Logger(mockLogger) - logger.debug(stringMsg) + logger.debug(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -121,7 +125,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.TRACE)).thenReturn(true) val logger = new Logger(mockLogger) - logger.trace(stringMsg) + logger.trace(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.TRACE), eqv(null), any[Message], eqv(null)) } @@ -129,7 +133,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.TRACE)).thenReturn(false) val logger = new Logger(mockLogger) - logger.trace(stringMsg) + logger.trace(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -154,7 +158,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) val logger = new Logger(mockLogger) - logger.log(Level.INFO, marker, stringMsg) + logger.log(Level.INFO, marker, cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(null)) } @@ -162,7 +166,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) val logger = new Logger(mockLogger) - logger.log(Level.INFO, marker, stringMsg) + logger.log(Level.INFO, marker, cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -202,7 +206,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) val logger = new Logger(mockLogger) - logger.log(Level.INFO, marker, stringMsg, cause) + logger.log(Level.INFO, marker, cseqMsg, cause) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause)) } @@ -210,7 +214,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) val logger = new Logger(mockLogger) - logger.log(Level.INFO, marker, stringMsg, cause) + logger.log(Level.INFO, marker, cseqMsg, cause) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -250,7 +254,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(true) val logger = new Logger(mockLogger) - logger.log(Level.INFO, stringMsg) + logger.log(Level.INFO, cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) } @@ -258,7 +262,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(false) val logger = new Logger(mockLogger) - logger.log(Level.INFO, stringMsg) + logger.log(Level.INFO, cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -298,7 +302,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(true) val logger = new Logger(mockLogger) - logger.log(Level.INFO, stringMsg, cause) + logger.log(Level.INFO, cseqMsg, cause) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(cause)) } @@ -306,7 +310,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(false) val logger = new Logger(mockLogger) - logger.log(Level.INFO, stringMsg, cause) + logger.log(Level.INFO, cseqMsg, cause) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3dadd5f7/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala index a27c1fe..a6a7a7c 100644 --- a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala +++ b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.scala -import org.apache.logging.log4j.message.{Message, MessageFactory} +import org.apache.logging.log4j.message.{Message, MessageFactory2} import org.apache.logging.log4j.spi.ExtendedLogger import org.apache.logging.log4j.{Level, Marker} @@ -310,7 +310,7 @@ class Logger(val delegate: ExtendedLogger) { def name: String = delegate.getName - def messageFactory: MessageFactory = delegate.getMessageFactory + def messageFactory: MessageFactory2 = delegate.getMessageFactory /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified * level is enabled. @@ -337,7 +337,7 @@ class Logger(val delegate: ExtendedLogger) { * @param cause cause or `null` */ def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = { - delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.newMessage(message), cause) + delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause) } /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified @@ -351,7 +351,7 @@ class Logger(val delegate: ExtendedLogger) { * @param cause cause or `null` */ def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = { - delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.newMessage(message), cause) + delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause) } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3dadd5f7/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala index 75d0a13..a63d7f9 100644 --- a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala +++ b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala @@ -32,7 +32,11 @@ case class Custom(i: Int) class LoggerTest extends FunSuite with Matchers with MockitoSugar { val msg = new ParameterizedMessage("msg {}", 17) - val stringMsg = "string msg" + val cseqMsg = { + val sb = new StringBuilder() + sb.append("cseq msg") + sb + } val objectMsg = Custom(17) val cause = new RuntimeException("cause") val marker = MarkerManager.getMarker("marker") @@ -41,7 +45,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.FATAL)).thenReturn(true) val logger = new Logger(mockLogger) - logger.fatal(stringMsg) + logger.fatal(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.FATAL), eqv(null), any[Message], eqv(null)) } @@ -49,7 +53,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.FATAL)).thenReturn(false) val logger = new Logger(mockLogger) - logger.fatal(stringMsg) + logger.fatal(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -57,7 +61,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.ERROR)).thenReturn(true) val logger = new Logger(mockLogger) - logger.error(stringMsg) + logger.error(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.ERROR), eqv(null), any[Message], eqv(null)) } @@ -65,7 +69,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.ERROR)).thenReturn(false) val logger = new Logger(mockLogger) - logger.error(stringMsg) + logger.error(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -73,7 +77,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.WARN)).thenReturn(true) val logger = new Logger(mockLogger) - logger.warn(stringMsg) + logger.warn(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.WARN), eqv(null), any[Message], eqv(null)) } @@ -81,7 +85,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.WARN)).thenReturn(false) val logger = new Logger(mockLogger) - logger.warn(stringMsg) + logger.warn(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -89,7 +93,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(true) val logger = new Logger(mockLogger) - logger.info(stringMsg) + logger.info(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) } @@ -97,7 +101,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(false) val logger = new Logger(mockLogger) - logger.info(stringMsg) + logger.info(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -105,7 +109,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.DEBUG)).thenReturn(true) val logger = new Logger(mockLogger) - logger.debug(stringMsg) + logger.debug(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.DEBUG), eqv(null), any[Message], eqv(null)) } @@ -113,7 +117,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.DEBUG)).thenReturn(false) val logger = new Logger(mockLogger) - logger.debug(stringMsg) + logger.debug(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -121,7 +125,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.TRACE)).thenReturn(true) val logger = new Logger(mockLogger) - logger.trace(stringMsg) + logger.trace(cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.TRACE), eqv(null), any[Message], eqv(null)) } @@ -129,7 +133,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.TRACE)).thenReturn(false) val logger = new Logger(mockLogger) - logger.trace(stringMsg) + logger.trace(cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -154,7 +158,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) val logger = new Logger(mockLogger) - logger.log(Level.INFO, marker, stringMsg) + logger.log(Level.INFO, marker, cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(null)) } @@ -162,7 +166,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) val logger = new Logger(mockLogger) - logger.log(Level.INFO, marker, stringMsg) + logger.log(Level.INFO, marker, cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -202,7 +206,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) val logger = new Logger(mockLogger) - logger.log(Level.INFO, marker, stringMsg, cause) + logger.log(Level.INFO, marker, cseqMsg, cause) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause)) } @@ -210,7 +214,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) val logger = new Logger(mockLogger) - logger.log(Level.INFO, marker, stringMsg, cause) + logger.log(Level.INFO, marker, cseqMsg, cause) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -250,7 +254,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(true) val logger = new Logger(mockLogger) - logger.log(Level.INFO, stringMsg) + logger.log(Level.INFO, cseqMsg) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) } @@ -258,7 +262,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(false) val logger = new Logger(mockLogger) - logger.log(Level.INFO, stringMsg) + logger.log(Level.INFO, cseqMsg) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -298,7 +302,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(true) val logger = new Logger(mockLogger) - logger.log(Level.INFO, stringMsg, cause) + logger.log(Level.INFO, cseqMsg, cause) verify(mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(cause)) } @@ -306,7 +310,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { val mockLogger = buildMockLogger when(mockLogger.isEnabled(Level.INFO)).thenReturn(false) val logger = new Logger(mockLogger) - logger.log(Level.INFO, stringMsg, cause) + logger.log(Level.INFO, cseqMsg, cause) verify(mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) }
