Merge pull request #6546 from ianjazz246/theorydata

3 files changed, 135 insertions, 196 deletions

diff --git a/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs
index a6e1dfe8f..6337dea41 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs
@@ -32,10 +32,11 @@ namespace Jellyfin.Server.Implementations.Tests.Data
             _sqliteItemRepository = _fixture.Create<SqliteItemRepository>();
         }
 
-        public static IEnumerable<object[]> ItemImageInfoFromValueString_Valid_TestData()
+        public static TheoryData<string, ItemImageInfo> ItemImageInfoFromValueString_Valid_TestData()
         {
-            yield return new object[]
-            {
+            var data = new TheoryData<string, ItemImageInfo>();
+
+            data.Add(
                 "/mnt/series/Family Guy/Season 1/Family Guy - S01E01-thumb.jpg*637452096478512963*Primary*1920*1080*WjQbtJtSO8nhNZ%L_Io#R/oaS6o}-;adXAoIn7j[%hW9s:WGw[nN",
                 new ItemImageInfo
                 {
@@ -45,41 +46,33 @@ namespace Jellyfin.Server.Implementations.Tests.Data
                     Width = 1920,
                     Height = 1080,
                     BlurHash = "WjQbtJtSO8nhNZ%L_Io#R*oaS6o}-;adXAoIn7j[%hW9s:WGw[nN"
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg*0*Primary*0*0",
                 new ItemImageInfo
                 {
                     Path = "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg",
                     Type = ImageType.Primary,
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg*0*Primary",
                 new ItemImageInfo
                 {
                     Path = "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg",
                     Type = ImageType.Primary,
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg*0*Primary*600",
                 new ItemImageInfo
                 {
                     Path = "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg",
                     Type = ImageType.Primary,
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "%MetadataPath%/library/68/68578562b96c80a7ebd530848801f645/poster.jpg*637264380567586027*Primary*600*336",
                 new ItemImageInfo
                 {
@@ -88,8 +81,9 @@ namespace Jellyfin.Server.Implementations.Tests.Data
                     DateModified = new DateTime(637264380567586027, DateTimeKind.Utc),
                     Width = 600,
                     Height = 336
-                }
-            };
+                });
+
+            return data;
         }
 
         [Theory]
@@ -117,10 +111,10 @@ namespace Jellyfin.Server.Implementations.Tests.Data
             Assert.Null(_sqliteItemRepository.ItemImageInfoFromValueString(value));
         }
 
-        public static IEnumerable<object[]> DeserializeImages_Valid_TestData()
+        public static TheoryData<string, ItemImageInfo[]> DeserializeImages_Valid_TestData()
         {
-            yield return new object[]
-            {
+            var data = new TheoryData<string, ItemImageInfo[]>();
+            data.Add(
                 "/mnt/series/Family Guy/Season 1/Family Guy - S01E01-thumb.jpg*637452096478512963*Primary*1920*1080*WjQbtJtSO8nhNZ%L_Io#R/oaS6o}-;adXAoIn7j[%hW9s:WGw[nN",
                 new ItemImageInfo[]
                 {
@@ -133,11 +127,9 @@ namespace Jellyfin.Server.Implementations.Tests.Data
                         Height = 1080,
                         BlurHash = "WjQbtJtSO8nhNZ%L_Io#R*oaS6o}-;adXAoIn7j[%hW9s:WGw[nN"
                     }
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "%MetadataPath%/library/2a/2a27372f1e9bc757b1db99721bbeae1e/poster.jpg*637261226720645297*Primary*0*0|%MetadataPath%/library/2a/2a27372f1e9bc757b1db99721bbeae1e/logo.png*637261226720805297*Logo*0*0|%MetadataPath%/library/2a/2a27372f1e9bc757b1db99721bbeae1e/landscape.jpg*637261226721285297*Thumb*0*0|%MetadataPath%/library/2a/2a27372f1e9bc757b1db99721bbeae1e/backdrop.jpg*637261226721685297*Backdrop*0*0",
                 new ItemImageInfo[]
                 {
@@ -165,20 +157,19 @@ namespace Jellyfin.Server.Implementations.Tests.Data
                         Type = ImageType.Backdrop,
                         DateModified = new DateTime(637261226721685297, DateTimeKind.Utc),
                     }
-                }
-            };
+                });
+
+            return data;
         }
 
