testSequencedGroup MergeSources

TheAngryByrd · Feb 7, 2024 · 133b88a · 133b88a
1 parent 07c12d4
commit 133b88a
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 17 deletions.
diff --git a/src/IcedTasks/TaskLike.fs b/src/IcedTasks/TaskLike.fs
@@ -2,6 +2,7 @@ namespace IcedTasks
 
 open System.Runtime.CompilerServices
 open Microsoft.FSharp.Core.CompilerServices
+open System.Threading
 
 /// <namespacedoc>
 ///   <summary>
@@ -18,6 +19,15 @@ type Awaiter<'Awaiter, 'TResult
     and 'Awaiter: (member get_IsCompleted: unit -> bool)
     and 'Awaiter: (member GetResult: unit -> 'TResult)> = 'Awaiter
 
+/// A structure that looks like an Awaiter that returns a Result type
+type AwaiterOfResult<'Awaiter, 'TResult, 'Error
+    when 'Awaiter :> ICriticalNotifyCompletion
+    and 'Awaiter: (member get_IsCompleted: unit -> bool)
+    and 'Awaiter: (member GetResult: unit -> Result<'TResult, 'Error>)> = 'Awaiter
+
+type CancellableAwaiter<'Awaiter, 'TResult when Awaiter<'Awaiter, 'TResult>> =
+    CancellationToken -> Awaiter<'Awaiter, 'TResult>
+
 /// Functions for Awaiters
 type Awaiter =
     /// Gets a value that indicates whether the asynchronous task has completed

diff --git a/tests/IcedTasks.Tests/CancellablePoolingValueTaskTests.fs b/tests/IcedTasks.Tests/CancellablePoolingValueTaskTests.fs
@@ -854,7 +854,8 @@ module CancellablePoolingValueTaskTests =
             ]
 
 
-            testList "MergeSources" [
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
 
                 testCaseAsync "and! cancellableTask x cancellableTask"
                 <| async {

diff --git a/tests/IcedTasks.Tests/CancellableTaskTests.fs b/tests/IcedTasks.Tests/CancellableTaskTests.fs
@@ -814,7 +814,8 @@ module CancellableTaskTests =
                 }
             ]
 
-            testList "MergeSources" [
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
 
                 testCaseAsync "and! cancellableTask x cancellableTask"
                 <| async {
@@ -888,7 +889,6 @@ module CancellableTaskTests =
                     Expect.equal actual 2 ""
                 }
 
-
                 testCaseAsync "and! awaitableUnit x awaitableT "
                 <| async {
                     let! actual =

diff --git a/tests/IcedTasks.Tests/CancellableValueTaskTests.fs b/tests/IcedTasks.Tests/CancellableValueTaskTests.fs
@@ -852,8 +852,8 @@ module CancellableValueTaskTests =
                 }
 
             ]
-
-            testList "MergeSources" [
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
 
                 testCaseAsync "and! cancellableTask x cancellableTask"
                 <| async {

diff --git a/tests/IcedTasks.Tests/ColdTaskTests.fs b/tests/IcedTasks.Tests/ColdTaskTests.fs
@@ -704,7 +704,8 @@ module ColdTaskTests =
                     )
             ]
 
-            testList "MergeSources" [
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
                 testCaseAsync "and! 5"
                 <| async {
                     let! actual =

diff --git a/tests/IcedTasks.Tests/ParallelAsyncTests.fs b/tests/IcedTasks.Tests/ParallelAsyncTests.fs
@@ -206,7 +206,8 @@ module ParallelAsyncTests =
                 }
             ]
 
-            testList "MergeSources" [
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
                 testCaseAsync "and!"
                 <| async {
                     let data = 42

diff --git a/tests/IcedTasks.Tests/PoolingValueTaskDynamicTests.fs b/tests/IcedTasks.Tests/PoolingValueTaskDynamicTests.fs
@@ -628,7 +628,8 @@ module PoolingValueTaskDynamicTests =
                     )
             ]
 
-            testList "MergeSources" [
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
 
                 testCaseAsync "and! task x task"
                 <| asyncEx {

diff --git a/tests/IcedTasks.Tests/PoolingValueTaskTests.fs b/tests/IcedTasks.Tests/PoolingValueTaskTests.fs
@@ -613,7 +613,8 @@ module PoolingValueTaskTests =
                     )
             ]
 
-            testList "MergeSources" [
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
 
                 testCaseAsync "and! task x task"
                 <| asyncEx {

diff --git a/tests/IcedTasks.Tests/TaskBackgroundTests.fs b/tests/IcedTasks.Tests/TaskBackgroundTests.fs
@@ -615,7 +615,9 @@ module TaskBackgroundTests =
                     )
 
             ]
-            testList "MergeSources" [
+
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
 
                 testCaseAsync "and! task x task"
                 <| asyncEx {

diff --git a/tests/IcedTasks.Tests/TaskDynamicTests.fs b/tests/IcedTasks.Tests/TaskDynamicTests.fs
@@ -628,14 +628,14 @@ module TaskDynamicTests =
 
             ]
 
-            testList "MergeSources" [
-
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
                 testCaseAsync "and! task x task"
                 <| asyncEx {
                     let! actual =
                         dTask {
-                            let! a = dTask { return 1 }
-                            and! b = dTask { return 2 }
+                            let! a = task { return 1 }
+                            and! b = task { return 2 }
                             return a + b
                         }
 

diff --git a/tests/IcedTasks.Tests/TaskTests.fs b/tests/IcedTasks.Tests/TaskTests.fs
@@ -616,7 +616,8 @@ module TaskTests =
 
             ]
 
-            testList "MergeSources" [
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
 
                 testCaseAsync "and! task x task"
                 <| asyncEx {

diff --git a/tests/IcedTasks.Tests/ValueTaskDynamicTests.fs b/tests/IcedTasks.Tests/ValueTaskDynamicTests.fs
@@ -626,7 +626,9 @@ module ValueTaskDynamicTests =
                     )
 
             ]
-            testList "MergeSources" [
+
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
 
                 testCaseAsync "and! task x task"
                 <| asyncEx {

diff --git a/tests/IcedTasks.Tests/ValueTaskTests.fs b/tests/IcedTasks.Tests/ValueTaskTests.fs
@@ -615,7 +615,8 @@ module ValueTaskTests =
 
             ]
 
-            testList "MergeSources" [
+            testSequencedGroup "MergeSources"
+            <| testList "MergeSources" [
 
                 testCaseAsync "and! task x task"
                 <| asyncEx {