Clean up and formatting

Author: rameel

tests/Ramstack.FileSystem.Amazon.Tests/WritableAmazonFileSystemTests.cs

@@ -14,7 +14,7 @@ namespace Ramstack.FileSystem.Amazon;
 [Category("Cloud:Amazon")]
 public class WritableAmazonFileSystemTests : VirtualFileSystemSpecificationTests
 {
-    private readonly HashSet<string> _list = [];
+    private readonly HashSet<string> _buckets = [];
     private readonly TempFileStorage _storage = new TempFileStorage();
 
     [OneTimeSetUp]
@@ -35,17 +35,17 @@ public async Task Cleanup()
     {
         _storage.Dispose();
 
-        foreach (var name in _list.ToArray())
+        foreach (var name in _buckets.ToArray())
         {
             using var fs = CreateFileSystem(name);
 
             try
             {
                 await fs.DeleteDirectoryAsync("/");
             }
-            catch (Exception exception)
+            catch (Exception e)
             {
-                Console.WriteLine(exception);
+                Console.WriteLine(e);
             }
         }
     }
@@ -61,14 +61,15 @@ public async Task File_OpenWrite_InternalBufferWriteError_DoesNotCreateFile()
             Assert.That(underlying, Is.Not.Null);
 
             // Write enough data to trigger automatic part upload (>= 5 MiB).
-            await stream.WriteAsync(new ReadOnlyMemory<byte>(new byte[6 * 1024 * 1024]));
+            await stream.WriteAsync(new byte[6 * 1024 * 1024]);
 
             // Simulates an internal buffer write error.
             await underlying.DisposeAsync();
 
             try
             {
-                await stream.WriteAsync(new ReadOnlyMemory<byte>(new byte[1024]));
+                await stream.WriteAsync(new byte[1024]);
+                Assert.Fail();
             }
             catch
             {
@@ -239,7 +240,6 @@ public async Task File_OpenWrite_FlushWithMultipartUpload()
             for (var i = 0; i < Count; i++)
                 await stream.WriteAsync(chunk);
         }
-
         {
             var file = fs.GetFile(FileName);
 
@@ -314,7 +314,7 @@ protected override DirectoryInfo GetDirectoryInfo() =>
 
     private AmazonS3FileSystem CreateFileSystem(string storageName)
     {
-        _list.Add(storageName);
+        _buckets.Add(storageName);
 
         return new AmazonS3FileSystem(
             new BasicAWSCredentials("rustfsadmin", "rustfsadmin"),

tests/Ramstack.FileSystem.Google.Tests/WritableGoogleFileSystemTests.cs

@@ -43,9 +43,9 @@ public async Task Cleanup()
             {
                 await fs.DeleteDirectoryAsync("/");
             }
-            catch (Exception exception)
+            catch (Exception e)
             {
-                Console.WriteLine(exception);
+                Console.WriteLine(e);
             }
         }
     }
@@ -60,22 +60,19 @@ public async Task File_OpenWrite_InternalBufferWriteError_DoesNotCreateFile()
             var underlying = (FileStream)stream.GetType().GetField("_stream", BindingFlags.NonPublic | BindingFlags.Instance)!.GetValue(stream)!;
             Assert.That(underlying, Is.Not.Null);
 
-            await stream.WriteAsync(new ReadOnlyMemory<byte>(new byte[1024]));
-
-            // Forces to upload buffer.
-            await stream.FlushAsync();
+            await stream.WriteAsync(new byte[1024]);
 
             // Simulates an internal buffer write error.
             await underlying.DisposeAsync();
 
             try
             {
-                await stream.WriteAsync(new ReadOnlyMemory<byte>(new byte[1024]));
+                await stream.WriteAsync(new byte[1024]);
+                Assert.Fail();
             }
-            catch (Exception exception)
+            catch
             {
-                Console.WriteLine("Exception expected!");
-                Console.WriteLine(exception);
+                // Ignore
             }
         }
 
@@ -160,6 +157,9 @@ public async Task File_CopyTo_File_DifferentFileSystems()
         Assert.That(
             await reader.ReadToEndAsync(),
             Is.EqualTo(content));
+
+        await source.DeleteAsync();
+        await destination.DeleteAsync();
     }
 
     [Test]
@@ -189,6 +189,9 @@ public async Task File_CopyTo_File_DifferentStorages()
         Assert.That(
             await reader.ReadToEndAsync(),
             Is.EqualTo(content));
+
+        await source.DeleteAsync();
+        await destination.DeleteAsync();
     }
 
     protected override GoogleFileSystem GetFileSystem() =>