Allow setting default log levels in TestLoggerOptions

Author: ejsmith

src/Foundatio.Xunit/Logging/TestLogger.cs

@@ -17,6 +17,9 @@ public TestLogger(Action<TestLoggerOptions> configure = null)
     {
         Options = new TestLoggerOptions();
         configure?.Invoke(Options);
+
+        foreach (var logLevel in Options.LogLevels)
+            _logLevels[logLevel.Key] = logLevel.Value;
     }
 
     public TestLogger(ITestOutputHelper output, Action<TestLoggerOptions> configure = null)
@@ -30,26 +33,26 @@ public TestLogger(ITestOutputHelper output, Action<TestLoggerOptions> configure
         };
 
         configure?.Invoke(Options);
+
+        foreach (var logLevel in Options.LogLevels)
+            _logLevels[logLevel.Key] = logLevel.Value;
     }
 
     public TestLogger(TestLoggerOptions options)
     {
         Options = options ?? new TestLoggerOptions();
-    }
 
-    public TestLoggerOptions Options { get; }
+        foreach (var logLevel in Options.LogLevels)
+            _logLevels[logLevel.Key] = logLevel.Value;
 
-    [Obsolete("Use DefaultMinimumLevel instead.")]
-    public LogLevel MinimumLevel
-    {
-        get => Options.DefaultMinimumLevel;
-        set => Options.DefaultMinimumLevel = value;
     }
 
+    public TestLoggerOptions Options { get; }
+
     public LogLevel DefaultMinimumLevel
     {
-        get => Options.DefaultMinimumLevel;
-        set => Options.DefaultMinimumLevel = value;
+        get => Options.DefaultLogLevel;
+        set => Options.DefaultLogLevel = value;
     }
 
     public int MaxLogEntriesToStore
@@ -66,13 +69,16 @@ public int MaxLogEntriesToWrite
 
     public IReadOnlyList<LogEntry> LogEntries => _logEntries.ToArray();
 
-
     public void Reset()
     {
         lock (_logEntries)
         {
             _logEntries.Clear();
             _logLevels.Clear();
+
+            foreach (var logLevel in Options.LogLevels)
+                _logLevels[logLevel.Key] = logLevel.Value;
+
             Interlocked.Exchange(ref _logEntriesWritten, 0);
         }
     }
@@ -113,7 +119,7 @@ public bool IsEnabled(string category, LogLevel logLevel)
         if (_logLevels.TryGetValue(category, out var categoryLevel))
             return logLevel >= categoryLevel;
 
-        return logLevel >= Options.DefaultMinimumLevel;
+        return logLevel >= Options.DefaultLogLevel;
     }
 
     public void SetLogLevel(string category, LogLevel minLogLevel)

src/Foundatio.Xunit/Logging/TestLoggerLogger.cs

@@ -24,7 +24,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
         if (!_logger.IsEnabled(_categoryName, logLevel))
             return;
 
-        object[] scopes = _logger.Options.IncludeScopes ? CurrentScopeStack.Reverse().ToArray() : Array.Empty<object>();
+        object[] scopes = _logger.Options.IncludeScopes ? CurrentScopeStack.Reverse().ToArray() : [];
         var logEntry = new LogEntry
         {
             Date = _logger.Options.GetNow(),

src/Foundatio.Xunit/Logging/TestLoggerOptions.cs

@@ -1,17 +1,30 @@
 using System;
+using System.Collections.Generic;
+using Foundatio.Utility;
 using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
 
 namespace Foundatio.Xunit;
 
 public class TestLoggerOptions
 {
-    public LogLevel DefaultMinimumLevel { get; set; } = LogLevel.Information;
+    public LogLevel DefaultLogLevel { get; set; } = LogLevel.Information;
+    public Dictionary<string, LogLevel> LogLevels { get; } = new();
     public int MaxLogEntriesToStore { get; set; } = 100;
     public int MaxLogEntriesToWrite { get; set; } = 1000;
     public bool IncludeScopes { get; set; } = true;
     public TimeProvider TimeProvider { get; set; } = TimeProvider.System;
 
+    public void SetLogLevel(string category, LogLevel minLogLevel)
+    {
+        LogLevels[category] = minLogLevel;
+    }
+
+    public void SetLogLevel<T>(LogLevel minLogLevel)
+    {
+        SetLogLevel(TypeHelper.GetTypeDisplayName(typeof(T)), minLogLevel);
+    }
+
     public void UseOutputHelper(Func<ITestOutputHelper> getOutputHelper, Func<LogEntry, string> formatLogEntry = null)
     {
         formatLogEntry ??= logEntry => logEntry.ToString(false);

tests/Foundatio.Tests/Utility/TestLoggerTests.cs

@@ -22,7 +22,10 @@ public TestLoggerTests(ITestOutputHelper output, TestLoggerFixture fixture) : ba
     public void CanUseTestLogger()
     {
         var services = new ServiceCollection()
-            .AddLogging(b => b.AddDebug().AddTestLogger(_output))
+            .AddLogging(b => b.AddDebug().AddTestLogger(_output, o =>
+            {
+                o.SetLogLevel("Microsoft", LogLevel.Warning);
+            }))
             .AddSingleton<SomeClass>();
 
         IServiceProvider provider = services.BuildServiceProvider();