@@ -8,16 +8,13 @@ public sealed class SpawningAsyncTaskMethodBuilderTests : Test
88 [ Fact ]
99 public static async Task ForkAsyncMethodWithResult ( )
1010 {
11- using var resetEvent = new ManualResetEventSlim ( initialState : false ) ;
12- var task = Sum ( 40 , 2 , Thread . CurrentThread . ManagedThreadId ) ;
13- True ( resetEvent . Wait ( DefaultTimeout ) ) ;
11+ var task = Fork ( static ( ) => Sum ( 40 , 2 , Thread . CurrentThread . ManagedThreadId ) ) ;
1412
1513 Equal ( 42 , await task ) ;
1614
1715 [ AsyncMethodBuilder ( typeof ( SpawningAsyncTaskMethodBuilder < > ) ) ]
18- async Task < int > Sum ( int x , int y , int callerThreadId )
16+ static async Task < int > Sum ( int x , int y , int callerThreadId )
1917 {
20- resetEvent . Set ( ) ;
2118 NotEqual ( callerThreadId , Thread . CurrentThread . ManagedThreadId ) ;
2219
2320 await Task . CompletedTask ;
@@ -26,18 +23,13 @@ async Task<int> Sum(int x, int y, int callerThreadId)
2623 }
2724
2825 [ Fact ]
29- public static async Task ForkAsyncMethodWithoutResult ( )
26+ public static Task ForkAsyncMethodWithoutResult ( )
3027 {
31- using var resetEvent = new ManualResetEventSlim ( initialState : false ) ;
32- var task = CheckThreadId ( Thread . CurrentThread . ManagedThreadId ) ;
33- True ( resetEvent . Wait ( DefaultTimeout ) ) ;
34-
35- await task ;
28+ return Fork ( static ( ) => CheckThreadId ( Thread . CurrentThread . ManagedThreadId ) ) ;
3629
3730 [ AsyncMethodBuilder ( typeof ( SpawningAsyncTaskMethodBuilder ) ) ]
38- async Task CheckThreadId ( int callerThreadId )
31+ static async Task CheckThreadId ( int callerThreadId )
3932 {
40- resetEvent . Set ( ) ;
4133 NotEqual ( callerThreadId , Thread . CurrentThread . ManagedThreadId ) ;
4234
4335 await Task . CompletedTask ;
@@ -47,17 +39,14 @@ async Task CheckThreadId(int callerThreadId)
4739 [ Fact ]
4840 public static async Task CancellationOfSpawnedMethod ( )
4941 {
50- using var resetEvent = new ManualResetEventSlim ( initialState : false ) ;
51- var task = CheckThreadId ( Thread . CurrentThread . ManagedThreadId , new ( true ) ) ;
52- True ( resetEvent . Wait ( DefaultTimeout ) ) ;
42+ var task = Fork ( static ( ) => CheckThreadId ( Thread . CurrentThread . ManagedThreadId , new ( true ) ) ) ;
5343
5444 await task . ConfigureAwait ( ConfigureAwaitOptions . ContinueOnCapturedContext | ConfigureAwaitOptions . SuppressThrowing ) ;
5545 True ( task . IsCanceled ) ;
5646
5747 [ AsyncMethodBuilder ( typeof ( SpawningAsyncTaskMethodBuilder ) ) ]
58- async Task CheckThreadId ( int callerThreadId , CancellationToken token )
48+ static async Task CheckThreadId ( int callerThreadId , CancellationToken token )
5949 {
60- resetEvent . Set ( ) ;
6150 NotEqual ( callerThreadId , Thread . CurrentThread . ManagedThreadId ) ;
6251
6352 await Task . Delay ( DefaultTimeout , token ) ;
0 commit comments