Nunit

docs/diff-tool.custom.md

@@ -24,7 +24,7 @@ var resolvedTool = DiffTools.AddTool(
     exePath: diffToolPath,
     binaryExtensions: [".jpg"])!;
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L15-L29' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddTool' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L16-L30' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddTool' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Add a tool based on existing resolved tool:
@@ -39,7 +39,7 @@ var resolvedTool = DiffTools.AddToolBasedOn(
         Left: (temp, target) => $"\"custom args \"{target}\" \"{temp}\"",
         Right: (temp, target) => $"\"custom args \"{temp}\" \"{target}\""))!;
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L62-L71' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddToolBasedOn' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L65-L74' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddToolBasedOn' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -52,7 +52,7 @@ New tools are added to the top of the order, the last tool added will resolve be
 ```cs
 await DiffRunner.LaunchAsync(tempFile, targetFile);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L63-L67' title='Snippet source file'>snippet source</a> | <a href='#snippet-DiffRunnerLaunch' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L62-L66' title='Snippet source file'>snippet source</a> | <a href='#snippet-DiffRunnerLaunch' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Alternatively the instance  returned from `AddTool*` can be used to explicitly launch that tool.
@@ -69,7 +69,7 @@ var resolvedTool = DiffTools.AddToolBasedOn(
 
 await DiffRunner.LaunchAsync(resolvedTool!, "PathToTempFile", "PathToTargetFile");
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L82-L93' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddToolAndLaunch' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L86-L97' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddToolAndLaunch' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

docs/diff-tool.order.md

@@ -51,5 +51,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o
 ```cs
 DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L139-L143' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L143-L147' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->

readme.md

@@ -83,7 +83,7 @@ A tool can be launched using the following:
 ```cs
 await DiffRunner.LaunchAsync(tempFile, targetFile);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L63-L67' title='Snippet source file'>snippet source</a> | <a href='#snippet-DiffRunnerLaunch' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L62-L66' title='Snippet source file'>snippet source</a> | <a href='#snippet-DiffRunnerLaunch' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Note that this method will respect the above [difference behavior](/docs/diff-tool.md#detected-difference-behavior) in terms of Auto refresh and MDI behaviors.
@@ -98,7 +98,7 @@ A tool can be closed using the following:
 ```cs
 DiffRunner.Kill(file1, file2);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L76-L80' title='Snippet source file'>snippet source</a> | <a href='#snippet-DiffRunnerKill' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L75-L79' title='Snippet source file'>snippet source</a> | <a href='#snippet-DiffRunnerKill' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Note that this method will respect the above [difference behavior](/docs/diff-tool.md#detected-difference-behavior) in terms of MDI behavior.

src/DiffEngine.Tests/DiffEngine.Tests.csproj

@@ -11,11 +11,13 @@
     <PackageReference Include="MarkdownSnippets.MsBuild" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Argon" />
-    <PackageReference Include="xunit.v3" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Verify.NUnit" />
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
-    <PackageReference Include="XunitContext" />
     <ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
     <Compile Remove="DefinitionsTest.cs" Condition="'$(TargetFramework)' != 'net8.0'" />
+    <Using Include="NUnit.Framework.Legacy.ClassicAssert" Static="True" />
+    <Using Include="NUnit.Framework.Assert" Static="True" />
   </ItemGroup>
 </Project>

src/DiffEngine.Tests/DiffEngineTrayTest.cs

@@ -1,7 +1,7 @@
-public class DiffEngineTrayTest(ITestOutputHelper output) :
-    XunitContextBase(output)
+[TestFixture]
+public class DiffEngineTrayTest
 {
-    [Fact]
+    [Test]
     public void IsRunning() =>
-        Assert.False(DiffEngineTray.IsRunning);
+        False(DiffEngineTray.IsRunning);
 }

src/DiffEngine.Tests/DiffRunnerTests.cs

@@ -1,6 +1,5 @@
 #if NET8_0
