Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

1 files changed, 12 insertions, 42 deletions

diff --git a/tests/Jellyfin.Api.Tests/Helpers/RequestHelpersTests.cs b/tests/Jellyfin.Api.Tests/Helpers/RequestHelpersTests.cs
index 97e441b1d..c4640bd22 100644
--- a/tests/Jellyfin.Api.Tests/Helpers/RequestHelpersTests.cs
+++ b/tests/Jellyfin.Api.Tests/Helpers/RequestHelpersTests.cs
@@ -15,16 +15,16 @@ namespace Jellyfin.Api.Tests.Helpers
             Assert.Equal(expected, RequestHelpers.GetOrderBy(sortBy, requestedSortOrder));
         }
 
-        public static IEnumerable<object[]> GetOrderBy_Success_TestData()
+        public static TheoryData<IReadOnlyList<string>, IReadOnlyList<SortOrder>, (string, SortOrder)[]> GetOrderBy_Success_TestData()
         {
-            yield return new object[]
-            {
+            var data = new TheoryData<IReadOnlyList<string>, IReadOnlyList<SortOrder>, (string, SortOrder)[]>();
+
+            data.Add(
                 Array.Empty<string>(),
                 Array.Empty<SortOrder>(),
-                Array.Empty<(string, SortOrder)>()
-            };
-            yield return new object[]
-            {
+                Array.Empty<(string, SortOrder)>());
+
+            data.Add(
                 new string[]
                 {
                     "IsFavoriteOrLiked",
@@ -35,10 +35,9 @@ namespace Jellyfin.Api.Tests.Helpers
                 {
                     ("IsFavoriteOrLiked", SortOrder.Ascending),
                     ("Random", SortOrder.Ascending),
-                }
-            };
-            yield return new object[]
-            {
+                });
+
+            data.Add(
                 new string[]
                 {
                     "SortName",
@@ -52,38 +51,9 @@ namespace Jellyfin.Api.Tests.Helpers
                 {
                     ("SortName", SortOrder.Descending),
                     ("ProductionYear", SortOrder.Descending),
-                }
-            };
-        }
-
-        [Fact]
-        public static void GetItemTypeStrings_Empty_Empty()
-        {
-            Assert.Empty(RequestHelpers.GetItemTypeStrings(Array.Empty<BaseItemKind>()));
-        }
-
-        [Fact]
-        public static void GetItemTypeStrings_Valid_Success()
-        {
-            BaseItemKind[] input =
-            {
-                BaseItemKind.AggregateFolder,
-                BaseItemKind.Audio,
-                BaseItemKind.BasePluginFolder,
-                BaseItemKind.CollectionFolder
-            };
-
-            string[] expected =
-            {
-                "AggregateFolder",
-                "Audio",
-                "BasePluginFolder",
-                "CollectionFolder"
-            };
-
-            var res = RequestHelpers.GetItemTypeStrings(input);
+                });
 
-            Assert.Equal(expected, res);
+            return data;
         }
     }
 }