Resolve migration routine loggers from the application container

1 files changed, 54 insertions, 0 deletions

diff --git a/tests/Jellyfin.Server.Tests/ServerSetupApp/StartupLoggerTests.cs b/tests/Jellyfin.Server.Tests/ServerSetupApp/StartupLoggerTests.cs
new file mode 100644
index 0000000000..c2894e9647
--- /dev/null
+++ b/tests/Jellyfin.Server.Tests/ServerSetupApp/StartupLoggerTests.cs
@@ -0,0 +1,54 @@
+using Jellyfin.Server.ServerSetupApp;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Jellyfin.Server.Tests.ServerSetupApp;
+
+public class StartupLoggerTests
+{
+    [Fact]
+    public void BeginAmbientTopic_AttachesNewLoggersToTheTopic()
+    {
+        var migration = new StartupLogger(NullLogger.Instance).BeginGroup($"Migration");
+
+        using (StartupLogger.BeginAmbientTopic(migration.Topic))
+        {
+            Assert.Same(migration.Topic, new StartupLogger(NullLogger.Instance).Topic);
+        }
+    }
+
+    [Fact]
+    public void BeginAmbientTopic_RestoresThePreviousTopic()
+    {
+        var root = new StartupLogger(NullLogger.Instance);
+        var outer = root.BeginGroup($"Outer");
+        var inner = outer.BeginGroup($"Inner");
+
+        Assert.Null(new StartupLogger(NullLogger.Instance).Topic);
+
+        using (StartupLogger.BeginAmbientTopic(outer.Topic))
+        {
+            using (StartupLogger.BeginAmbientTopic(inner.Topic))
+            {
+                Assert.Same(inner.Topic, new StartupLogger(NullLogger.Instance).Topic);
+            }
+
+            // Leaving a nested topic has to fall back to the enclosing one, not to the setup UI root.
+            Assert.Same(outer.Topic, new StartupLogger(NullLogger.Instance).Topic);
+        }
+
+        Assert.Null(new StartupLogger(NullLogger.Instance).Topic);
+    }
+
+    [Fact]
+    public void BeginGroup_KeepsAnExplicitTopicOverTheAmbientOne()
+    {
+        var migration = new StartupLogger(NullLogger.Instance).BeginGroup($"Migration");
+        var unrelated = new StartupLogger(NullLogger.Instance).BeginGroup($"Unrelated");
+
+        using (StartupLogger.BeginAmbientTopic(migration.Topic))
+        {
+            Assert.Same(unrelated.Topic, unrelated.With(NullLogger.Instance).Topic);
+        }
+    }
+}