-public class DiffRunnerTests :
-    XunitContextBase
+public class DiffRunnerTests
 {
     static ResolvedTool tool;
     string file2;
@@ -17,10 +16,10 @@ public async Task MaxInstancesToLaunch()
             ProcessCleanup.Refresh();
             var result = DiffRunner.Launch(file1, "fake.txt");
             await Task.Delay(300);
-            Assert.Equal(LaunchResult.StartedNewInstance, result);
+            AreEqual(LaunchResult.StartedNewInstance, result);
             ProcessCleanup.Refresh();
             result = DiffRunner.Launch(file2, "fake.txt");
-            Assert.Equal(LaunchResult.TooManyRunningDiffTools, result);
+            AreEqual(LaunchResult.TooManyRunningDiffTools, result);
             ProcessCleanup.Refresh();
             DiffRunner.Kill(file1, "fake.txt");
             DiffRunner.Kill(file2, "fake.txt");
@@ -41,10 +40,10 @@ public async Task MaxInstancesToLaunchAsync()
             ProcessCleanup.Refresh();
             var result = await DiffRunner.LaunchAsync(file1, "fake.txt");
             await Task.Delay(300);
-            Assert.Equal(LaunchResult.StartedNewInstance, result);
+            AreEqual(LaunchResult.StartedNewInstance, result);
             ProcessCleanup.Refresh();
             result = await DiffRunner.LaunchAsync(file2, "fake.txt");
-            Assert.Equal(LaunchResult.TooManyRunningDiffTools, result);
+            AreEqual(LaunchResult.TooManyRunningDiffTools, result);
             ProcessCleanup.Refresh();
             DiffRunner.Kill(file1, "fake.txt");
             DiffRunner.Kill(file2, "fake.txt");
@@ -89,7 +88,7 @@ public void LaunchAndKillDisabled()
             Assert.False(IsRunning());
             Assert.False(ProcessCleanup.IsRunning(command));
             var result = DiffRunner.Launch(file1, file2);
-            Assert.Equal(LaunchResult.Disabled, result);
+            AreEqual(LaunchResult.Disabled, result);
             Thread.Sleep(500);
             ProcessCleanup.Refresh();
             Assert.False(IsRunning());
@@ -115,7 +114,7 @@ public async Task LaunchAndKillDisabledAsync()
             Assert.False(IsRunning());
             Assert.False(ProcessCleanup.IsRunning(command));
             var result = await DiffRunner.LaunchAsync(file1, file2);
-            Assert.Equal(LaunchResult.Disabled, result);
+            AreEqual(LaunchResult.Disabled, result);
             Thread.Sleep(500);
             ProcessCleanup.Refresh();
             Assert.False(IsRunning());
@@ -138,7 +137,7 @@ public void LaunchAndKill()
         Assert.False(IsRunning());
         Assert.False(ProcessCleanup.IsRunning(command));
         var result = DiffRunner.Launch(file1, file2);
-        Assert.Equal(LaunchResult.StartedNewInstance, result);
+        AreEqual(LaunchResult.StartedNewInstance, result);
         Thread.Sleep(500);
         ProcessCleanup.Refresh();
         Assert.True(IsRunning());
@@ -156,7 +155,7 @@ public async Task LaunchAndKillAsync()
         Assert.False(IsRunning());
         Assert.False(ProcessCleanup.IsRunning(command));
         var result = await DiffRunner.LaunchAsync(file1, file2);
-        Assert.Equal(LaunchResult.StartedNewInstance, result);
+        AreEqual(LaunchResult.StartedNewInstance, result);
         Thread.Sleep(500);
         ProcessCleanup.Refresh();
         Assert.True(IsRunning());

src/DiffEngine.Tests/DiffToolsTest.cs

@@ -1,15 +1,16 @@
-public class DiffToolsTest :
-    XunitContextBase
+[TestFixture]
+public class DiffToolsTest
 {
-    [Fact]
+    [Test]
     public void MaxInstancesToLaunch() =>
     #region MaxInstancesToLaunch
         DiffRunner.MaxInstancesToLaunch(10);
     #endregion
 
-    [Fact]
+    [Test]
     public void AddTool()
     {
+        DiffTools.Reset();
         var diffToolPath = FakeDiffTool.Exe;
 
         #region AddTool
@@ -28,15 +29,16 @@ public void AddTool()
 
         #endregion
 
-        Assert.Equal(resolvedTool.Name, DiffTools.Resolved.First()
+        AreEqual(resolvedTool.Name, DiffTools.Resolved.First()
             .Name);
-        Assert.True(DiffTools.TryFindByExtension(".jpg", out var forExtension));
-        Assert.Equal(resolvedTool.Name, forExtension.Name);
+        True(DiffTools.TryFindByExtension(".jpg", out var forExtension));
+        AreEqual(resolvedTool.Name, forExtension!.Name);
     }
 
-    [Fact]
+    [Test]
     public void OrderShouldNotMessWithAddTool()
     {
+        DiffTools.Reset();
         var diffToolPath = FakeDiffTool.Exe;
         var resolvedTool = DiffTools.AddTool(
             name: "MyCustomDiffTool",
@@ -50,15 +52,16 @@ public void OrderShouldNotMessWithAddTool()
             exePath: diffToolPath,
             binaryExtensions: [])!;
         DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
-        Assert.Equal("MyCustomDiffTool", resolvedTool.Name);
-        Assert.True(DiffTools.TryFindByExtension(".txt", out var forExtension));
-        Assert.Equal("MyCustomDiffTool", forExtension.Name);
+        AreEqual("MyCustomDiffTool", resolvedTool.Name);
+        True(DiffTools.TryFindByExtension(".txt", out var forExtension));
+        AreEqual("MyCustomDiffTool", forExtension!.Name);
     }
 
 #if DEBUG
-    [Fact]
+    [Test]
     public void AddToolBasedOn()
     {
+        DiffTools.Reset();
         #region AddToolBasedOn
 
         var resolvedTool = DiffTools.AddToolBasedOn(
@@ -70,15 +73,16 @@ public void AddToolBasedOn()
 
         #endregion
 
-        Assert.Equal(resolvedTool, DiffTools.Resolved.First());
-        Assert.True(DiffTools.TryFindByExtension(".txt", out var forExtension));
-        Assert.Equal(resolvedTool, forExtension);
-        Assert.Equal("\"custom args \"bar\" \"foo\"", resolvedTool.LaunchArguments.Left("foo", "bar"));
-        Assert.Equal("\"custom args \"foo\" \"bar\"", resolvedTool.LaunchArguments.Right("foo", "bar"));
+        AreEqual(resolvedTool, DiffTools.Resolved.First());
+        True(DiffTools.TryFindByExtension(".txt", out var forExtension));
+        AreEqual(resolvedTool, forExtension);
+        AreEqual("\"custom args \"bar\" \"foo\"", resolvedTool.LaunchArguments.Left("foo", "bar"));
+        AreEqual("\"custom args \"foo\" \"bar\"", resolvedTool.LaunchArguments.Right("foo", "bar"));
     }
 #endif
     static async Task AddToolAndLaunch()
     {
+        DiffTools.Reset();
         #region AddToolAndLaunch
 
         var resolvedTool = DiffTools.AddToolBasedOn(
@@ -142,7 +146,7 @@ public void ChangeOrder()
 
         #endregion
 
-        Assert.Equal(DiffTool.VisualStudio, DiffTools.Resolved.First()
+        AreEqual(DiffTool.VisualStudio, DiffTools.Resolved.First()
             .Tool);
     }
 
@@ -167,8 +171,4 @@ public void TryFindByName()
     }
 #endif
 **/
-    public DiffToolsTest(ITestOutputHelper output)
-        :
-        base(output) =>
-        DiffTools.Reset();
 }

src/DiffEngine.Tests/GlobalUsings.cs

@@ -0,0 +1,3 @@
+// Global using directives
+
+global using NUnit.Framework.Legacy;

src/DiffEngine.Tests/LinuxOsxProcessTests.cs

@@ -1,43 +1,43 @@
-public class LinuxOsxProcessTests(ITestOutputHelper output) :
-    XunitContextBase(output)
+[TestFixture]
+public class LinuxOsxProcessTests
 {
-    [Fact]
+    [Test]
     public void TryParseWithZshInstalled()
     {
         var parse = LinuxOsxProcess.TryParse("20872 -zsh", out var command);
-        Assert.True(parse);
+        True(parse);
         var processCommand = command!.Value;
-        Assert.Equal(20872, processCommand.Process);
-        Assert.Equal("-zsh", processCommand.Command);
+        AreEqual(20872, processCommand.Process);
+        AreEqual("-zsh", processCommand.Command);
     }
 
-    [Fact]
+    [Test]
     public void TryParse()
     {
         var parse = LinuxOsxProcess.TryParse("309 /System/Library/coreauthd -foo", out var command);
-        Assert.True(parse);
+        True(parse);
         var processCommand = command!.Value;
-        Assert.Equal(309, processCommand.Process);
-        Assert.Equal("/System/Library/coreauthd -foo", processCommand.Command);
+        AreEqual(309, processCommand.Process);
+        AreEqual("/System/Library/coreauthd -foo", processCommand.Command);
     }
 
-    [Fact]
+    [Test]
     public void TryParse_noSlash()
     {
         var parse = LinuxOsxProcess.TryParse("309 System/Library/coreauthd -foo", out var command);
-        Assert.True(parse);
+        True(parse);
         var processCommand = command!.Value;
-        Assert.Equal(309, processCommand.Process);
-        Assert.Equal("System/Library/coreauthd -foo", processCommand.Command);
+        AreEqual(309, processCommand.Process);
+        AreEqual("System/Library/coreauthd -foo", processCommand.Command);
     }
 
-    [Fact]
+    [Test]
     public void TryParse_singleDigit()
     {
         var parse = LinuxOsxProcess.TryParse("309 System/Library/coreauthd -foo", out var command);
-        Assert.True(parse);
+        True(parse);
         var processCommand = command!.Value;
-        Assert.Equal(309, processCommand.Process);
-        Assert.Equal("System/Library/coreauthd -foo", processCommand.Command);
+        AreEqual(309, processCommand.Process);
+        AreEqual("System/Library/coreauthd -foo", processCommand.Command);
     }
 }

src/DiffEngine.Tests/ModuleInitializer.cs

@@ -1,10 +1,11 @@
-[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true)]
+[assembly: NonParallelizable]
 
 public static class ModuleInitializer
 {
     [ModuleInitializer]
     public static void Initialize()
     {
+        Source.Init();
         Logging.Enable();
         DiffRunner.Disabled = false;
     }

src/DiffEngine.Tests/OrderReaderTest.cs

@@ -1,18 +1,18 @@
-public class OrderReaderTest(ITestOutputHelper output) :
-    XunitContextBase(output)
+[TestFixture]
+public class OrderReaderTest
 {
-    [Fact]
+    [Test]
     public void ParseEnvironmentVariable()
     {
         var diffTools = OrderReader.ParseEnvironment("VisualStudio,Meld").ToList();
-        Assert.Equal(DiffTool.VisualStudio, diffTools[0]);
-        Assert.Equal(DiffTool.Meld, diffTools[1]);
+        AreEqual(DiffTool.VisualStudio, diffTools[0]);
+        AreEqual(DiffTool.Meld, diffTools[1]);
     }
 
-    [Fact]
+    [Test]
     public void BadEnvironmentVariable()
     {
-        var exception = Assert.Throws<Exception>(() => OrderReader.ParseEnvironment("Foo").ToList());
-        Assert.Equal("Unable to parse tool from `DiffEngine_ToolOrder` environment variable: Foo", exception.Message);
+        var exception = Throws<Exception>(() => OrderReader.ParseEnvironment("Foo").ToList());
+        AreEqual("Unable to parse tool from `DiffEngine_ToolOrder` environment variable: Foo", exception!.Message);
     }
 }