Compare commits

..

No commits in common. "bd55ec2a51c8d7812c3a0dead829c9a98b3e9d50" and "70668ce6239478ca440c32a7709c98d2afcc05aa" have entirely different histories.

7 changed files with 37 additions and 32 deletions

View file

@ -682,25 +682,4 @@ public class ArgumentBuilderTest
// Act & Assert
Assert.ThrowsExactly<FileNotFoundException>(() => argument.Pre());
}
[TestMethod]
public void Concat_Escape()
{
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");
Assert.AreEqual("-audible_key 123 -audible_iv 456", arg.Text);
}
[TestMethod]
public void Audible_Aax_Test()
{
var arg = new AudibleEncryptionKeyArgument("62689101");
Assert.AreEqual("-activation_bytes 62689101", arg.Text);
}
}

View file

@ -1 +1 @@
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
[assembly: Parallelize]

View file

@ -1,4 +1,6 @@
namespace FFMpegCore.Test;
using FFMpegCore.Arguments;
namespace FFMpegCore.Test;
[TestClass]
public class FFMpegArgumentProcessorTest
@ -11,7 +13,7 @@ public class FFMpegArgumentProcessorTest
}
[TestMethod]
public void ZZZ_Processor_GlobalOptions_GetUsed()
public void Processor_GlobalOptions_GetUsed()
{
var globalWorkingDir = "Whatever";
var processor = CreateArgumentProcessor();
@ -43,7 +45,7 @@ public class FFMpegArgumentProcessorTest
}
[TestMethod]
public void ZZZ_Processor_Options_CanBeOverridden_And_Configured()
public void Processor_Options_CanBeOverridden_And_Configured()
{
var globalConfig = "Whatever";
@ -73,7 +75,7 @@ public class FFMpegArgumentProcessorTest
}
[TestMethod]
public void ZZZ_Options_Global_And_Session_Options_Can_Differ()
public void Options_Global_And_Session_Options_Can_Differ()
{
var globalWorkingDir = "Whatever";
@ -95,4 +97,25 @@ public class FFMpegArgumentProcessorTest
GlobalFFOptions.Configure(new FFOptions());
}
}
[TestMethod]
public void Concat_Escape()
{
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");
Assert.AreEqual("-audible_key 123 -audible_iv 456", arg.Text);
}
[TestMethod]
public void Audible_Aax_Test()
{
var arg = new AudibleEncryptionKeyArgument("62689101");
Assert.AreEqual("-activation_bytes 62689101", arg.Text);
}
}

View file

@ -5,7 +5,6 @@
<IsPackable>false</IsPackable>
<Nullable>disable</Nullable>
<LangVersion>default</LangVersion>
<OrderTestsByNameInClass>true</OrderTestsByNameInClass>
</PropertyGroup>
<ItemGroup>

View file

@ -27,16 +27,20 @@ public class FFMpegOptionsTest
}
[TestMethod]
public void ZZZ_Options_Set_Programmatically()
public void Options_Set_Programmatically()
{
var original = GlobalFFOptions.Current;
try
{
GlobalFFOptions.Configure(new FFOptions { BinaryFolder = "Whatever" });
Assert.AreEqual("Whatever", GlobalFFOptions.Current.BinaryFolder);
Assert.AreEqual(
"Whatever",
GlobalFFOptions.Current.BinaryFolder
);
}
finally
{
GlobalFFOptions.Configure(new FFOptions());
GlobalFFOptions.Configure(original);
}
}
}

View file

@ -824,6 +824,7 @@ public class VideoTest
using var outputFile = new TemporaryFile("out.mp4");
var dataReceived = false;
GlobalFFOptions.Configure(opt => opt.Encoding = Encoding.UTF8);
var success = FFMpegArguments
.FromFileInput(TestResources.Mp4Video)
.WithGlobalOptions(options => options
@ -831,7 +832,6 @@ public class VideoTest
.OutputToFile(outputFile, false, opt => opt
.WithDuration(TimeSpan.FromSeconds(2)))
.NotifyOnError(_ => dataReceived = true)
.Configure(opt => opt.Encoding = Encoding.UTF8)
.ProcessSynchronously();
Assert.IsTrue(dataReceived);

View file

@ -1,3 +1,3 @@
{
"BinaryFolder": ""
"RootDirectory": ""
}