From 88602ce90530e89668c55df69b70b4f14bdc9e8b Mon Sep 17 00:00:00 2001
From: Christopher Young <c.t.ythegamer@gmail.com>
Date: Sat, 8 Nov 2025 12:35:37 -0700
Subject: [PATCH] Refactored GroupTests. Removed duplicate mock object
 declarations

---
 .../SyncPlay/GroupTests.cs                    | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/tests/Jellyfin.Server.Implementations.Tests/SyncPlay/GroupTests.cs b/tests/Jellyfin.Server.Implementations.Tests/SyncPlay/GroupTests.cs
index d854301358..bd9e680cd9 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/SyncPlay/GroupTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/SyncPlay/GroupTests.cs
@@ -13,24 +13,35 @@ namespace Jellyfin.Server.Implementations.Tests.SyncPlay;
 
 public class GroupTests
 {
+    public GroupTests()
+    {
+        var mockLogger = new Mock<ILogger<Emby.Server.Implementations.SyncPlay.Group>>();
+        MockLoggerFactory = new Mock<ILoggerFactory>();
+        MockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(mockLogger.Object);
+
+        MockUserManager = new Mock<IUserManager>();
+        MockSessionManager = new Mock<ISessionManager>();
+        MockLibraryManager = new Mock<ILibraryManager>();
+        MockItem = new Mock<BaseItem>();
+        MockItem.Setup(i => i.IsVisibleStandalone(It.IsAny<User>())).Returns(true);
+    }
+
+    private Mock<ILoggerFactory> MockLoggerFactory { get; }
+
+    private Mock<IUserManager> MockUserManager { get; }
+
+    private Mock<ISessionManager> MockSessionManager { get; }
+
+    private Mock<ILibraryManager> MockLibraryManager { get; }
+
+    private Mock<BaseItem> MockItem { get; }
+
     [Fact]
     public void HasAccessToPlayQueue_ReturnsTrue_WhenItemsAreVisible()
     {
-        var mockLogger = new Mock<ILogger<Emby.Server.Implementations.SyncPlay.Group>>();
-        var mockLoggerFactory = new Mock<ILoggerFactory>();
-        mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(mockLogger.Object);
-
-        var mockUserManager = new Mock<IUserManager>();
-        var mockSessionManager = new Mock<ISessionManager>();
-        var mockLibraryManager = new Mock<ILibraryManager>();
-
-        var mockItem = new Mock<BaseItem>();
-        mockItem.Setup(i => i.IsVisibleStandalone(It.IsAny<User>())).Returns(true);
-
-        mockLibraryManager.Setup(m => m.GetItemById(It.IsAny<Guid>())).Returns(mockItem.Object);
-
-        var group = new Emby.Server.Implementations.SyncPlay.Group(mockLoggerFactory.Object, mockUserManager.Object, mockSessionManager.Object, mockLibraryManager.Object);
+        MockLibraryManager.Setup(m => m.GetItemById(It.IsAny<Guid>())).Returns(MockItem.Object);
 
+        var group = new Emby.Server.Implementations.SyncPlay.Group(MockLoggerFactory.Object, MockUserManager.Object, MockSessionManager.Object, MockLibraryManager.Object);
         var itemId = Guid.NewGuid();
         var playlist = new List<Guid> { itemId };
         group.PlayQueue.Reset();
@@ -40,7 +51,6 @@ public class GroupTests
         Assert.Equal(itemId, group.PlayQueue.GetPlaylist()[0].ItemId);
 
         var user = new User("test-user", "auth-provider", "pwdreset-provider");
-
         var result = group.HasAccessToPlayQueue(user);
 
         Assert.True(result);
@@ -49,22 +59,11 @@ public class GroupTests
     [Fact]
     public void HasAccessToPlayQueue_ReturnsFalse_WhenLibraryReturnsNullForItem()
     {
-        var mockLogger = new Mock<ILogger<Emby.Server.Implementations.SyncPlay.Group>>();
-        var mockLoggerFactory = new Mock<ILoggerFactory>();
-        mockLoggerFactory.Setup(x => x.CreateLogger(It.IsAny<string>())).Returns(mockLogger.Object);
+        MockLibraryManager.Setup(m => m.GetItemById(It.IsAny<Guid>())).Returns((BaseItem?)null);
 
-        var mockUserManager = new Mock<IUserManager>();
-        var mockSessionManager = new Mock<ISessionManager>();
-        var mockLibraryManager = new Mock<ILibraryManager>();
-
-        var mockItem = new Mock<BaseItem>();
-        mockItem.Setup(i => i.IsVisibleStandalone(It.IsAny<User>())).Returns(true);
-
-        mockLibraryManager.Setup(m => m.GetItemById(It.IsAny<Guid>())).Returns((BaseItem?)null);
-        Assert.Null(
-            mockLibraryManager.Object.GetItemById(Guid.NewGuid()));
-        var group = new Emby.Server.Implementations.SyncPlay.Group(mockLoggerFactory.Object, mockUserManager.Object, mockSessionManager.Object, mockLibraryManager.Object);
+        Assert.Null(MockLibraryManager.Object.GetItemById(Guid.NewGuid()));
 
+        var group = new Emby.Server.Implementations.SyncPlay.Group(MockLoggerFactory.Object, MockUserManager.Object, MockSessionManager.Object, MockLibraryManager.Object);
         var itemId = Guid.NewGuid();
         var playlist = new List<Guid> { itemId };
         group.PlayQueue.Reset();
@@ -74,7 +73,6 @@ public class GroupTests
         Assert.Equal(itemId, group.PlayQueue.GetPlaylist()[0].ItemId);
 
         var user = new User("test-user", "auth-provider", "pwdreset-provider");
-
         var result = group.HasAccessToPlayQueue(user);
 
         Assert.False(result);