Remove FluentAssertions and update usages

This commit is contained in:
Malte Rosenbjerg 2025-10-16 13:31:32 +02:00
parent fb6d6f80f0
commit 4aa580e5f4
2 changed files with 35 additions and 21 deletions

View file

@ -1,6 +1,5 @@
using System.Reflection; using System.Reflection;
using FFMpegCore.Arguments; using FFMpegCore.Arguments;
using FluentAssertions;
namespace FFMpegCore.Test; namespace FFMpegCore.Test;
@ -26,11 +25,20 @@ public class FFMpegArgumentProcessorTest
public void Processor_GlobalOptions_GetUsed() public void Processor_GlobalOptions_GetUsed()
{ {
var globalWorkingDir = "Whatever"; var globalWorkingDir = "Whatever";
GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir });
var processor = CreateArgumentProcessor(); try
var options2 = processor.GetConfiguredOptions(null); {
options2.WorkingDirectory.Should().Be(globalWorkingDir); 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] [TestMethod]
@ -42,7 +50,7 @@ public class FFMpegArgumentProcessorTest
processor.Configure(options => options.WorkingDirectory = sessionWorkingDir); processor.Configure(options => options.WorkingDirectory = sessionWorkingDir);
var options = processor.GetConfiguredOptions(null); var options = processor.GetConfiguredOptions(null);
options.WorkingDirectory.Should().Be(sessionWorkingDir); Assert.AreEqual(sessionWorkingDir, options.WorkingDirectory);
} }
[TestMethod] [TestMethod]
@ -51,17 +59,24 @@ public class FFMpegArgumentProcessorTest
var globalConfig = "Whatever"; var globalConfig = "Whatever";
GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalConfig, TemporaryFilesFolder = globalConfig, BinaryFolder = globalConfig }); GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalConfig, TemporaryFilesFolder = globalConfig, BinaryFolder = globalConfig });
var processor = CreateArgumentProcessor(); try
{
var processor = CreateArgumentProcessor();
var sessionTempDir = "./CurrentRunWorkingDir"; var sessionTempDir = "./CurrentRunWorkingDir";
processor.Configure(options => options.TemporaryFilesFolder = sessionTempDir); processor.Configure(options => options.TemporaryFilesFolder = sessionTempDir);
var overrideOptions = new FFOptions { WorkingDirectory = "override" }; var overrideOptions = new FFOptions { WorkingDirectory = "override" };
var options = processor.GetConfiguredOptions(overrideOptions); var options = processor.GetConfiguredOptions(overrideOptions);
options.Should().BeEquivalentTo(overrideOptions); Assert.AreSame(options, overrideOptions);
options.TemporaryFilesFolder.Should().BeEquivalentTo(sessionTempDir); Assert.AreEqual(sessionTempDir, options.TemporaryFilesFolder);
options.BinaryFolder.Should().NotBeEquivalentTo(globalConfig); Assert.AreNotEqual(globalConfig, options.BinaryFolder);
}
finally
{
GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = string.Empty });
}
} }
[TestMethod] [TestMethod]
@ -74,31 +89,31 @@ public class FFMpegArgumentProcessorTest
var sessionWorkingDir = "./CurrentRunWorkingDir"; var sessionWorkingDir = "./CurrentRunWorkingDir";
processor1.Configure(options => options.WorkingDirectory = sessionWorkingDir); processor1.Configure(options => options.WorkingDirectory = sessionWorkingDir);
var options1 = processor1.GetConfiguredOptions(null); var options1 = processor1.GetConfiguredOptions(null);
options1.WorkingDirectory.Should().Be(sessionWorkingDir); Assert.AreEqual(sessionWorkingDir, options1.WorkingDirectory);
var processor2 = CreateArgumentProcessor(); var processor2 = CreateArgumentProcessor();
var options2 = processor2.GetConfiguredOptions(null); var options2 = processor2.GetConfiguredOptions(null);
options2.WorkingDirectory.Should().Be(globalWorkingDir); Assert.AreEqual(globalWorkingDir, options2.WorkingDirectory);
} }
[TestMethod] [TestMethod]
public void Concat_Escape() public void Concat_Escape()
{ {
var arg = new DemuxConcatArgument(new[] { @"Heaven's River\05 - Investigation.m4b" }); var arg = new DemuxConcatArgument([@"Heaven's River\05 - Investigation.m4b"]);
arg.Values.Should().BeEquivalentTo(@"file 'Heaven'\''s River\05 - Investigation.m4b'"); CollectionAssert.AreEquivalent(new[] { @"file 'Heaven'\''s River\05 - Investigation.m4b'" }, arg.Values.ToArray());
} }
[TestMethod] [TestMethod]
public void Audible_Aaxc_Test() public void Audible_Aaxc_Test()
{ {
var arg = new AudibleEncryptionKeyArgument("123", "456"); 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] [TestMethod]
public void Audible_Aax_Test() public void Audible_Aax_Test()
{ {
var arg = new AudibleEncryptionKeyArgument("62689101"); var arg = new AudibleEncryptionKeyArgument("62689101");
arg.Text.Should().Be("-activation_bytes 62689101"); Assert.AreEqual("-activation_bytes 62689101", arg.Text);
} }
} }

View file

@ -12,7 +12,6 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="FluentAssertions" Version="8.7.1"/>
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1"> <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>