Make LogLevelAttribute applicable to classes and assemblies

Author: John Luo

src/Microsoft.Extensions.Logging.Testing/LoggedTest/LoggedTestBase.cs

@@ -51,7 +51,9 @@ public virtual void Initialize(MethodInfo methodInfo, object[] testMethodArgumen
             TestOutputHelper = testOutputHelper;
 
             var classType = GetType();
-            var logLevelAttribute = methodInfo.GetCustomAttribute<LogLevelAttribute>();
+            var logLevelAttribute = methodInfo.GetCustomAttribute<LogLevelAttribute>()
+                ?? methodInfo.DeclaringType.GetCustomAttribute<LogLevelAttribute>()
+                ?? methodInfo.DeclaringType.Assembly.GetCustomAttribute<LogLevelAttribute>();
             var testName = testMethodArguments.Aggregate(methodInfo.Name, (a, b) => $"{a}-{(b ?? "null")}");
 
             var useShortClassName = methodInfo.DeclaringType.GetCustomAttribute<ShortClassNameAttribute>()

src/Microsoft.Extensions.Logging.Testing/Xunit/LogLevelAttribute.cs

@@ -5,7 +5,7 @@
 
 namespace Microsoft.Extensions.Logging.Testing
 {
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly, AllowMultiple = false)]
     public class LogLevelAttribute : Attribute
     {
         public LogLevelAttribute(LogLevel logLevel)

test/Microsoft.Extensions.Logging.Testing.Tests/LoggedTestXunitTests.cs

@@ -10,6 +10,7 @@
 
 namespace Microsoft.Extensions.Logging.Testing.Tests
 {
+    [LogLevel(LogLevel.Debug)]
     [ShortClassName]
     public class LoggedTestXunitTests : TestLoggedTest
     {
@@ -76,7 +77,7 @@ public void LoggedConditionalTheoryInitializesLoggedTestProperties(string argume
 
         [Fact]
         [LogLevel(LogLevel.Information)]
-        public void LoggedFactFilteredByLogLevel()
+        public void LoggedFactFilteredByMethodLogLevel()
         {
             Logger.LogInformation("Information");
             Logger.LogDebug("Debug");
@@ -86,6 +87,17 @@ public void LoggedFactFilteredByLogLevel()
             Assert.Equal("Information", message.Formatter(message.State, null));
         }
 
+        [Fact]
+        public void LoggedFactFilteredByClassLogLevel()
+        {
+            Logger.LogDebug("Debug");
+            Logger.LogTrace("Trace");
+
+            var message = Assert.Single(TestSink.Writes);
+            Assert.Equal(LogLevel.Debug, message.LogLevel);
+            Assert.Equal("Debug", message.Formatter(message.State, null));
+        }
+
         [Theory]
         [InlineData("Hello world")]
         [LogLevel(LogLevel.Information)]
@@ -150,6 +162,19 @@ public void ScopeStartedEventInvoked()
         }
     }
 
+    public class LoggedTestXunitLogLevelTests : LoggedTest
+    {
+        [Fact]
+        public void LoggedFactFilteredByAssemblyLogLevel()
+        {
+            Logger.LogTrace("Trace");
+
+            var message = Assert.Single(TestSink.Writes);
+            Assert.Equal(LogLevel.Trace, message.LogLevel);
+            Assert.Equal("Trace", message.Formatter(message.State, null));
+        }
+    }
+
     public class LoggedTestXunitInitializationTests : TestLoggedTest
     {
         [Fact]

test/Microsoft.Extensions.Logging.Testing.Tests/Properties/AssemlyInfo.cs

@@ -0,0 +1,4 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Testing;
+
+[assembly: LogLevel(LogLevel.Trace)]