Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1349-gcfree-threadcontext 5edcfe823 -> 7994789d2
Use apply in Logger trait Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8abe19e0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8abe19e0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8abe19e0 Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: 8abe19e0b41e865091655b30028ff397018402d0 Parents: f4f6aa2 Author: Mikael Ståldal <mik...@staldal.nu> Authored: Sun Jun 26 20:10:47 2016 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Sun Jun 26 20:10:47 2016 +0200 ---------------------------------------------------------------------- .../org/apache/logging/log4j/scala/Logger.scala | 26 +-- .../apache/logging/log4j/scala/LoggerTest.scala | 166 +++++++++---------- .../org/apache/logging/log4j/scala/Logger.scala | 24 +-- .../apache/logging/log4j/scala/LoggerTest.scala | 166 +++++++++---------- 4 files changed, 191 insertions(+), 191 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8abe19e0/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 16156f4..c91d347 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 @@ -54,7 +54,7 @@ object Logger { * to achieve this: * * {{{ - * logger.debug(s"Logging in user ${user.getName} with birthday ${user.calcBrithday}") + * logger.debug(s"Logging in user ${user.getName} with birthday ${user.calcBirthday}") * }}} * * Since this wrapper is implemented with macros, the String construction and method invocations @@ -294,7 +294,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param marker the marker data specific to this log statement * @param message the message to be logged */ - def log(level: Level, marker: Marker, message: Message): Unit = + def apply(level: Level, marker: Marker, message: Message): Unit = macro LoggerMacro.logMarkerMsg /** @@ -304,7 +304,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param marker the marker data specific to this log statement * @param message the message to be logged */ - def log(level: Level, marker: Marker, message: CharSequence): Unit = + def apply(level: Level, marker: Marker, message: CharSequence): Unit = macro LoggerMacro.logMarkerCseq /** @@ -314,7 +314,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param marker the marker data specific to this log statement * @param message the message to be logged */ - def log(level: Level, marker: Marker, message: AnyRef): Unit = + def apply(level: Level, marker: Marker, message: AnyRef): Unit = macro LoggerMacro.logMarkerObject /** @@ -326,7 +326,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause the cause */ - def log(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = + def apply(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.logMarkerMsgThrowable /** @@ -338,7 +338,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause the cause */ - def log(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = + def apply(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.logMarkerCseqThrowable /** @@ -350,7 +350,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause the cause */ - def log(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = + def apply(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = macro LoggerMacro.logMarkerObjectThrowable /** @@ -359,7 +359,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param level the logging level * @param message the message to be logged */ - def log(level: Level, message: Message): Unit = + def apply(level: Level, message: Message): Unit = macro LoggerMacro.logMsg /** @@ -368,7 +368,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param level the logging level * @param message the message to be logged */ - def log(level: Level, message: CharSequence): Unit = + def apply(level: Level, message: CharSequence): Unit = macro LoggerMacro.logCseq /** @@ -377,7 +377,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param level the logging level * @param message the message to be logged */ - def log(level: Level, message: AnyRef): Unit = + def apply(level: Level, message: AnyRef): Unit = macro LoggerMacro.logObject /** @@ -387,7 +387,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause a [[Throwable]] */ - def log(level: Level, message: Message, cause: Throwable): Unit = + def apply(level: Level, message: Message, cause: Throwable): Unit = macro LoggerMacro.logMsgThrowable /** @@ -397,7 +397,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause a [[Throwable]] */ - def log(level: Level, message: CharSequence, cause: Throwable): Unit = + def apply(level: Level, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.logCseqThrowable /** @@ -407,7 +407,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause a [[Throwable]] */ - def log(level: Level, message: AnyRef, cause: Throwable): Unit = + def apply(level: Level, message: AnyRef, cause: Throwable): Unit = macro LoggerMacro.logObjectThrowable http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8abe19e0/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 3bd4b49..6595128 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 @@ -59,7 +59,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("fatal enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.FATAL)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.fatal(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.FATAL), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -68,7 +68,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("fatal disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.FATAL)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.fatal(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -77,7 +77,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("error enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.ERROR)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.error(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.ERROR), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -86,7 +86,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("error disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.ERROR)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.error(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -95,7 +95,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("warn enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.WARN)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.warn(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.WARN), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -104,7 +104,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("warn disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.WARN)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.warn(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -113,7 +113,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("info enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.info(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -122,7 +122,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("info disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.info(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -131,7 +131,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("debug enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.DEBUG)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.debug(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.DEBUG), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -140,7 +140,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("debug disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.DEBUG)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.debug(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -149,7 +149,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("trace enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.trace(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.TRACE), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -158,7 +158,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("trace disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.trace(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -168,24 +168,24 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with Message message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, msg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, msg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), eqv(msg), eqv(null)) } test("log disabled with Message message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, msg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, msg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with String message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}") + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(null)) verify(f.manager).fetchValue() } @@ -193,8 +193,8 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log disabled with String message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}") + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() } @@ -202,56 +202,56 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with CharSequence message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, cseqMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, cseqMsg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(null)) } test("log disabled with CharSequence message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, cseqMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, cseqMsg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Object message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, objectMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, objectMsg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(null)) } test("log disabled with Object message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, objectMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, objectMsg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Message message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, msg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, msg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), eqv(msg), eqv(cause)) } test("log disabled with Message message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, msg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, msg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with String message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause)) verify(f.manager).fetchValue() } @@ -259,8 +259,8 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log disabled with String message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() } @@ -268,56 +268,56 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with CharSequence message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, cseqMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, cseqMsg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause)) } test("log disabled with CharSequence message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, cseqMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, cseqMsg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Object message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, objectMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, objectMsg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause)) } test("log disabled with Object message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, objectMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, objectMsg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Message message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, msg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, msg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), eqv(msg), eqv(null)) } test("log disabled with Message message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, msg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, msg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}") + val logger = Logger(f.mockLogger) + logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() } @@ -325,8 +325,8 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}") + val logger = Logger(f.mockLogger) + logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() } @@ -334,56 +334,56 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with CharSequence message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, cseqMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, cseqMsg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) } test("log disabled with CharSequence message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, cseqMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, cseqMsg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Object message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, objectMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, objectMsg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) } test("log disabled with Object message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, objectMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, objectMsg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Message message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, msg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, msg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), eqv(msg), eqv(cause)) } test("log disabled with Message message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, msg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, msg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with String message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(cause)) verify(f.manager).fetchValue() } @@ -391,8 +391,8 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log disabled with String message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() } @@ -400,32 +400,32 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with CharSequence message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, cseqMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, cseqMsg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(cause)) } test("log disabled with CharSequence message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, cseqMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, cseqMsg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Object message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, objectMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, objectMsg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(cause)) } test("log disabled with Object message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, objectMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, objectMsg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -433,7 +433,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceEntry enabled with params") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry("foo", 17) verify(f.mockLogger).traceEntry(anyString(), any[Array[AnyRef]]) } @@ -441,14 +441,14 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceEntry disabled with params") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry("foo", 17) verify(f.mockLogger, never).traceEntry(anyString(), any[Array[AnyRef]]) } test("traceEntry without params") { val f = fixture - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry() verify(f.mockLogger).traceEntry() } @@ -456,7 +456,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceEntry enabled with message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry(msg) verify(f.mockLogger).traceEntry(eqv(msg)) } @@ -464,7 +464,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceEntry disabled with message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry(msg) verify(f.mockLogger, never).traceEntry(any[Message]) } @@ -472,7 +472,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceExit enabled with message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceExit(msg, result) verify(f.mockLogger).traceExit(eqv(msg), eqv(result)) } @@ -480,7 +480,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceExit disabled with message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceExit(msg, result) verify(f.mockLogger, never).traceExit(any[Message], any[AnyRef]) } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8abe19e0/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 79ae8de..c91d347 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 @@ -294,7 +294,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param marker the marker data specific to this log statement * @param message the message to be logged */ - def log(level: Level, marker: Marker, message: Message): Unit = + def apply(level: Level, marker: Marker, message: Message): Unit = macro LoggerMacro.logMarkerMsg /** @@ -304,7 +304,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param marker the marker data specific to this log statement * @param message the message to be logged */ - def log(level: Level, marker: Marker, message: CharSequence): Unit = + def apply(level: Level, marker: Marker, message: CharSequence): Unit = macro LoggerMacro.logMarkerCseq /** @@ -314,7 +314,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param marker the marker data specific to this log statement * @param message the message to be logged */ - def log(level: Level, marker: Marker, message: AnyRef): Unit = + def apply(level: Level, marker: Marker, message: AnyRef): Unit = macro LoggerMacro.logMarkerObject /** @@ -326,7 +326,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause the cause */ - def log(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = + def apply(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.logMarkerMsgThrowable /** @@ -338,7 +338,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause the cause */ - def log(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = + def apply(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.logMarkerCseqThrowable /** @@ -350,7 +350,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause the cause */ - def log(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = + def apply(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = macro LoggerMacro.logMarkerObjectThrowable /** @@ -359,7 +359,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param level the logging level * @param message the message to be logged */ - def log(level: Level, message: Message): Unit = + def apply(level: Level, message: Message): Unit = macro LoggerMacro.logMsg /** @@ -368,7 +368,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param level the logging level * @param message the message to be logged */ - def log(level: Level, message: CharSequence): Unit = + def apply(level: Level, message: CharSequence): Unit = macro LoggerMacro.logCseq /** @@ -377,7 +377,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param level the logging level * @param message the message to be logged */ - def log(level: Level, message: AnyRef): Unit = + def apply(level: Level, message: AnyRef): Unit = macro LoggerMacro.logObject /** @@ -387,7 +387,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause a [[Throwable]] */ - def log(level: Level, message: Message, cause: Throwable): Unit = + def apply(level: Level, message: Message, cause: Throwable): Unit = macro LoggerMacro.logMsgThrowable /** @@ -397,7 +397,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause a [[Throwable]] */ - def log(level: Level, message: CharSequence, cause: Throwable): Unit = + def apply(level: Level, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.logCseqThrowable /** @@ -407,7 +407,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param message the message to be logged * @param cause a [[Throwable]] */ - def log(level: Level, message: AnyRef, cause: Throwable): Unit = + def apply(level: Level, message: AnyRef, cause: Throwable): Unit = macro LoggerMacro.logObjectThrowable http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8abe19e0/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 3bd4b49..6595128 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 @@ -59,7 +59,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("fatal enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.FATAL)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.fatal(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.FATAL), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -68,7 +68,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("fatal disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.FATAL)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.fatal(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -77,7 +77,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("error enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.ERROR)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.error(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.ERROR), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -86,7 +86,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("error disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.ERROR)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.error(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -95,7 +95,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("warn enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.WARN)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.warn(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.WARN), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -104,7 +104,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("warn disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.WARN)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.warn(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -113,7 +113,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("info enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.info(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -122,7 +122,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("info disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.info(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -131,7 +131,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("debug enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.DEBUG)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.debug(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.DEBUG), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -140,7 +140,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("debug disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.DEBUG)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.debug(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -149,7 +149,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("trace enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.trace(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.TRACE), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() @@ -158,7 +158,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("trace disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.trace(s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() @@ -168,24 +168,24 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with Message message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, msg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, msg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), eqv(msg), eqv(null)) } test("log disabled with Message message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, msg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, msg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with String message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}") + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(null)) verify(f.manager).fetchValue() } @@ -193,8 +193,8 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log disabled with String message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}") + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() } @@ -202,56 +202,56 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with CharSequence message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, cseqMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, cseqMsg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(null)) } test("log disabled with CharSequence message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, cseqMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, cseqMsg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Object message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, objectMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, objectMsg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(null)) } test("log disabled with Object message and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, objectMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, objectMsg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Message message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, msg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, msg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), eqv(msg), eqv(cause)) } test("log disabled with Message message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, msg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, msg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with String message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause)) verify(f.manager).fetchValue() } @@ -259,8 +259,8 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log disabled with String message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() } @@ -268,56 +268,56 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with CharSequence message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, cseqMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, cseqMsg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause)) } test("log disabled with CharSequence message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, cseqMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, cseqMsg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Object message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, objectMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, objectMsg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause)) } test("log disabled with Object message and cause and Marker") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, marker, objectMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, marker, objectMsg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Message message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, msg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, msg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), eqv(msg), eqv(null)) } test("log disabled with Message message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, msg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, msg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}") + val logger = Logger(f.mockLogger) + logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) verify(f.manager).fetchValue() } @@ -325,8 +325,8 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log disabled with String message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}") + val logger = Logger(f.mockLogger) + logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}") verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() } @@ -334,56 +334,56 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with CharSequence message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, cseqMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, cseqMsg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) } test("log disabled with CharSequence message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, cseqMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, cseqMsg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Object message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, objectMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, objectMsg) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(null)) } test("log disabled with Object message") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, objectMsg) + val logger = Logger(f.mockLogger) + logger(Level.INFO, objectMsg) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Message message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, msg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, msg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), eqv(msg), eqv(cause)) } test("log disabled with Message message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, msg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, msg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with String message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(cause)) verify(f.manager).fetchValue() } @@ -391,8 +391,8 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log disabled with String message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) verify(f.manager, never).fetchValue() } @@ -400,32 +400,32 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("log enabled with CharSequence message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, cseqMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, cseqMsg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(cause)) } test("log disabled with CharSequence message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, cseqMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, cseqMsg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } test("log enabled with Object message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, objectMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, objectMsg, cause) verify(f.mockLogger).logMessage(anyString(), eqv(Level.INFO), eqv(null), any[Message], eqv(cause)) } test("log disabled with Object message and cause") { val f = fixture when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false) - val logger = new Logger(f.mockLogger) - logger.log(Level.INFO, objectMsg, cause) + val logger = Logger(f.mockLogger) + logger(Level.INFO, objectMsg, cause) verify(f.mockLogger, never).logMessage(anyString(), any[Level], any[Marker], any[Message], any[Throwable]) } @@ -433,7 +433,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceEntry enabled with params") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry("foo", 17) verify(f.mockLogger).traceEntry(anyString(), any[Array[AnyRef]]) } @@ -441,14 +441,14 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceEntry disabled with params") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry("foo", 17) verify(f.mockLogger, never).traceEntry(anyString(), any[Array[AnyRef]]) } test("traceEntry without params") { val f = fixture - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry() verify(f.mockLogger).traceEntry() } @@ -456,7 +456,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceEntry enabled with message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry(msg) verify(f.mockLogger).traceEntry(eqv(msg)) } @@ -464,7 +464,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceEntry disabled with message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceEntry(msg) verify(f.mockLogger, never).traceEntry(any[Message]) } @@ -472,7 +472,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceExit enabled with message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceExit(msg, result) verify(f.mockLogger).traceExit(eqv(msg), eqv(result)) } @@ -480,7 +480,7 @@ class LoggerTest extends FunSuite with Matchers with MockitoSugar { test("traceExit disabled with message") { val f = fixture when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false) - val logger = new Logger(f.mockLogger) + val logger = Logger(f.mockLogger) logger.traceExit(msg, result) verify(f.mockLogger, never).traceExit(any[Message], any[AnyRef]) }