cleanup

Author: SimonCropp

src/Verify.Tests/InnerVerifyTests/InnerVerifyTests.cs

@@ -27,6 +27,7 @@ public async Task VerifyExternalFile()
     [Fact]
     public async Task VerifyExternalFileLocked()
     {
+        // ReSharper disable once UseAwaitUsing
         using var locker = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
         using var verifier = new InnerVerifier(targetDirectory, "sample2");
         await verifier.VerifyFile(filePath);
@@ -43,18 +44,19 @@ public static void Init()
         Trace.WriteLine(assembly);
 
         VerifierSettings.RegisterStreamConverter(
-            "innersplit",
-            (_, stream, _) =>
-            {
-                var reader = new StreamReader(stream);
-                return new(
-                    "the info",
-                    [
-                        new("txt", reader.ReadToEnd()),
-                        new("txt", "text1"),
-                        new("txt", "text2")
-                    ]);
-            });
+            "innersplit", (_, stream, _) => BuildConversionResult(stream));
+    }
+
+    static ConversionResult BuildConversionResult(Stream stream)
+    {
+        var reader = new StreamReader(stream);
+        return new(
+            "the info",
+            [
+                new("txt", reader.ReadToEnd()),
+                new("txt", "text1"),
+                new("txt", "text2")
+            ]);
     }
 
     [Fact]

src/Verify.Tests/IoHelpersTests.cs

@@ -29,6 +29,7 @@ public async Task WriteStreamHandlesExclusiveFileStream()
 
         // Writable + FileShare.None means File.Copy cannot re-open the source
         // by path on Windows; WriteStream must fall back to the handle.
+        // ReSharper disable once UseAwaitUsing
         using var stream = new FileStream(source, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
         await IoHelpers.WriteStream(destination, stream);
 

src/Verify.Tests/ReadStringBuilderWithFixedLinesTests.cs

@@ -14,6 +14,7 @@ public async Task All()
         {
             if(!File.Exists(file))
             {
+                // ReSharper disable once UseAwaitUsing
                 using var reader = IoHelpers.OpenRead(file);
                 await reader.ReadStringBuilderWithFixedLines();
             }

src/Verify.Tests/StreamComparerTests.cs

@@ -3,7 +3,9 @@
     [Fact]
     public async Task BinaryEquals()
     {
+        // ReSharper disable once UseAwaitUsing
         using var stream1 = File.OpenRead("sample.bmp");
+        // ReSharper disable once UseAwaitUsing
         using var stream2 = File.OpenRead("sample.bmp");
         var result = await StreamComparer.AreEqual(stream1, stream2);
         Assert.True(result.IsEqual);
@@ -42,6 +44,7 @@ public async Task NotEqualInPartialFinalBlock()
     [Fact]
     public async Task BinaryNotEqualsSameLength()
     {
+        // ReSharper disable once UseAwaitUsing
         using var stream1 = File.OpenRead("sample.bmp");
         using var stream2 = new MemoryStream();
         await stream1.CopyToAsync(stream2);
@@ -57,6 +60,7 @@ public async Task BinaryNotEqualsSameLength()
     [Fact]
     public async Task BinaryNotEquals()
     {
+        // ReSharper disable once UseAwaitUsing
         using var stream1 = File.OpenRead("sample.bmp");
         using var stream2 = new MemoryStream();
         stream2.WriteByte(8);
@@ -96,6 +100,7 @@ public async Task LongerReceivedIsNotEqual()
     [Fact]
     public async Task ShouldNotLock()
     {
+        // ReSharper disable UseAwaitUsing
         using var stream1 = File.OpenRead("sample.bmp");
         using var stream2 = File.OpenRead("sample.bmp");
         using (
@@ -108,5 +113,6 @@ public async Task ShouldNotLock()
             var result = await StreamComparer.AreEqual(stream1, stream2);
             Assert.True(result.IsEqual);
         }
+        // ReSharper restore UseAwaitUsing
     }
 }