aboutsummaryrefslogtreecommitdiff
path: root/tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2020-08-20 18:50:15 +0200
committerGitHub <noreply@github.com>2020-08-20 18:50:15 +0200
commit6292a9e4e91fe98958fb8ab191453c7f713c1c92 (patch)
tree00067ebc5a246eb853ef319d073912424cdf3175 /tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs
parent6123e2e848331548823e80fab80813125db71b96 (diff)
parent8cbefdd5614736df4ead5adadc2a95deb45aa326 (diff)
Merge branch 'master' into warn24
Diffstat (limited to 'tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs')
-rw-r--r--tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs b/tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs
index 9eb601edf..c6b9cf67c 100644
--- a/tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs
+++ b/tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs
@@ -13,7 +13,8 @@ namespace Jellyfin.MediaEncoding.Tests
[ClassData(typeof(GetFFmpegVersionTestData))]
public void GetFFmpegVersionTest(string versionOutput, Version? version)
{
- Assert.Equal(version, EncoderValidator.GetFFmpegVersion(versionOutput));
+ var val = new EncoderValidator(new NullLogger<EncoderValidatorTests>());
+ Assert.Equal(version, val.GetFFmpegVersion(versionOutput));
}
[Theory]
@@ -22,7 +23,7 @@ namespace Jellyfin.MediaEncoding.Tests
[InlineData(EncoderValidatorTestsData.FFmpegV42Output, true)]
[InlineData(EncoderValidatorTestsData.FFmpegV414Output, true)]
[InlineData(EncoderValidatorTestsData.FFmpegV404Output, true)]
- [InlineData(EncoderValidatorTestsData.FFmpegGitUnknownOutput, false)]
+ [InlineData(EncoderValidatorTestsData.FFmpegGitUnknownOutput, true)]
public void ValidateVersionInternalTest(string versionOutput, bool valid)
{
var val = new EncoderValidator(new NullLogger<EncoderValidatorTests>());
@@ -38,7 +39,7 @@ namespace Jellyfin.MediaEncoding.Tests
yield return new object?[] { EncoderValidatorTestsData.FFmpegV42Output, new Version(4, 2) };
yield return new object?[] { EncoderValidatorTestsData.FFmpegV414Output, new Version(4, 1, 4) };
yield return new object?[] { EncoderValidatorTestsData.FFmpegV404Output, new Version(4, 0, 4) };
- yield return new object?[] { EncoderValidatorTestsData.FFmpegGitUnknownOutput, null };
+ yield return new object?[] { EncoderValidatorTestsData.FFmpegGitUnknownOutput, new Version(4, 0) };
}
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();