Lots of AsyncEx tests and docs

TheAngryByrd · Jul 4, 2023 · a7d83c4 · a7d83c4
1 parent 634ea90
commit a7d83c4
Show file tree

Hide file tree

Showing 8 changed files with 855 additions and 135 deletions.
diff --git a/src/IcedTasks/AsyncEx.fs b/src/IcedTasks/AsyncEx.fs
diff --git a/tests/IcedTasks.Tests/AsyncExTests.fs b/tests/IcedTasks.Tests/AsyncExTests.fs
diff --git a/tests/IcedTasks.Tests/CancellableTaskTests.fs b/tests/IcedTasks.Tests/CancellableTaskTests.fs
@@ -5,8 +5,9 @@ open Expecto
 open System.Threading
 open System.Threading.Tasks
 open IcedTasks
+#if NET7_0_OR_GREATER
 open IcedTasks.ValueTaskExtensions
-
+#endif
 module CancellableTaskTests =
     open System.Collections.Concurrent
     open TimeProviderExtensions
@@ -180,7 +181,7 @@ module CancellableTaskTests =
 
                     Expect.equal actual expected ""
                 }
-
+#if NET7_0_OR_GREATER
                 testCaseAsync "Can Bind Cancellable TaskLike"
                 <| async {
                     let fooTask = fun (ct: CancellationToken) -> Task.Yield()
@@ -197,7 +198,7 @@ module CancellableTaskTests =
                         |> Async.AwaitValueTask
                 // Compiling is sufficient expect
                 }
-
+#endif
                 testCaseAsync "Can Bind Task"
                 <| async {
                     let outerTask = cancellableTask { do! Task.CompletedTask }
@@ -395,6 +396,7 @@ module CancellableTaskTests =
                 }
 
 
+#if NET7_0_OR_GREATER
                 testCaseAsync "use IAsyncDisposable sync"
                 <| async {
                     let data = 42
@@ -486,7 +488,7 @@ module CancellableTaskTests =
                     Expect.equal actual data "Should be able to use use"
                     Expect.isTrue wasDisposed ""
                 }
-
+#endif
                 testCaseAsync "null"
                 <| async {
                     let data = 42
@@ -749,11 +751,11 @@ module CancellableTaskTests =
                                         TimeSpan.FromMilliseconds(100)
                                     )
 
-                                let t = fooTask cts.Token
+                                let runningTask = fooTask cts.Token
                                 do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
-                                Expect.equal t.IsCanceled false ""
+                                Expect.isFalse runningTask.IsCanceled ""
                                 do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
-                                do! t
+                                do! runningTask
                             }
                         )
 

diff --git a/tests/IcedTasks.Tests/CancellableValueTaskTests.fs b/tests/IcedTasks.Tests/CancellableValueTaskTests.fs
@@ -6,7 +6,9 @@ open System.Threading
 open System.Threading.Tasks
 open IcedTasks
 
+#if NET7_0_OR_GREATER
 module CancellableValueTaskTests =
+    open TimeProviderExtensions
 
     let builderTests =
         testList "CancellableValueTaskBuilder" [
@@ -759,21 +761,35 @@ module CancellableValueTaskTests =
                 testCaseAsync
                     "Can extract context's CancellationToken via CancellableValueTask.getCancellationToken in a deeply nested CE"
                 <| async {
+                    let timeProvider = ManualTimeProvider()
+
                     do!
                         Expect.CancellationRequested(
                             cancellableValueTask {
                                 let fooTask = cancellableValueTask {
                                     return! cancellableValueTask {
                                         do! cancellableValueTask {
                                             let! ct = CancellableValueTask.getCancellationToken ()
-                                            do! Task.Delay(1000, ct)
+
+                                            do!
+                                                timeProvider.Delay(
+                                                    TimeSpan.FromMilliseconds(1000),
+                                                    ct
+                                                )
                                         }
                                     }
                                 }
 
-                                use cts = new CancellationTokenSource()
-                                cts.CancelAfter(100)
-                                do! fooTask cts.Token
+                                use cts =
+                                    timeProvider.CreateCancellationTokenSource(
+                                        TimeSpan.FromMilliseconds(100)
+                                    )
+
+                                let runningTask = fooTask cts.Token
+                                do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
+                                Expect.isFalse runningTask.IsCanceled ""
+                                do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
+                                do! runningTask
                             }
                         )
 
@@ -1016,3 +1032,4 @@ module CancellableValueTaskTests =
             asyncBuilderTests
             functionTests
         ]
+#endif
diff --git a/tests/IcedTasks.Tests/ColdTaskTests.fs b/tests/IcedTasks.Tests/ColdTaskTests.fs
@@ -407,6 +407,7 @@ module ColdTaskTests =
                 }
 
 