-        public static IEnumerable<object[]> DeserializeImages_ValidAndInvalid_TestData()
+        public static TheoryData<string, ItemImageInfo[]> DeserializeImages_ValidAndInvalid_TestData()
         {
-            yield return new object[]
-            {
+            var data = new TheoryData<string, ItemImageInfo[]>();
+            data.Add(
                 string.Empty,
-                Array.Empty<ItemImageInfo>()
-            };
+                Array.Empty<ItemImageInfo>());
 
-            yield return new object[]
-            {
+            data.Add(
                 "/mnt/series/Family Guy/Season 1/Family Guy - S01E01-thumb.jpg*637452096478512963*Primary*1920*1080*WjQbtJtSO8nhNZ%L_Io#R/oaS6o}-;adXAoIn7j[%hW9s:WGw[nN|test|1234||ss",
                 new ItemImageInfo[]
                 {
@@ -191,14 +182,13 @@ namespace Jellyfin.Server.Implementations.Tests.Data
                         Height = 1080,
                         BlurHash = "WjQbtJtSO8nhNZ%L_Io#R*oaS6o}-;adXAoIn7j[%hW9s:WGw[nN"
                     }
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "|",
-                Array.Empty<ItemImageInfo>()
-            };
+                Array.Empty<ItemImageInfo>());
+
+            return data;
         }
 
         [Theory]
@@ -242,30 +232,27 @@ namespace Jellyfin.Server.Implementations.Tests.Data
             Assert.Equal(expected, _sqliteItemRepository.SerializeImages(value));
         }
 
