From 7d5e091f43f490158b43e6888b81838fd8ca61ad Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sun, 29 Jan 2023 23:03:50 +0100 Subject: [PATCH] More cleanup Former-commit-id: 104caa609b6848b70f1ba3029c26dd7b277870a5 --- FFMpegCore.Test/AudioTest.cs | 4 ++-- FFMpegCore.Test/FFMpegArgumentProcessorTest.cs | 6 +----- FFMpegCore.Test/MetaDataBuilderTests.cs | 3 --- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/FFMpegCore.Test/AudioTest.cs b/FFMpegCore.Test/AudioTest.cs index 6f57d51..ab432e9 100644 --- a/FFMpegCore.Test/AudioTest.cs +++ b/FFMpegCore.Test/AudioTest.cs @@ -242,7 +242,7 @@ public void Audio_Pan_ToMono() Assert.IsTrue(success); Assert.AreEqual(1, mediaAnalysis.AudioStreams.Count); - Assert.AreEqual("mono", mediaAnalysis.PrimaryAudioStream.ChannelLayout); + Assert.AreEqual("mono", mediaAnalysis.PrimaryAudioStream!.ChannelLayout); } [TestMethod, Timeout(10000)] @@ -260,7 +260,7 @@ public void Audio_Pan_ToMonoNoDefinitions() Assert.IsTrue(success); Assert.AreEqual(1, mediaAnalysis.AudioStreams.Count); - Assert.AreEqual("mono", mediaAnalysis.PrimaryAudioStream.ChannelLayout); + Assert.AreEqual("mono", mediaAnalysis.PrimaryAudioStream!.ChannelLayout); } [TestMethod, Timeout(10000)] diff --git a/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs b/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs index 6e30999..c849b81 100644 --- a/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs +++ b/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs @@ -13,7 +13,7 @@ public void TestInitialize() { // After testing reset global configuration to null, to be not wrong for other test relying on configuration - typeof(GlobalFFOptions).GetField("_current", BindingFlags.NonPublic | BindingFlags.Static).SetValue(GlobalFFOptions.Current, null); + typeof(GlobalFFOptions).GetField("_current", BindingFlags.NonPublic | BindingFlags.Static)!.SetValue(GlobalFFOptions.Current, null); } private static FFMpegArgumentProcessor CreateArgumentProcessor() => FFMpegArguments @@ -69,10 +69,6 @@ public void Processor_Options_CanBeOverridden_And_Configured() [TestMethod] public void Options_Global_And_Session_Options_Can_Differ() { - FFMpegArgumentProcessor CreateArgumentProcessor() => FFMpegArguments - .FromFileInput("") - .OutputToFile(""); - var globalWorkingDir = "Whatever"; GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir }); diff --git a/FFMpegCore.Test/MetaDataBuilderTests.cs b/FFMpegCore.Test/MetaDataBuilderTests.cs index 23d40a4..5209d4e 100644 --- a/FFMpegCore.Test/MetaDataBuilderTests.cs +++ b/FFMpegCore.Test/MetaDataBuilderTests.cs @@ -1,9 +1,6 @@ using FFMpegCore.Builders.MetaData; - using Microsoft.VisualStudio.TestTools.UnitTesting; - using System; - using System.Text.RegularExpressions; namespace FFMpegCore.Test