Skip to content

Commit e0975fa

Browse files
committed
Merge branch 'feature/issue-305-parallel-async-result-validation' of https://github.com/njlr/FsToolkit.ErrorHandling into feature/issue-305-parallel-async-result-validation
2 parents c430e17 + 005a3fb commit e0975fa

22 files changed

+344
-433
lines changed

FsToolkit.ErrorHandling.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D8B86171
1111
EndProject
1212
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.Tests", "tests\FsToolkit.ErrorHandling.Tests\FsToolkit.ErrorHandling.Tests.fsproj", "{F646F4E8-EA06-4EA8-9CD3-79778B264320}"
1313
EndProject
14-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.TaskResult.Tests", "tests\FsToolkit.ErrorHandling.TaskResult.Tests\FsToolkit.ErrorHandling.TaskResult.Tests.fsproj", "{868CA980-5903-480E-8360-C51F5EC83275}"
15-
EndProject
1614
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.JobResult", "src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj", "{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E}"
1715
EndProject
1816
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.JobResult.Tests", "tests\FsToolkit.ErrorHandling.JobResult.Tests\FsToolkit.ErrorHandling.JobResult.Tests.fsproj", "{7DABAB8F-4A02-4992-A3A2-6C550F98C13B}"
@@ -70,18 +68,6 @@ Global
7068
{F646F4E8-EA06-4EA8-9CD3-79778B264320}.Release|x64.Build.0 = Release|Any CPU
7169
{F646F4E8-EA06-4EA8-9CD3-79778B264320}.Release|x86.ActiveCfg = Release|Any CPU
7270
{F646F4E8-EA06-4EA8-9CD3-79778B264320}.Release|x86.Build.0 = Release|Any CPU
73-
{868CA980-5903-480E-8360-C51F5EC83275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74-
{868CA980-5903-480E-8360-C51F5EC83275}.Debug|Any CPU.Build.0 = Debug|Any CPU
75-
{868CA980-5903-480E-8360-C51F5EC83275}.Debug|x64.ActiveCfg = Debug|Any CPU
76-
{868CA980-5903-480E-8360-C51F5EC83275}.Debug|x64.Build.0 = Debug|Any CPU
77-
{868CA980-5903-480E-8360-C51F5EC83275}.Debug|x86.ActiveCfg = Debug|Any CPU
78-
{868CA980-5903-480E-8360-C51F5EC83275}.Debug|x86.Build.0 = Debug|Any CPU
79-
{868CA980-5903-480E-8360-C51F5EC83275}.Release|Any CPU.ActiveCfg = Release|Any CPU
80-
{868CA980-5903-480E-8360-C51F5EC83275}.Release|Any CPU.Build.0 = Release|Any CPU
81-
{868CA980-5903-480E-8360-C51F5EC83275}.Release|x64.ActiveCfg = Release|Any CPU
82-
{868CA980-5903-480E-8360-C51F5EC83275}.Release|x64.Build.0 = Release|Any CPU
83-
{868CA980-5903-480E-8360-C51F5EC83275}.Release|x86.ActiveCfg = Release|Any CPU
84-
{868CA980-5903-480E-8360-C51F5EC83275}.Release|x86.Build.0 = Release|Any CPU
8571
{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8672
{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E}.Debug|Any CPU.Build.0 = Debug|Any CPU
8773
{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -206,7 +192,6 @@ Global
206192
GlobalSection(NestedProjects) = preSolution
207193
{E0466000-F8E4-416B-B605-C65F7602367A} = {E28025A7-EF6A-45BF-8FA0-75E394D3D42B}
208194
{F646F4E8-EA06-4EA8-9CD3-79778B264320} = {D8B86171-2147-49EF-8ADA-1CF8B0A20D40}
209-
{868CA980-5903-480E-8360-C51F5EC83275} = {D8B86171-2147-49EF-8ADA-1CF8B0A20D40}
210195
{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E} = {E28025A7-EF6A-45BF-8FA0-75E394D3D42B}
211196
{7DABAB8F-4A02-4992-A3A2-6C550F98C13B} = {D8B86171-2147-49EF-8ADA-1CF8B0A20D40}
212197
{600EA6E9-C9F2-4F02-99EF-1F992711DB1C} = {9F888E39-5D40-4E29-9529-67C466722431}

tests/FsToolkit.ErrorHandling.IcedTasks.Tests/FsToolkit.ErrorHandling.IcedTasks.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Compile Include="SampleDomain.fs" />
1010
<Compile Include="TestData.fs" />
1111
<Compile Include="Expect.fs" />
12-
<Compile Include="../FsToolkit.ErrorHandling.TaskResult.Tests/Expecto.fs" />
12+
<Compile Include="../FsToolkit.ErrorHandling.Tests/Expecto.fs" />
1313
<Compile Include="CancellableTaskResultCE.fs" />
1414
<Compile Include="CancellableTaskValidationCE.fs" />
1515
<Compile Include="Main.fs" />

tests/FsToolkit.ErrorHandling.TaskResult.Tests/AssemblyInfo.fs

Lines changed: 0 additions & 19 deletions
This file was deleted.

tests/FsToolkit.ErrorHandling.TaskResult.Tests/FsToolkit.ErrorHandling.TaskResult.Tests.fsproj

Lines changed: 0 additions & 32 deletions
This file was deleted.

tests/FsToolkit.ErrorHandling.TaskResult.Tests/List.fs

Lines changed: 0 additions & 172 deletions
This file was deleted.

tests/FsToolkit.ErrorHandling.TaskResult.Tests/Main.fs

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/FsToolkit.ErrorHandling.TaskResult.Tests/Result.fs

Lines changed: 0 additions & 33 deletions
This file was deleted.

tests/FsToolkit.ErrorHandling.TaskResult.Tests/paket.references

Lines changed: 0 additions & 9 deletions
This file was deleted.

tests/FsToolkit.ErrorHandling.TaskResult.Tests/BackgroundTaskOptionCE.fs renamed to tests/FsToolkit.ErrorHandling.Tests/BackgroundTaskOptionCE.fs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ let makeDisposable () =
99
member this.Dispose() = ()
1010
}
1111

12-
[<Tests>]
1312
let ceTests =
1413
testList "Background TaskOption CE" [
1514
testCaseTask "Return value"
@@ -431,7 +430,6 @@ let specialCaseTask returnValue =
431430
Task.FromResult returnValue
432431
#endif
433432

434-
[<Tests>]
435433
let ceTestsApplicative =
436434
testList "BackgroundTaskOptionCE applicative tests" [
437435
testCaseTask "Happy Path Option/AsyncOption/Ply/ValueTask"
@@ -480,7 +478,6 @@ let ceTestsApplicative =
480478
}
481479
]
482480

483-
[<Tests>]
484481
let ``BackgroundTaskOptionCE inference checks`` =
485482
testList "BackgroundTaskOptionCE inference checks" [
486483
testCase "Inference checks"
@@ -491,3 +488,10 @@ let ``BackgroundTaskOptionCE inference checks`` =
491488
f (TaskOption.some ())
492489
|> ignore
493490
]
491+
492+
let allTests =
493+
testList "BackgroundTaskOptionCE CE Tests" [
494+
ceTests
495+
ceTestsApplicative
496+
``BackgroundTaskOptionCE inference checks``
497+
]

0 commit comments

Comments
 (0)