refactor: avoid blocking in tests (#598)

* Avoid async methods in `Task.Run` in tests * Make `FileStream.ReadTests` and `FileStream.WriteTests` part of the sequentially executed tests * Set `EnableRaisingEvents` in `FileSystemWatcherStatisticsTests`
Testably · May 13, 2024 · 64be166 · 64be166
1 parent 17578f7
commit 64be166
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 36 deletions.
diff --git a/Tests/Testably.Abstractions.Testing.Tests/NotificationTests.cs b/Tests/Testably.Abstractions.Testing.Tests/NotificationTests.cs
@@ -19,13 +19,13 @@ public void AwaitableCallback_Amount_ShouldOnlyReturnAfterNumberOfCallbacks()
 				}
 			});
 
-		_ = Task.Run(async () =>
+		_ = Task.Run(() =>
 		{
-			await Task.Delay(10);
+			Thread.Sleep(10);
 			for (int i = 1; i <= 10; i++)
 			{
 				timeSystem.Thread.Sleep(i);
-				await Task.Delay(1);
+				Thread.Sleep(1);
 			}
 		});
 
@@ -82,13 +82,13 @@ public void AwaitableCallback_Filter_ShouldOnlyUpdateAfterFilteredValue()
 				receivedCount++;
 			});
 
-		_ = Task.Run(async () =>
+		_ = Task.Run(() =>
 		{
-			await Task.Delay(10);
+			Thread.Sleep(10);
 			for (int i = 1; i <= 10; i++)
 			{
 				timeSystem.Thread.Sleep(i);
-				await Task.Delay(1);
+				Thread.Sleep(1);
 			}
 		});
 
@@ -107,16 +107,16 @@ public void AwaitableCallback_Predicate_ShouldOnlyUpdateAfterFilteredValue()
 			receivedCount++;
 		}, t => t.TotalMilliseconds > 6);
 