-        public static IEnumerable<object[]> DeserializeProviderIds_Valid_TestData()
+        public static TheoryData<string, Dictionary<string, string>> DeserializeProviderIds_Valid_TestData()
         {
-            yield return new object[]
-            {
+            var data = new TheoryData<string, Dictionary<string, string>>();
+
+            data.Add(
                 "Imdb=tt0119567",
                 new Dictionary<string, string>()
                 {
                     { "Imdb", "tt0119567" },
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "Imdb=tt0119567|Tmdb=330|TmdbCollection=328",
                 new Dictionary<string, string>()
                 {
                     { "Imdb", "tt0119567" },
                     { "Tmdb", "330" },
                     { "TmdbCollection", "328" },
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "MusicBrainzAlbum=9d363e43-f24f-4b39-bc5a-7ef305c677c7|MusicBrainzReleaseGroup=63eba062-847c-3b73-8b0f-6baf27bba6fa|AudioDbArtist=111352|AudioDbAlbum=2116560|MusicBrainzAlbumArtist=20244d07-534f-4eff-b4d4-930878889970",
                 new Dictionary<string, string>()
                 {
@@ -274,8 +261,9 @@ namespace Jellyfin.Server.Implementations.Tests.Data
                     { "AudioDbArtist", "111352" },
                     { "AudioDbAlbum", "2116560" },
                     { "MusicBrainzAlbumArtist", "20244d07-534f-4eff-b4d4-930878889970" },
-                }
-            };
+                });
+
+            return data;
         }
 
         [Theory]
diff --git a/tests/Jellyfin.Server.Implementations.Tests/LiveTv/RecordingHelperTests.cs b/tests/Jellyfin.Server.Implementations.Tests/LiveTv/RecordingHelperTests.cs
index e8b93b437..bc16e1498 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/LiveTv/RecordingHelperTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/LiveTv/RecordingHelperTests.cs
@@ -8,43 +8,36 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv
 {
     public static class RecordingHelperTests
     {
-        public static IEnumerable<object[]> GetRecordingName_Success_TestData()
+        public static TheoryData<string, TimerInfo> GetRecordingName_Success_TestData()
         {
-            yield return new object[]
-            {
+            var data = new TheoryData<string, TimerInfo>();
+
+            data.Add(
                 "The Incredibles 2020_04_20_21_06_00",
                 new TimerInfo
                 {
                     Name = "The Incredibles",
                     StartDate = new DateTime(2020, 4, 20, 21, 6, 0, DateTimeKind.Local),
                     IsMovie = true
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "The Incredibles (2004)",
                 new TimerInfo
                 {
                     Name = "The Incredibles",
                     IsMovie = true,
                     ProductionYear = 2004
-                }
-            };
-
-            yield return new object[]
-            {
+                });
+            data.Add(
                 "The Big Bang Theory 2020_04_20_21_06_00",
                 new TimerInfo
                 {
                     Name = "The Big Bang Theory",
                     StartDate = new DateTime(2020, 4, 20, 21, 6, 0, DateTimeKind.Local),
                     IsProgramSeries = true,
-                }
-            };
-
-            yield return new object[]
-            {
+                });
+            data.Add(
                 "The Big Bang Theory S12E10",
                 new TimerInfo
                 {
@@ -52,11 +45,8 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv
                     IsProgramSeries = true,
                     SeasonNumber = 12,
                     EpisodeNumber = 10
-                }
-            };
-
-            yield return new object[]
-            {
+                });
+            data.Add(
                 "The Big Bang Theory S12E10 The VCR Illumination",
                 new TimerInfo
                 {
@@ -65,22 +55,17 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv
                     SeasonNumber = 12,
                     EpisodeNumber = 10,
                     EpisodeTitle = "The VCR Illumination"
-                }
-            };
-
-            yield return new object[]
-            {
+                });
+            data.Add(
                 "The Big Bang Theory 2018-12-06",
                 new TimerInfo
                 {
                     Name = "The Big Bang Theory",
                     IsProgramSeries = true,
                     OriginalAirDate = new DateTime(2018, 12, 6)
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "The Big Bang Theory 2018-12-06 - The VCR Illumination",
                 new TimerInfo
                 {
@@ -88,11 +73,9 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv
                     IsProgramSeries = true,
                     OriginalAirDate = new DateTime(2018, 12, 6),
                     EpisodeTitle = "The VCR Illumination"
-                }
-            };
+                });
 
-            yield return new object[]
-            {
+            data.Add(
                 "The Big Bang Theory 2018_12_06_21_06_00 - The VCR Illumination",
                 new TimerInfo
                 {
@@ -101,8 +84,9 @@ namespace Jellyfin.Server.Implementations.Tests.LiveTv
                     IsProgramSeries = true,
                     OriginalAirDate = new DateTime(2018, 12, 6),
                     EpisodeTitle = "The VCR Illumination"
-                }
-            };
+                });
+
+            return data;
         }
 
         [Theory]
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Sorting/AiredEpisodeOrderComparerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Sorting/AiredEpisodeOrderComparerTests.cs
index e94c509d7..f12681b59 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Sorting/AiredEpisodeOrderComparerTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Sorting/AiredEpisodeOrderComparerTests.cs
@@ -13,7 +13,7 @@ namespace Jellyfin.Server.Implementations.Tests.Sorting
     {
         [Theory]
         [ClassData(typeof(EpisodeBadData))]
-        public void Compare_GivenNull_ThrowsArgumentNullException(BaseItem x, BaseItem y)
+        public void Compare_GivenNull_ThrowsArgumentNullException(BaseItem? x, BaseItem? y)
         {
             var cmp = new AiredEpisodeOrderComparer();
             Assert.Throws<ArgumentNullException>(() => cmp.Compare(x, y));
@@ -29,171 +29,138 @@ namespace Jellyfin.Server.Implementations.Tests.Sorting
             Assert.Equal(-expected, cmp.Compare(y, x));
         }
 
-        private class EpisodeBadData : IEnumerable<object?[]>
+        private class EpisodeBadData : TheoryData<BaseItem?, BaseItem?>
         {
-            public IEnumerator<object?[]> GetEnumerator()
+            public EpisodeBadData()
             {
-                yield return new object?[] { null, new Episode() };
-                yield return new object?[] { new Episode(), null };
+                Add(null, new Episode());
+                Add(new Episode(), null);
             }
-
-            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
         }
 
-        private class EpisodeTestData : IEnumerable<object?[]>
+        private class EpisodeTestData : TheoryData<BaseItem, BaseItem, int>
         {
-            public IEnumerator<object?[]> GetEnumerator()
+            public EpisodeTestData()
             {
-                yield return new object?[]
-                {
+                Add(
                     new Movie(),
                     new Movie(),
-                    0
-                };
-                yield return new object?[]
-                {
+                    0);
+
+                Add(
                     new Movie(),
                     new Episode(),
-                    1
-                };
+                    1);
+
                 // Good cases
-                yield return new object?[]
-                {
+                Add(
                     new Episode(),
                     new Episode(),
-                    0
-                };
-                yield return new object?[]
-                {
+                    0);
+
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1 },
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1 },
-                    0
-                };
-                yield return new object?[]
-                {
+                    0);
+
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 2 },
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1 },
-                    1
-                };
-                yield return new object?[]
-                {
+                    1);
+
+                Add(
                     new Episode { ParentIndexNumber = 2, IndexNumber = 1 },
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1 },
-                    1
-                };
+                    1);
+
                 // Good Specials
