Use Assert.ThrowsAnyAsync

CommunityToolkit · Jan 29, 2025 · a9afa89 · a9afa89
1 parent 4167445
commit a9afa89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPopupHandler.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPopupHandler.cs
@@ -36,6 +36,6 @@ static void MapOnOpened(MockPopupHandler arg1, IPopup arg2, object? arg3)
 
 	static void MapOnClosed(MockPopupHandler handler, IPopup view, object? result)
 	{
-		view.HandlerCompleteTCS.SetResult();
+		view.HandlerCompleteTCS.TrySetResult();
 	}
 }
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs
@@ -57,7 +57,7 @@ public async Task ShowPopupAsync_CancellationTokenExpired()
 		// Ensure CancellationToken Has Expired
 		await Task.Delay(100, CancellationToken.None);
 
-		await Assert.ThrowsAsync<OperationCanceledException>(() => page.ShowPopupAsync(popup, cts.Token));
+		await Assert.ThrowsAnyAsync<OperationCanceledException>(() => page.ShowPopupAsync(popup, cts.Token));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
@@ -86,7 +86,7 @@ public async Task ShowPopupAsync_CancellationTokenCancelled()
 		// Ensure CancellationToken Has Expired
 		await cts.CancelAsync();
 
-		await Assert.ThrowsAsync<OperationCanceledException>(() => page.ShowPopupAsync(popup, cts.Token));
+		await Assert.ThrowsAnyAsync<OperationCanceledException>(() => page.ShowPopupAsync(popup, cts.Token));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
@@ -115,7 +115,7 @@ public async Task CloseAsync_CancellationTokenExpired()
 		// Ensure CancellationToken Has Expired
 		await Task.Delay(100, CancellationToken.None);
 
-		await Assert.ThrowsAsync<OperationCanceledException>(() => popup.CloseAsync(token: cts.Token));
+		await Assert.ThrowsAnyAsync<OperationCanceledException>(() => popup.CloseAsync(token: cts.Token));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
@@ -144,7 +144,7 @@ public async Task CloseAsync_CancellationTokenCancelled()
 		// Ensure CancellationToken Has Expired
 		await cts.CancelAsync();
 
-		await Assert.ThrowsAsync<OperationCanceledException>(() => popup.CloseAsync(token: cts.Token));
+		await Assert.ThrowsAnyAsync<OperationCanceledException>(() => popup.CloseAsync(token: cts.Token));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]