diff options
| author | Jim Lawson | 2020-01-10 16:33:05 -0800 |
|---|---|---|
| committer | GitHub | 2020-01-10 16:33:05 -0800 |
| commit | 16acdc39291b8e35548e22ebaabb036da847de37 (patch) | |
| tree | 0c7df1023160dc84bd1b25ea48f0f23697bf459b /src/test | |
| parent | 9102d147eca32d5ac99abba2c2affd8e9fe8492b (diff) | |
Change LoggerState.globalLevel to Warn (#1307)
* Change LoggerState.globalLevel to Warn
PR #1305 changes the `globalLogLevel` in `LogLevelAnnotation` to from `None` to `Warn`. Update the default `LoggerState.globalLevel` to `Warn` as well.
* Update LoggerSpec tests to match globalLogLevel of Warn
* Add test of behavior for LogLevel.None
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/scala/loggertests/LoggerSpec.scala | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/src/test/scala/loggertests/LoggerSpec.scala b/src/test/scala/loggertests/LoggerSpec.scala index 0a9aaa51..06076fab 100644 --- a/src/test/scala/loggertests/LoggerSpec.scala +++ b/src/test/scala/loggertests/LoggerSpec.scala @@ -12,6 +12,7 @@ object LoggerSpec { val InfoMsg = "message info" val DebugMsg = "message debug" val TraceMsg = "message trace" + val globalLevel = LogLevel.Warn } class Logger1 extends LazyLogging { @@ -37,10 +38,12 @@ class LogsInfo3 extends LazyLogging { class LoggerSpec extends FreeSpec with Matchers with OneInstancePerTest with LazyLogging { "Logger is a simple but powerful logging system" - { "Following tests show how global level can control logging" - { - "only error shows up by default" in { + + "setting level to None will result in only error messages" in { Logger.makeScope() { val captor = new OutputCaptor Logger.setOutput(captor.printStream) + Logger.setLevel(LogLevel.None) val r1 = new Logger1 r1.run() @@ -54,6 +57,23 @@ class LoggerSpec extends FreeSpec with Matchers with OneInstancePerTest with Laz } } + "only warn and error shows up by default" in { + Logger.makeScope() { + val captor = new OutputCaptor + Logger.setOutput(captor.printStream) + + val r1 = new Logger1 + r1.run() + val messagesLogged = captor.getOutputAsString + + messagesLogged.contains(LoggerSpec.ErrorMsg) should be(true) + messagesLogged.contains(LoggerSpec.WarnMsg) should be(LogLevel.Warn <= LoggerSpec.globalLevel) + messagesLogged.contains(LoggerSpec.InfoMsg) should be(LogLevel.Info <= LoggerSpec.globalLevel) + messagesLogged.contains(LoggerSpec.DebugMsg) should be(LogLevel.Debug <= LoggerSpec.globalLevel) + messagesLogged.contains(LoggerSpec.TraceMsg) should be(LogLevel.Trace <= LoggerSpec.globalLevel) + } + } + "setting level to warn will result in error and warn messages" in { Logger.makeScope() { val captor = new OutputCaptor @@ -285,7 +305,7 @@ class LoggerSpec extends FreeSpec with Matchers with OneInstancePerTest with Laz } } "Show that nested makeScopes share same state" in { - Logger.getGlobalLevel should be (LogLevel.None) + Logger.getGlobalLevel should be (LoggerSpec.globalLevel) Logger.makeScope() { Logger.setLevel(LogLevel.Info) @@ -304,17 +324,17 @@ class LoggerSpec extends FreeSpec with Matchers with OneInstancePerTest with Laz Logger.getGlobalLevel should be (LogLevel.Debug) } - Logger.getGlobalLevel should be (LogLevel.None) + Logger.getGlobalLevel should be (LoggerSpec.globalLevel) } "Show that first makeScope starts with fresh state" in { - Logger.getGlobalLevel should be (LogLevel.None) + Logger.getGlobalLevel should be (LoggerSpec.globalLevel) Logger.setLevel(LogLevel.Warn) Logger.getGlobalLevel should be (LogLevel.Warn) Logger.makeScope() { - Logger.getGlobalLevel should be (LogLevel.None) + Logger.getGlobalLevel should be (LoggerSpec.globalLevel) Logger.setLevel(LogLevel.Trace) Logger.getGlobalLevel should be (LogLevel.Trace) |
