Merge branch 'master' of https://github.com/VerifyTests/DiffEngine

src/DiffEngine.Tests/DefinitionsTest.cs

@@ -30,7 +30,7 @@ static void AddToolLink(StreamWriter writer, Definition tool)
 
     static string GetOsSupport(Definition tool)
     {
-        StringBuilder builder = new();
+        var builder = new StringBuilder();
         if (tool.Windows != null)
         {
             builder.Append("Win/");

src/DiffEngine.Tests/LinuxOsxProcessTests.cs

@@ -4,7 +4,6 @@
 public class LinuxOsxProcessTests :
     XunitContextBase
 {
-
     [Fact]
     public void TryParseWithZshInstalled()
     {
@@ -14,7 +13,7 @@ public void TryParseWithZshInstalled()
         Assert.Equal(20872, processCommand.Process);
         Assert.Equal("-zsh", processCommand.Command);
     }
-    
+
     [Fact]
     public void TryParse()
     {

src/DiffEngine/DiffRunner.cs

@@ -218,12 +218,12 @@ static bool TryCreate(ResolvedTool tool, string targetFile)
 
         static int LaunchProcess(ResolvedTool tool, string arguments)
         {
+            var startInfo = new ProcessStartInfo(tool.ExePath, arguments)
+            {
+                UseShellExecute = true
+            };
             try
             {
-                ProcessStartInfo startInfo = new(tool.ExePath, arguments)
-                {
-                    UseShellExecute = true
-                };
                 using var process = Process.Start(startInfo);
                 if (process != null)
                 {

src/DiffEngine/DiffTools.cs

@@ -146,7 +146,7 @@ public static class DiffTools
                 return null;
             }
 
-            ResolvedTool resolvedTool = new(
+            var resolvedTool = new ResolvedTool(
                 name,
                 diffTool,
                 resolvedExePath,

src/DiffEngine/Process/LinuxOsxProcess.cs

@@ -10,7 +10,7 @@ static class LinuxOsxProcess
     //https://www.man7.org/linux/man-pages/man1/ps.1.html
     public static bool TryTerminateProcess(int processId)
     {
-        using Process process = new()
+        using var process = new Process
         {
             StartInfo = new()
             {
@@ -34,7 +34,7 @@ public static bool TryTerminateProcess(int processId)
     public static IEnumerable<ProcessCommand> FindAll()
     {
         var processList = RunPs();
-        using StringReader reader = new(processList);
+        using var reader = new StringReader(processList);
         string? line;
         reader.ReadLine();
         while ((line = reader.ReadLine()) != null)
@@ -88,10 +88,10 @@ public static bool TryParse(string line, out ProcessCommand? processCommand)
 
     static string RunPs()
     {
-        StringBuilder errorBuilder = new();
-        StringBuilder outputBuilder = new();
+        var errorBuilder = new StringBuilder();
+        var outputBuilder = new StringBuilder();
         const string? arguments = "-o pid,command -x";
-        using Process process = new()
+        using var process = new Process
         {
             StartInfo = new()
             {

src/DiffEngine/Process/WindowsProcess.cs

@@ -36,7 +36,7 @@ public static IEnumerable<ProcessCommand> FindAll()
 select CommandLine, ProcessId
 from Win32_Process
 where CommandLine like '% %.%.%'";
-        using ManagementObjectSearcher searcher = new(wmiQuery);
+        using var searcher = new ManagementObjectSearcher(wmiQuery);
         using var collection = searcher.Get();
         foreach (var process in collection)
         {

src/DiffEngine/WildcardFileFinder.cs

@@ -25,13 +25,13 @@ static IEnumerable<string> EnumerateDirectories(string directory)
         }
 
         var segments = expanded.Split(separators);
-        List<string> currentRoots = new()
+        var currentRoots = new List<string>
         {
             segments[0] + Path.DirectorySeparatorChar
         };
         foreach (var segment in segments.Skip(1))
         {
-            List<string> newRoots = new();
+            var newRoots = new List<string>();
             foreach (var root in currentRoots)
             {
                 if (segment.Contains('*'))

src/DiffEngineTray.Tests/AsyncTimerTests.cs

@@ -7,9 +7,9 @@ public class AsyncTimerTests
     [Fact]
     public async Task It_calls_error_callback()
     {
-        TaskCompletionSource<bool> errorCallbackInvoked = new();
+        var errorCallbackInvoked = new TaskCompletionSource<bool>();
 
-        AsyncTimer timer = new(
+        var timer = new AsyncTimer(
             callback: (_, _) => throw new("Simulated!"),
             interval: TimeSpan.Zero,
             errorCallback: _ => { errorCallbackInvoked.SetResult(true); });
@@ -20,11 +20,11 @@ public async Task It_calls_error_callback()
     [Fact]
     public async Task It_continues_to_run_after_an_error()
     {
-        TaskCompletionSource<bool> callbackInvokedAfterError = new();
+        var callbackInvokedAfterError = new TaskCompletionSource<bool>();
 
         var fail = true;
         var exceptionThrown = false;
-        AsyncTimer timer = new(
+        var timer = new AsyncTimer(
             callback: (_, _) =>
             {
                 if (fail)
@@ -47,8 +47,8 @@ public async Task It_continues_to_run_after_an_error()
     public async Task Stop_cancels_token_while_waiting()
     {
         var waitCanceled = false;
-        TaskCompletionSource<bool> delayStarted = new();
-        AsyncTimer timer = new(
+        var delayStarted = new TaskCompletionSource<bool>();
+        var timer = new AsyncTimer(
             callback: (_, _) => throw new("Simulated!"),
             interval: TimeSpan.FromDays(7),
             delayStrategy: async (delayTime, token) =>
@@ -74,9 +74,9 @@ public async Task Stop_cancels_token_while_waiting()
     public async Task Stop_cancels_token_while_in_callback()
     {
         var callbackCanceled = false;
-        TaskCompletionSource<bool> callbackStarted = new();
-        TaskCompletionSource<bool> stopInitiated = new();
-        AsyncTimer timer = new(
+        var callbackStarted = new TaskCompletionSource<bool>();
+        var stopInitiated = new TaskCompletionSource<bool>();
+        var timer = new AsyncTimer(
             callback: async (_, token) =>
             {
                 callbackStarted.SetResult(true);
@@ -98,9 +98,9 @@ public async Task Stop_cancels_token_while_in_callback()
     [Fact]
     public async Task Stop_waits_for_callback_to_complete()
     {
-        TaskCompletionSource<bool> callbackCompleted = new();
-        TaskCompletionSource<bool> callbackTaskStarted = new();
-        AsyncTimer timer = new(
+        var callbackCompleted = new TaskCompletionSource<bool>();
+        var callbackTaskStarted = new TaskCompletionSource<bool>();
+        var timer = new  AsyncTimer(
             callback: (_, _) =>
             {
                 callbackTaskStarted.SetResult(true);

src/DiffEngineTray.Tests/HotKeyControlTests.cs

@@ -16,7 +16,7 @@ public HotKeyControlTests(ITestOutputHelper output) :
     [Fact]
     public async Task WithKeys()
     {
-        using HotKeyControl target = new()
+        using var target = new HotKeyControl
         {
             HotKey = new()
             {
@@ -30,7 +30,7 @@ public async Task WithKeys()
     [Fact]
     public async Task Default()
     {
-        using HotKeyControl target = new();
+        using var target = new HotKeyControl();
         await Verifier.Verify(target);
     }
 }

src/DiffEngineTray.Tests/MenuBuilderTest.cs

@@ -12,15 +12,15 @@ public class MenuBuilderTest :
     [Fact]
     public async Task Empty()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
         await Verifier.Verify(menu, settings);
     }
 
     [Fact]
     public async Task OnlyMove()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddMove(file2, file2, "theExe", "theArguments", true, null);
         var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
         await Verifier.Verify(menu, settings);
@@ -29,7 +29,7 @@ public async Task OnlyMove()
     [Fact]
     public async Task OnlyDelete()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
         await Verifier.Verify(menu, settings);
@@ -38,7 +38,7 @@ public async Task OnlyDelete()
     [Fact]
     public async Task Full()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         tracker.AddDelete(file2);
         tracker.AddMove(file3, file3, "theExe", "theArguments", true, null);
@@ -50,7 +50,7 @@ public async Task Full()
     [Fact]
     public async Task Many()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         foreach (var file in EmptyFiles.AllFiles.AllPaths)
         {
             tracker.AddDelete(file);
@@ -63,7 +63,7 @@ public async Task Many()
     [Fact]
     public async Task Grouped()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete("file2.txt");
         tracker.AddMove(file4, "file4.txt", "theExe", "theArguments", true, null);
         var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
@@ -73,7 +73,7 @@ public async Task Grouped()
     [Fact]
     public async Task FullGrouped()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         tracker.AddDelete("file2.txt");
         tracker.AddMove(file3, file3, "theExe", "theArguments", true, null);

src/DiffEngineTray.Tests/OptionsFormTests.cs

@@ -35,7 +35,7 @@ public OptionsFormTests(ITestOutputHelper output) :
     [Fact]
     public async Task WithKeys()
     {
-        using OptionsForm form = new(
+        using var form = new OptionsForm(
             new()
             {
                 AcceptAllHotKey = new()
@@ -51,7 +51,7 @@ public async Task WithKeys()
     [Fact]
     public async Task Default()
     {
-        using OptionsForm form = new(
+        using var form = new OptionsForm(
             new(),
             _ => Task.FromResult<IReadOnlyList<string>>(new List<string>()));
         await Verifier.Verify(form);

src/DiffEngineTray.Tests/PiperTest.cs

@@ -15,7 +15,7 @@ public class PiperTest :
     public async Task Delete()
     {
         DeletePayload received = null!;
-        CancellationTokenSource source = new();
+        var source = new CancellationTokenSource();
         var task = PiperServer.Start(_ => { }, s => received = s, source.Token);
         await PiperClient.SendDeleteAsync("Foo", source.Token);
         await Task.Delay(1000);
@@ -28,7 +28,7 @@ public async Task Delete()
     public async Task Move()
     {
         MovePayload received = null!;
-        CancellationTokenSource source = new();
+        var source = new CancellationTokenSource();
         var task = PiperServer.Start(s => received = s, _ => { }, source.Token);
         await PiperClient.SendMoveAsync("Foo", "Bar", "theExe", "TheArguments \"s\"", true, 10, source.Token);
         await Task.Delay(1000);
@@ -53,7 +53,7 @@ public async Task SendOnly()
         {
         }
 
-        VerifySettings settings = new();
+        var settings = new VerifySettings();
         settings.ScrubLinesContaining("temp.txt");
         //TODO: add "scrub source dir" to verify and remove the below
         settings.ScrubLinesContaining("PiperClient");

src/DiffEngineTray.Tests/TrackerClearTest.cs

@@ -9,7 +9,7 @@ public class TrackerClearTest :
     [Fact]
     public async Task Simple()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         tracker.AddMove(file2, file2, "theExe", "theArguments", true, null);
         tracker.Clear();

src/DiffEngineTray.Tests/TrackerDeleteTest.cs

@@ -10,7 +10,7 @@ public class TrackerDeleteTest :
     [Fact]
     public async Task AddSingle()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         Assert.Equal(1, tracker.Deletes.Count);
         Assert.True(tracker.TrackingAny);
@@ -19,7 +19,7 @@ public async Task AddSingle()
     [Fact]
     public async Task AddSingle_BackgroundDelete()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         File.Delete(file1);
         Thread.Sleep(3000);
@@ -29,7 +29,7 @@ public async Task AddSingle_BackgroundDelete()
     [Fact]
     public async Task AddMultiple()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         tracker.AddDelete(file2);
         Assert.Equal(2, tracker.Deletes.Count);
@@ -39,7 +39,7 @@ public async Task AddMultiple()
     [Fact]
     public async Task AddSame()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         tracker.AddDelete(file1);
         Assert.Equal(1, tracker.Deletes.Count);
@@ -49,7 +49,7 @@ public async Task AddSame()
     [Fact]
     public async Task AcceptAllSingle()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         tracker.AcceptAll();
         tracker.AssertEmpty();
@@ -58,7 +58,7 @@ public async Task AcceptAllSingle()
     [Fact]
     public async Task AcceptAllMultiple()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
         tracker.AddDelete(file2);
         tracker.AcceptAll();
@@ -68,7 +68,7 @@ public async Task AcceptAllMultiple()
     [Fact]
     public async Task AcceptSingle()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         var tracked = tracker.AddDelete(file1);
         tracker.Accept(tracked);
         tracker.AssertEmpty();
@@ -77,7 +77,7 @@ public async Task AcceptSingle()
     [Fact]
     public async Task AcceptSingle_NotEmpty()
     {
-        await using RecordingTracker tracker = new();
+        await using var tracker = new RecordingTracker();
         var tracked = tracker.AddDelete(file1);
         tracker.AddDelete(file2);
         tracker.Accept(tracked);