Merge pull request #8227 from mono/backport-pr-8119-to-release-8.2

[release-8.2] [BuildOutput] Simplifies and removes delay cancellation in SearchCanBeCanceled test

1 files changed, 20 insertions, 3 deletions

diff --git a/main/tests/Ide.Tests/MonoDevelop.Ide/BuildOutputTests.cs b/main/tests/Ide.Tests/MonoDevelop.Ide/BuildOutputTests.cs
index a1ce9ac7e1..9b01d0495b 100644
--- a/main/tests/Ide.Tests/MonoDevelop.Ide/BuildOutputTests.cs
+++ b/main/tests/Ide.Tests/MonoDevelop.Ide/BuildOutputTests.cs
@@ -132,7 +132,7 @@ namespace MonoDevelop.Ide
 		}
 
 		[Test]
-		public async Task CustomProject_SearchCanBeCanceled ()
+		public async Task CustomProject_StressSearchCanBeCanceled ()
 		{
 			BuildOutputNode firstMatch = null;
 
@@ -142,13 +142,30 @@ namespace MonoDevelop.Ide
 			for (int i = 0; i < 100; i++) {
 				await Task.WhenAll (Task.Run (async () => firstMatch = await search.FirstMatch ("Message ")),
 									Task.Delay (100).ContinueWith (t => search.Cancel ()));
-
-				Assert.Null (firstMatch, "Got a first match while search was canceled");
 				Assert.True (search.IsCanceled, "Search was not canceled");
 			}
 		}
 
 		[Test]
+		public async Task CustomProject_SearchCanBeCanceled ()
+		{
+			var bo = GenerateCustomBuild (10);
+			var search = new BuildOutputDataSearch (bo.GetRootNodes (true));
+
+			var searchTask = search.FirstMatch ("Message ");
+			search.Cancel ();
+
+			var firstMatch = await searchTask;
+			Assert.Null (firstMatch, "Got a first match, but the canceled search did not expect records");
+			Assert.True (search.IsCanceled, "Search was not canceled, but we expect cancel the operation");
+
+			searchTask = search.FirstMatch ("Message ");
+			firstMatch = await searchTask;
+			Assert.NotNull (firstMatch, "No record was found in the search, but one was expected to be found.");
+			Assert.False (search.IsCanceled, "Search was canceled for some unexpected reason");
+		}
+
+		[Test]
 		public void BuildOutputNode_Search ()
 		{
 			var result = GetTestNodes ();