+#if NET7_0_OR_GREATER
                 testCaseAsync "use IAsyncDisposable sync"
                 <| async {
                     let data = 42
@@ -498,7 +499,7 @@ module ColdTaskTests =
                     Expect.equal actual data "Should be able to use use"
                     Expect.isTrue wasDisposed ""
                 }
-
+#endif
                 testCaseAsync "null"
                 <| async {
                     let data = 42

diff --git a/tests/IcedTasks.Tests/Expect.fs b/tests/IcedTasks.Tests/Expect.fs
@@ -48,10 +48,11 @@ type Expect =
             (fun () -> operation)
             "Should have been cancelled"
 
+#if NET7_0_OR_GREATER
     static member CancellationRequested(operation: ValueTask<unit>) =
         Expect.CancellationRequested(Async.AwaitValueTask operation)
         |> Async.AsValueTask
-
+#endif
     static member CancellationRequested(operation: Task<_>) =
         Expect.CancellationRequested(Async.AwaitTask operation)
         |> Async.StartImmediateAsTask
@@ -64,10 +65,11 @@ type Expect =
         Expect.CancellationRequested(Async.AwaitCancellableTask operation)
         |> Async.AsCancellableTask
 
+#if NET7_0_OR_GREATER
     static member CancellationRequested(operation: CancellableValueTask<_>) =
         Expect.CancellationRequested(Async.AwaitCancellableValueTask operation)
         |> Async.AsCancellableTask
-
+#endif
 
 open TimeProviderExtensions
 open System.Runtime.CompilerServices
@@ -82,3 +84,15 @@ type ManualTimeProviderExtensions =
         do! Task.Yield()
         do! Task.Delay(5)
     }
+
+
+module CustomAwaiter =
+
+    type CustomAwaiter<'T>(onGetResult, onIsCompleted) =
+
+        member this.GetResult() : 'T = onGetResult ()
+        member this.IsCompleted: bool = onIsCompleted ()
+
+        interface ICriticalNotifyCompletion with
+            member this.UnsafeOnCompleted(continuation) = failwith "Not Implemented"
+            member this.OnCompleted(continuation: Action) : unit = failwith "Not Implemented"
diff --git a/tests/IcedTasks.Tests/IcedTasks.Tests.fsproj b/tests/IcedTasks.Tests/IcedTasks.Tests.fsproj
@@ -5,12 +5,16 @@
     <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../src/IcedTasks/IcedTasks.fsproj" />
-  </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+        <ProjectReference Include="../../src/IcedTasks/IcedTasks.fsproj" AdditionalProperties="TargetFramework=netstandard2.0" />
+    </ItemGroup>
+        <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
+        <ProjectReference Include="../../src/IcedTasks/IcedTasks.fsproj" />
+    </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Expect.fs" />
+    <Compile Include="AsyncExTests.fs" />
     <Compile Include="ValueTaskTests.fs" />
     <Compile Include="CancellableTaskTests.fs" />
     <Compile Include="CancellableValueTaskTests.fs" />

diff --git a/tests/IcedTasks.Tests/ValueTaskTests.fs b/tests/IcedTasks.Tests/ValueTaskTests.fs
@@ -5,7 +5,7 @@ open Expecto
 open System.Threading
 open System.Threading.Tasks
 open IcedTasks
-
+#if NET7_0
 
 module ValueTaskTests =
 
@@ -720,3 +720,5 @@ module ValueTaskTests =
             // asyncBuilderTests
             functionTests
         ]
+
+#endif