Avoid delays in async and cancellation tests

Author: captainsafia

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/DocumentTransformerTests.cs

@@ -249,13 +249,14 @@ public async Task DocumentTransformer_RespectsOperationCancellation()
         var options = new OpenApiOptions();
         var transformerCalled = false;
         var exceptionThrown = false;
+        var tcs = new TaskCompletionSource();
 
         options.AddDocumentTransformer(async (document, context, cancellationToken) =>
         {
             transformerCalled = true;
             try
             {
-                await Task.Delay(5000, cancellationToken);
+                await tcs.Task.WaitAsync(cancellationToken);
                 document.Info.Description = "Should not be set";
             }
             catch (OperationCanceledException)
@@ -266,7 +267,7 @@ public async Task DocumentTransformer_RespectsOperationCancellation()
         });
 
         using var cts = new CancellationTokenSource();
-        cts.CancelAfter(100);
+        cts.CancelAfter(1);
 
         await Assert.ThrowsAsync<TaskCanceledException>(async () =>
         {
@@ -287,7 +288,6 @@ public async Task DocumentTransformer_ExecutesAsynchronously()
         var transformerOrder = new List<int>();
         var tcs1 = new TaskCompletionSource();
         var tcs2 = new TaskCompletionSource();
-        var tcs2Called = false;
 
         options.AddDocumentTransformer(async (document, context, cancellationToken) =>
         {
@@ -300,11 +300,7 @@ public async Task DocumentTransformer_ExecutesAsynchronously()
         {
             transformerOrder.Add(2);
             document.Info.Title += " Second";
-            if (!tcs2Called)
-            {
-                tcs2Called = true;
-                tcs2.TrySetResult();
-            }
+            tcs2.TrySetResult();
             return Task.CompletedTask;
         });
 
@@ -320,7 +316,7 @@ public async Task DocumentTransformer_ExecutesAsynchronously()
             Assert.Equal("First Second Third", document.Info.Title);
         });
 
-        await Task.Delay(100);
+        await Task.Yield();
         tcs1.TrySetResult();
 
         await documentTask;

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/OperationTransformerTests.cs

@@ -580,13 +580,14 @@ public async Task OperationTransformer_RespectsOperationCancellation()
         var options = new OpenApiOptions();
         var transformerCalled = false;
         var exceptionThrown = false;
+        var tcs = new TaskCompletionSource();
 
         options.AddOperationTransformer(async (operation, context, cancellationToken) =>
         {
             transformerCalled = true;
             try
             {
-                await Task.Delay(5000, cancellationToken);
+                await tcs.Task.WaitAsync(cancellationToken);
                 operation.Description = "Should not be set";
             }
             catch (OperationCanceledException)
@@ -597,7 +598,7 @@ public async Task OperationTransformer_RespectsOperationCancellation()
         });
 
         using var cts = new CancellationTokenSource();
-        cts.CancelAfter(100);
+        cts.CancelAfter(1);
 
         await Assert.ThrowsAsync<TaskCanceledException>(async () =>
         {
@@ -647,7 +648,7 @@ public async Task OperationTransformer_ExecutesAsynchronously()
             Assert.Equal("First Second Third", operation.Description);
         });
 
-        await Task.Delay(100);
+        await Task.Yield();
         tcs1.TrySetResult();
 
         await documentTask;

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/SchemaTransformerTests.cs

@@ -857,13 +857,15 @@ public async Task SchemaTransformer_RespectsOperationCancellation()
         var options = new OpenApiOptions();
         var transformerCalled = false;
         var exceptionThrown = false;
+        var tcs = new TaskCompletionSource();
 
+        //Assert that transformers wait for completion signal from sibling tasks before running
         options.AddSchemaTransformer(async (schema, context, cancellationToken) =>
         {
             transformerCalled = true;
             try
             {
-                await Task.Delay(5000, cancellationToken);
+                await tcs.Task.WaitAsync(cancellationToken);
                 schema.Description = "Should not be set";
             }
             catch (OperationCanceledException)
@@ -874,7 +876,7 @@ public async Task SchemaTransformer_RespectsOperationCancellation()
         });
 
         using var cts = new CancellationTokenSource();
-        cts.CancelAfter(100);
+        cts.CancelAfter(1);
 
         await Assert.ThrowsAsync<TaskCanceledException>(async () =>
         {
@@ -896,7 +898,6 @@ public async Task SchemaTransformer_ExecutesAsynchronously()
         var tcs1 = new TaskCompletionSource();
         var tcs2 = new TaskCompletionSource();
 
-        // Assert that transformers wait for completion signal from sibling tasks before running
         options.AddSchemaTransformer(async (schema, context, cancellationToken) =>
         {
             await tcs1.Task;
@@ -926,7 +927,7 @@ public async Task SchemaTransformer_ExecutesAsynchronously()
             Assert.Equal("First Second Third", schema.Description);
         });
 
-        await Task.Delay(100);
+        await Task.Yield();
         tcs1.TrySetResult();
 
         await documentTask;