From e7cca176e589b9102cf43365f2bca3d356fb29aa Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 6 Nov 2018 16:58:30 -0800
Subject: [PATCH] Reorganize source code in preparation to move into
 aspnet/Extensions

Prior to reorganization, this source code was found in https://github.com/aspnet/Logging/tree/f7d8e4e0537eaab54dcf28c2b148b82688a3d62d
---
 src/Testing/src/LoggedTest/LoggedTestBase.cs |  4 +-
 src/Testing/test/LoggedTestXunitTests.cs     | 46 +++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/Testing/src/LoggedTest/LoggedTestBase.cs b/src/Testing/src/LoggedTest/LoggedTestBase.cs
index f714a632a4..c3a4e78931 100644
--- a/src/Testing/src/LoggedTest/LoggedTestBase.cs
+++ b/src/Testing/src/LoggedTest/LoggedTestBase.cs
@@ -51,7 +51,9 @@ namespace Microsoft.Extensions.Logging.Testing
             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>()
diff --git a/src/Testing/test/LoggedTestXunitTests.cs b/src/Testing/test/LoggedTestXunitTests.cs
index d1d8581193..507453a242 100644
--- a/src/Testing/test/LoggedTestXunitTests.cs
+++ b/src/Testing/test/LoggedTestXunitTests.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
@@ -9,6 +10,7 @@ using Xunit.Abstractions;
 
 namespace Microsoft.Extensions.Logging.Testing.Tests
 {
+    [LogLevel(LogLevel.Debug)]
     [ShortClassName]
     public class LoggedTestXunitTests : TestLoggedTest
     {
@@ -75,7 +77,7 @@ namespace Microsoft.Extensions.Logging.Testing.Tests
 
         [Fact]
         [LogLevel(LogLevel.Information)]
-        public void LoggedFactFilteredByLogLevel()
+        public void LoggedFactFilteredByMethodLogLevel()
         {
             Logger.LogInformation("Information");
             Logger.LogDebug("Debug");
@@ -85,6 +87,17 @@ namespace Microsoft.Extensions.Logging.Testing.Tests
             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)]
@@ -129,6 +142,37 @@ namespace Microsoft.Extensions.Logging.Testing.Tests
         {
             Assert.True(SetupInvoked);
         }
+
+        [Fact]
+        public void MessageWrittenEventInvoked()
+        {
+            WriteContext context = null;
+            TestSink.MessageLogged += ctx => context = ctx;
+            Logger.LogInformation("Information");
+            Assert.Equal(TestSink.Writes.Single(), context);
+        }
+
+        [Fact]
+        public void ScopeStartedEventInvoked()
+        {
+            BeginScopeContext context = null;
+            TestSink.ScopeStarted += ctx => context = ctx;
+            using (Logger.BeginScope("Scope")) {}
+            Assert.Equal(TestSink.Scopes.Single(), context);
+        }
+    }
+
+    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