From 4aa580e5f4d3481629944bc31c9bb9d3900dbb6d Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Thu, 16 Oct 2025 13:31:32 +0200 Subject: [PATCH] Remove FluentAssertions and update usages --- .../FFMpegArgumentProcessorTest.cs | 55 ++++++++++++------- FFMpegCore.Test/FFMpegCore.Test.csproj | 1 - 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs b/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs index 7607b04..253659c 100644 --- a/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs +++ b/FFMpegCore.Test/FFMpegArgumentProcessorTest.cs @@ -1,6 +1,5 @@ using System.Reflection; using FFMpegCore.Arguments; -using FluentAssertions; namespace FFMpegCore.Test; @@ -26,11 +25,20 @@ public class FFMpegArgumentProcessorTest public void Processor_GlobalOptions_GetUsed() { var globalWorkingDir = "Whatever"; - GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir }); - var processor = CreateArgumentProcessor(); - var options2 = processor.GetConfiguredOptions(null); - options2.WorkingDirectory.Should().Be(globalWorkingDir); + try + { + GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir }); + + var processor = CreateArgumentProcessor(); + var options = processor.GetConfiguredOptions(null); + + Assert.AreEqual(globalWorkingDir, options.WorkingDirectory); + } + finally + { + GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = string.Empty }); + } } [TestMethod] @@ -42,7 +50,7 @@ public class FFMpegArgumentProcessorTest processor.Configure(options => options.WorkingDirectory = sessionWorkingDir); var options = processor.GetConfiguredOptions(null); - options.WorkingDirectory.Should().Be(sessionWorkingDir); + Assert.AreEqual(sessionWorkingDir, options.WorkingDirectory); } [TestMethod] @@ -51,17 +59,24 @@ public class FFMpegArgumentProcessorTest var globalConfig = "Whatever"; GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalConfig, TemporaryFilesFolder = globalConfig, BinaryFolder = globalConfig }); - var processor = CreateArgumentProcessor(); + try + { + var processor = CreateArgumentProcessor(); - var sessionTempDir = "./CurrentRunWorkingDir"; - processor.Configure(options => options.TemporaryFilesFolder = sessionTempDir); + var sessionTempDir = "./CurrentRunWorkingDir"; + processor.Configure(options => options.TemporaryFilesFolder = sessionTempDir); - var overrideOptions = new FFOptions { WorkingDirectory = "override" }; - var options = processor.GetConfiguredOptions(overrideOptions); + var overrideOptions = new FFOptions { WorkingDirectory = "override" }; + var options = processor.GetConfiguredOptions(overrideOptions); - options.Should().BeEquivalentTo(overrideOptions); - options.TemporaryFilesFolder.Should().BeEquivalentTo(sessionTempDir); - options.BinaryFolder.Should().NotBeEquivalentTo(globalConfig); + Assert.AreSame(options, overrideOptions); + Assert.AreEqual(sessionTempDir, options.TemporaryFilesFolder); + Assert.AreNotEqual(globalConfig, options.BinaryFolder); + } + finally + { + GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = string.Empty }); + } } [TestMethod] @@ -74,31 +89,31 @@ public class FFMpegArgumentProcessorTest var sessionWorkingDir = "./CurrentRunWorkingDir"; processor1.Configure(options => options.WorkingDirectory = sessionWorkingDir); var options1 = processor1.GetConfiguredOptions(null); - options1.WorkingDirectory.Should().Be(sessionWorkingDir); + Assert.AreEqual(sessionWorkingDir, options1.WorkingDirectory); var processor2 = CreateArgumentProcessor(); var options2 = processor2.GetConfiguredOptions(null); - options2.WorkingDirectory.Should().Be(globalWorkingDir); + Assert.AreEqual(globalWorkingDir, options2.WorkingDirectory); } [TestMethod] public void Concat_Escape() { - var arg = new DemuxConcatArgument(new[] { @"Heaven's River\05 - Investigation.m4b" }); - arg.Values.Should().BeEquivalentTo(@"file 'Heaven'\''s River\05 - Investigation.m4b'"); + var arg = new DemuxConcatArgument([@"Heaven's River\05 - Investigation.m4b"]); + CollectionAssert.AreEquivalent(new[] { @"file 'Heaven'\''s River\05 - Investigation.m4b'" }, arg.Values.ToArray()); } [TestMethod] public void Audible_Aaxc_Test() { var arg = new AudibleEncryptionKeyArgument("123", "456"); - arg.Text.Should().Be("-audible_key 123 -audible_iv 456"); + Assert.AreEqual("-audible_key 123 -audible_iv 456", arg.Text); } [TestMethod] public void Audible_Aax_Test() { var arg = new AudibleEncryptionKeyArgument("62689101"); - arg.Text.Should().Be("-activation_bytes 62689101"); + Assert.AreEqual("-activation_bytes 62689101", arg.Text); } } diff --git a/FFMpegCore.Test/FFMpegCore.Test.csproj b/FFMpegCore.Test/FFMpegCore.Test.csproj index cc839aa..a4061ed 100644 --- a/FFMpegCore.Test/FFMpegCore.Test.csproj +++ b/FFMpegCore.Test/FFMpegCore.Test.csproj @@ -12,7 +12,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - all runtime; build; native; contentfiles; analyzers; buildtransitive