-		_ = Task.Run(async () =>
+		_ = Task.Run(() =>
 		{
 			// ReSharper disable once AccessToDisposedClosure
 			try
 			{
-				await Task.Delay(10);
+				Thread.Sleep(10);
 				for (int i = 1; i <= 10; i++)
 				{
 					timeSystem.Thread.Sleep(i);
-					await Task.Delay(1);
+					Thread.Sleep(1);
 				}
 
 				ms.Set();
@@ -145,15 +145,15 @@ public void AwaitableCallback_ShouldWaitForCallbackExecution()
 					isCalled = true;
 				});
 
-			_ = Task.Run(async () =>
+			_ = Task.Run(() =>
 			{
 				// ReSharper disable once AccessToDisposedClosure
 				try
 				{
 					while (!ms.IsSet)
 					{
 						timeSystem.Thread.Sleep(1);
-						await Task.Delay(1);
+						Thread.Sleep(1);
 					}
 				}
 				catch (ObjectDisposedException)

diff --git a/...ably.Abstractions.Testing.Tests/Statistics/FileSystem/FileSystemWatcherStatisticsTests.cs b/...ably.Abstractions.Testing.Tests/Statistics/FileSystem/FileSystemWatcherStatisticsTests.cs
@@ -44,18 +44,19 @@ public void Method_WaitForChanged_WatcherChangeTypes_Int_ShouldRegisterCall()
 		sut.Initialize().WithSubdirectory("foo");
 		using IFileSystemWatcher fileSystemWatcher = sut.FileSystemWatcher.New("foo");
 		// Changes in the background are necessary, so that FileSystemWatcher.WaitForChanged returns.
-		using CancellationTokenSource cts = new(TimeSpan.FromSeconds(1));
+		using CancellationTokenSource cts = new(TimeSpan.FromSeconds(30));
 		CancellationToken token = cts.Token;
-		_ = Task.Run(async () =>
+		_ = Task.Run(() =>
 		{
 			while (!token.IsCancellationRequested)
 			{
-				await Task.Delay(10, token);
+				Thread.Sleep(10);
 				sut.Directory.CreateDirectory(sut.Path.Combine("foo", "some-directory"));
 				sut.Directory.Delete(sut.Path.Combine("foo", "some-directory"));
 			}
 		}, token);
 		WatcherChangeTypes changeType = WatcherChangeTypes.Created;
+		fileSystemWatcher.EnableRaisingEvents = true;
 		int timeout = 42;
 
 		fileSystemWatcher.WaitForChanged(changeType, timeout);
@@ -73,18 +74,19 @@ public void Method_WaitForChanged_WatcherChangeTypes_ShouldRegisterCall()
 		sut.Initialize().WithSubdirectory("foo");
 		using IFileSystemWatcher fileSystemWatcher = sut.FileSystemWatcher.New("foo");
 		// Changes in the background are necessary, so that FileSystemWatcher.WaitForChanged returns.
-		using CancellationTokenSource cts = new(TimeSpan.FromSeconds(1));
+		using CancellationTokenSource cts = new();
 		CancellationToken token = cts.Token;
-		_ = Task.Run(async () =>
+		_ = Task.Run(() =>
 		{
 			while (!token.IsCancellationRequested)
 			{
-				await Task.Delay(10, token);
+				Thread.Sleep(10);
 				sut.Directory.CreateDirectory(sut.Path.Combine("foo", "some-directory"));
 				sut.Directory.Delete(sut.Path.Combine("foo", "some-directory"));
 			}
 		}, token);
 		WatcherChangeTypes changeType = WatcherChangeTypes.Created;
+		fileSystemWatcher.EnableRaisingEvents = true;
 
 		fileSystemWatcher.WaitForChanged(changeType);
 		cts.Cancel();
@@ -101,18 +103,19 @@ public void Method_WaitForChanged_WatcherChangeTypes_TimeSpan_ShouldRegisterCall
 		sut.Initialize().WithSubdirectory("foo");
 		using IFileSystemWatcher fileSystemWatcher = sut.FileSystemWatcher.New("foo");
 		// Changes in the background are necessary, so that FileSystemWatcher.WaitForChanged returns.
-		using CancellationTokenSource cts = new(TimeSpan.FromSeconds(1));
+		using CancellationTokenSource cts = new(TimeSpan.FromSeconds(30));
 		CancellationToken token = cts.Token;
-		_ = Task.Run(async () =>
+		_ = Task.Run(() =>
 		{
 			while (!token.IsCancellationRequested)
 			{
-				await Task.Delay(10, token);
+				Thread.Sleep(10);
 				sut.Directory.CreateDirectory(sut.Path.Combine("foo", "some-directory"));
 				sut.Directory.Delete(sut.Path.Combine("foo", "some-directory"));
 			}
 		}, token);
 		WatcherChangeTypes changeType = WatcherChangeTypes.Created;
+		fileSystemWatcher.EnableRaisingEvents = true;
 		TimeSpan timeout = TimeSpan.FromSeconds(2);
 
 		fileSystemWatcher.WaitForChanged(changeType, timeout);

diff --git a/Tests/Testably.Abstractions.Tests/FileSystem/FileStream/ReadTests.cs b/Tests/Testably.Abstractions.Tests/FileSystem/FileStream/ReadTests.cs
@@ -6,6 +6,7 @@
 namespace Testably.Abstractions.Tests.FileSystem.FileStream;
 
 // ReSharper disable once PartialTypeWithSinglePart
+[Collection("RealFileSystemTests")]
 public abstract partial class ReadTests<TFileSystem>
 	: FileSystemTestBase<TFileSystem>
 	where TFileSystem : IFileSystem

diff --git a/Tests/Testably.Abstractions.Tests/FileSystem/FileStream/WriteTests.cs b/Tests/Testably.Abstractions.Tests/FileSystem/FileStream/WriteTests.cs
@@ -7,6 +7,7 @@
 namespace Testably.Abstractions.Tests.FileSystem.FileStream;
 
 // ReSharper disable once PartialTypeWithSinglePart
+[Collection("RealFileSystemTests")]
 public abstract partial class WriteTests<TFileSystem>
 	: FileSystemTestBase<TFileSystem>
 	where TFileSystem : IFileSystem

diff --git a/Tests/Testably.Abstractions.Tests/FileSystem/FileSystemWatcher/EventTests.cs b/Tests/Testably.Abstractions.Tests/FileSystem/FileSystemWatcher/EventTests.cs
@@ -38,7 +38,7 @@ void FileSystemWatcherOnChanged(object sender, FileSystemEventArgs e)
 
 		try
 		{
-			_ = Task.Run(async () =>
+			_ = Task.Run(() =>
 			{
 				// ReSharper disable once AccessToDisposedClosure
 				try
@@ -48,7 +48,7 @@ void FileSystemWatcherOnChanged(object sender, FileSystemEventArgs e)
 					{
 						FileSystem.File.WriteAllText(path,
 							i++.ToString(CultureInfo.InvariantCulture));
-						await Task.Delay(10);
+						Thread.Sleep(10);
 					}
 				}
 				catch (IOException)
@@ -104,7 +104,7 @@ void FileSystemWatcherOnCreated(object sender, FileSystemEventArgs e)
 
 		try
 		{
-			_ = Task.Run(async () =>
+			_ = Task.Run(() =>
 			{
 				// ReSharper disable once AccessToDisposedClosure
 				try
@@ -113,7 +113,7 @@ void FileSystemWatcherOnCreated(object sender, FileSystemEventArgs e)
 					{
 						FileSystem.Directory.CreateDirectory(path);
 						FileSystem.Directory.Delete(path);
-						await Task.Delay(10);
+						Thread.Sleep(10);
 					}
 				}
 				catch (ObjectDisposedException)
@@ -166,7 +166,7 @@ void FileSystemWatcherOnDeleted(object sender, FileSystemEventArgs e)
 
 		try
 		{
-			_ = Task.Run(async () =>
+			_ = Task.Run(() =>
 			{
 				// ReSharper disable once AccessToDisposedClosure
 				try
@@ -175,7 +175,7 @@ void FileSystemWatcherOnDeleted(object sender, FileSystemEventArgs e)
 					{
 						FileSystem.Directory.CreateDirectory(path);
 						FileSystem.Directory.Delete(path);
-						await Task.Delay(10);
+						Thread.Sleep(10);
 					}
 				}
 				catch (ObjectDisposedException)
@@ -229,7 +229,7 @@ void FileSystemWatcherOnRenamed(object sender, FileSystemEventArgs e)
 
 		try
 		{
-			_ = Task.Run(async () =>
+			_ = Task.Run(() =>
 			{
 				// ReSharper disable once AccessToDisposedClosure
 				try
@@ -239,7 +239,7 @@ void FileSystemWatcherOnRenamed(object sender, FileSystemEventArgs e)
 					while (!ms.IsSet)
 					{
 						FileSystem.File.Move($"path-{i}", $"path-{++i}");
-						await Task.Delay(10);
+						Thread.Sleep(10);
 					}
 				}
 				catch (ObjectDisposedException)

diff --git a/Tests/Testably.Abstractions.Tests/FileSystem/FileSystemWatcher/Tests.cs b/Tests/Testably.Abstractions.Tests/FileSystem/FileSystemWatcher/Tests.cs
@@ -28,14 +28,14 @@ public void BeginInit_ShouldStopListening(string path)
 		fileSystemWatcher.EnableRaisingEvents.Should().BeTrue();
 		try
 		{
-			_ = Task.Run(async () =>
+			_ = Task.Run(() =>
 			{
 				// ReSharper disable once AccessToDisposedClosure
 				try
 				{
 					while (!ms.IsSet)
 					{
-						await Task.Delay(10);
+						Thread.Sleep(10);
 						FileSystem.Directory.CreateDirectory(path);
 						FileSystem.Directory.Delete(path);
 					}
@@ -86,14 +86,14 @@ public void EndInit_ShouldRestartListening(string path)
 		fileSystemWatcher.EnableRaisingEvents.Should().BeTrue();
 		try
 		{
-			_ = Task.Run(async () =>
+			_ = Task.Run(() =>
 			{
 				// ReSharper disable once AccessToDisposedClosure
 				try
 				{
 					while (!ms.IsSet)
 					{
-						await Task.Delay(10);
+						Thread.Sleep(10);
 						FileSystem.Directory.CreateDirectory(path);
 						FileSystem.Directory.Delete(path);
 					}

diff --git a/Tests/Testably.Abstractions.Tests/FileSystem/FileSystemWatcher/WaitForChangedTests.cs b/Tests/Testably.Abstractions.Tests/FileSystem/FileSystemWatcher/WaitForChangedTests.cs
@@ -19,14 +19,14 @@ public void WaitForChanged_ShouldBlockUntilEventHappens(string path)
 			FileSystem.FileSystemWatcher.New(BasePath);
 		try
 		{
-			_ = Task.Run(async () =>
+			_ = Task.Run(() =>
 			{
 				// ReSharper disable once AccessToDisposedClosure
 				try
 				{
 					while (!ms.IsSet)
 					{
-						await Task.Delay(10);
+						Thread.Sleep(10);
 						FileSystem.Directory.CreateDirectory(path);
 						FileSystem.Directory.Delete(path);
 					}
@@ -68,14 +68,14 @@ public void WaitForChanged_ShouldBlockUntilEventHappens(string path)
 		try
 		{
 			fileSystemWatcher.EnableRaisingEvents = true;
-			_ = Task.Run(async () =>
+			_ = Task.Run(() =>
 			{
 				// ReSharper disable once AccessToDisposedClosure
 				try
 				{
 					while (!ms.IsSet)
 					{
-						await Task.Delay(10);
+						Thread.Sleep(10);
 						FileSystem.Directory.CreateDirectory(fullPath);
 						FileSystem.Directory.Delete(fullPath);
 					}