-                yield return new object?[]
-                {
+                Add(
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1 },
-                    0
-                };
-                yield return new object?[]
-                {
+                    0);
+
+                Add(
                     new Episode { ParentIndexNumber = 0, IndexNumber = 2 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1 },
-                    1
-                };
+                    1);
 
                 // Specials to Episodes
-                yield return new object?[]
-                {
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1 },
-                    1
-                };
-                yield return new object?[]
-                {
+                    1);
+
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 2 },
-                    1
-                };
-                yield return new object?[]
-                {
+                    1);
+
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 2 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1 },
-                    1
-                };
+                    1);
 
-                yield return new object?[]
-                {
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 2 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1 },
-                    1
-                };
-                yield return new object?[]
-                {
+                    1);
+
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 2 },
-                    1
-                };
+                    1);
 
-                yield return new object?[]
-                {
+                Add(
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1, AirsAfterSeasonNumber = 1 },
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1 },
-                    1
-                };
-                yield return new object?[]
-                {
+                    1);
+
+                Add(
                     new Episode { ParentIndexNumber = 3, IndexNumber = 1 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1, AirsAfterSeasonNumber = 1 },
-                    1
-                };
+                    1);
 
-                yield return new object?[]
-                {
+                Add(
                     new Episode { ParentIndexNumber = 3, IndexNumber = 1 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1, AirsAfterSeasonNumber = 1, AirsBeforeEpisodeNumber = 2 },
-                    1
-                };
+                    1);
 
-                yield return new object?[]
-                {
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1, AirsBeforeSeasonNumber = 1 },
-                    1
-                };
-                yield return new object?[]
-                {
+                    1);
+
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 2 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1, AirsBeforeSeasonNumber = 1, AirsBeforeEpisodeNumber = 2 },
-                    1
-                };
-                yield return new object?[]
-                {
+                    1);
+
+                Add(
                     new Episode { ParentIndexNumber = 1 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1, AirsBeforeSeasonNumber = 1, AirsBeforeEpisodeNumber = 2 },
-                    0
-                };
-                yield return new object?[]
-                {
+                    0);
+
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 3 },
                     new Episode { ParentIndexNumber = 0, IndexNumber = 1, AirsBeforeSeasonNumber = 1, AirsBeforeEpisodeNumber = 2 },
-                    1
-                };
+                    1);
+
                 // Premiere Date
-                yield return new object?[]
-                {
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1, PremiereDate = new DateTime(2021, 09, 12, 0, 0, 0) },
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1, PremiereDate = new DateTime(2021, 09, 12, 0, 0, 0) },
-                    0
-                };
-                yield return new object?[]
-                {
+                    0);
+
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1, PremiereDate = new DateTime(2021, 09, 11, 0, 0, 0) },
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1, PremiereDate = new DateTime(2021, 09, 12, 0, 0, 0) },
-                    -1
-                };
-                yield return new object?[]
-                {
+                    -1);
+
+                Add(
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1, PremiereDate = new DateTime(2021, 09, 12, 0, 0, 0) },
                     new Episode { ParentIndexNumber = 1, IndexNumber = 1, PremiereDate = new DateTime(2021, 09, 11, 0, 0, 0) },
-                    1
-                };
+                    1);
             }
-
-            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
         }
     }
 }