From 8b5a8c5d35032c3e3784e3d7e9639784584b0790 Mon Sep 17 00:00:00 2001
From: Rolf Kristensen <sweaty1@hotmail.com>
Date: Tue, 29 Dec 2020 02:19:02 +0100
Subject: [PATCH] Added unit-test for
 NLogProviderOptions.IncludeActivtyIdsWithBeginScope

---
 .../Extensions/ConfigureExtensionsTests.cs    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/test/NLog.Extensions.Logging.Tests/Extensions/ConfigureExtensionsTests.cs b/test/NLog.Extensions.Logging.Tests/Extensions/ConfigureExtensionsTests.cs
index b00564c1..8056fd0b 100644
--- a/test/NLog.Extensions.Logging.Tests/Extensions/ConfigureExtensionsTests.cs
+++ b/test/NLog.Extensions.Logging.Tests/Extensions/ConfigureExtensionsTests.cs
@@ -6,6 +6,7 @@
 using NLog.Targets;
 using Xunit;
 using Microsoft.Extensions.DependencyInjection;
+using System.Collections.Generic;
 
 namespace NLog.Extensions.Logging.Tests.Extensions
 {
@@ -50,6 +51,30 @@ public void AddNLog_LoggerFactory_LogInfoWithEventId_ShouldLogToNLogWithEventId(
             AssertSingleMessage(memoryTarget, $"{expectedEventInLog} - test message with 1 arg");
         }
 
+#if NET5_0
+        [Fact]
+        public void AddNLog_LoggerFactory_IncludeActivtyIdsWithBeginScope()
+        {
+            // Arrange
+            var loggerFactory = new LoggerFactory();
+            var config = CreateConfigWithMemoryTarget(out var memoryTarget, $"${{mdlc:ParentId}} - ${{message}}");
+
+            // Act
+            loggerFactory.AddNLog(new NLogProviderOptions { IncludeActivtyIdsWithBeginScope = true });
+            LogManager.Configuration = config;
+            var logger = loggerFactory.CreateLogger(nameof(AddNLog_LoggerFactory_IncludeActivtyIdsWithBeginScope));
+            var activity = new System.Diagnostics.Activity("TestActivity").SetParentId("42").Start();
+            var scopeProperties = new Dictionary<string, object> { { "RequestId", "123" }, { "RequestPath", "Unknown" } };
+            using (logger.BeginScope(scopeProperties.ToList()))
+            {
+                logger.LogInformation(default(EventId), "test message with {0} arg", 1);
+            }
+
+            // Assert
+            AssertSingleMessage(memoryTarget, "42 - test message with 1 arg");
+        }
+#endif
+
 #if !NETCOREAPP1_1 && !NET452
         [Fact]
         public void AddNLog_LoggingBuilder_LogInfo_ShouldLogToNLog()