relac process match

Author: SimonCropp

readme.md

@@ -69,7 +69,7 @@ A tool can be launched using the following:
 ```cs
 DiffRunner.Launch(tempFile, targetFile);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L14-L16' title='File snippet `diffrunnerlaunch` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerlaunch' title='Navigate to start of snippet `diffrunnerlaunch`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L16-L18' title='File snippet `diffrunnerlaunch` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerlaunch' title='Navigate to start of snippet `diffrunnerlaunch`'>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.
@@ -84,7 +84,7 @@ A tool can be closed using the following:
 ```cs
 DiffRunner.Kill(tempFile, targetFile);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L25-L27' title='File snippet `diffrunnerkill` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerkill' title='Navigate to start of snippet `diffrunnerkill`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L27-L29' title='File snippet `diffrunnerkill` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerkill' title='Navigate to start of snippet `diffrunnerkill`'>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/DiffRunnerTests.cs

@@ -1,4 +1,6 @@
 using System.IO;
+using System.Linq;
+using System.Threading;
 using DiffEngine;
 using Xunit;
 using Xunit.Abstractions;
@@ -26,27 +28,36 @@ public void Kill()
         DiffRunner.Kill(tempFile, targetFile);
         #endregion
     }
+#if NETCOREAPP3_1
 
-    //static string diffToolPath = Path.GetFullPath(Path.Combine(AssemblyLocation.CurrentDirectory, "../../../../FakeDiffTool/bin/FakeDiffTool.exe"));
+    static string diffToolPath = Path.GetFullPath(Path.Combine(AssemblyLocation.CurrentDirectory, "../../../../FakeDiffTool/bin/FakeDiffTool.exe"));
 
-    //[Fact]
-    //public void LaunchAndKill()
-    //{
-    //    DiffTools.AddCustomTool(
-    //        supportsAutoRefresh: true,
-    //        isMdi: false,
-    //        supportsText: true,
-    //        requiresTarget: true,
-    //        buildArguments: (path1, path2) => $"\"{path1}\" \"{path2}\"",
-    //        exePath: diffToolPath,
-    //        binaryExtensions: new[] {"knownBin"});
-    //    var tempFile = Path.Combine(SourceDirectory, "DiffRunner.file1.txt");
-    //    var targetFile = Path.Combine(SourceDirectory, "DiffRunner.file2.txt");
-    //    DiffRunner.Launch(tempFile, targetFile);
-    //    Assert.NotEmpty(ProcessCleanup.FindAll());
-    //    DiffRunner.Kill(tempFile, targetFile);
-    //    Assert.Empty(ProcessCleanup.FindAll());
-    //}
+    [Fact]
+    public void LaunchAndKill()
+    {
+        DiffTools.AddCustomTool(
+            supportsAutoRefresh: true,
+            isMdi: false,
+            supportsText: true,
+            requiresTarget: true,
+            buildArguments: (path1, path2) => $"\"{path1}\" \"{path2}\"",
+            exePath: diffToolPath,
+            binaryExtensions: new[] {"knownBin"});
+        var tempFile = Path.Combine(SourceDirectory, "DiffRunner.file1.txt");
+        var targetFile = Path.Combine(SourceDirectory, "DiffRunner.file2.txt");
+        DiffRunner.Launch(tempFile, targetFile);
+        Thread.Sleep(100);
+        Assert.True(IsRunning());
+        DiffRunner.Kill(tempFile, targetFile);
+        Thread.Sleep(100);
+        Assert.False(IsRunning());
+    }
+
+    static bool IsRunning()
+    {
+        return ProcessCleanup.FindAll().Any(x => x.Command.Contains("FakeDiffTool"));
+    }
+#endif
 
     public DiffRunnerTests(ITestOutputHelper output) :
         base(output)

src/DiffEngine/ProcessCleanup.cs

@@ -63,7 +63,7 @@ public static bool IsRunning(string command)
 
         static void TerminalProcessIfExists(ProcessCommand processCommand)
         {
-            var processId = (int) processCommand.Process;
+            var processId = processCommand.Process;
             using var processHandle = OpenProcess(4097, false, processId);
             if (processHandle.IsInvalid)
             {
@@ -74,14 +74,14 @@ static void TerminalProcessIfExists(ProcessCommand processCommand)
         }
 
         /// <summary>
-        /// Find all processes with `.received.` in the command line.
+        /// Find all processes with `% %.%.%` in the command line.
         /// </summary>
         public static IEnumerable<ProcessCommand> FindAll()
         {
             var wmiQuery = @"
 select CommandLine, ProcessId
 from Win32_Process
-where CommandLine like '%.received.%'";
+where CommandLine like '% %.%.%'";
             using var searcher = new ManagementObjectSearcher(wmiQuery);
             using var collection = searcher.Get();
             foreach (var process in collection)