Merge TaskResult.Tests into FsToolkit.ErrorHandling.Tests (#314)

* Merge FsToolkit.ErrorHandling.TaskResult.Tests into FsToolkit.ErrorHandling.Tests

Merge FsToolkit.ErrorHandling.TaskResult.Tests into FsToolkit.ErrorHandling.Tests

Merge FsToolkit.ErrorHandling.TaskResult.Tests into FsToolkit.ErrorHandling.Tests

* Fix NpmTest target tests

* Fix more NpmTest target tests

* Fix formatting

* Restore some errantly omitted tests for TaskResult

Author: tw0po1nt

FsToolkit.ErrorHandling.sln

@@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D8B86171
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.Tests", "tests\FsToolkit.ErrorHandling.Tests\FsToolkit.ErrorHandling.Tests.fsproj", "{F646F4E8-EA06-4EA8-9CD3-79778B264320}"
 EndProject
-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}"
-EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsToolkit.ErrorHandling.JobResult", "src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj", "{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E}"
 EndProject
 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
 		{F646F4E8-EA06-4EA8-9CD3-79778B264320}.Release|x64.Build.0 = Release|Any CPU
 		{F646F4E8-EA06-4EA8-9CD3-79778B264320}.Release|x86.ActiveCfg = Release|Any CPU
 		{F646F4E8-EA06-4EA8-9CD3-79778B264320}.Release|x86.Build.0 = Release|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Debug|x64.Build.0 = Debug|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Debug|x86.Build.0 = Debug|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Release|Any CPU.Build.0 = Release|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Release|x64.ActiveCfg = Release|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Release|x64.Build.0 = Release|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Release|x86.ActiveCfg = Release|Any CPU
-		{868CA980-5903-480E-8360-C51F5EC83275}.Release|x86.Build.0 = Release|Any CPU
 		{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -206,7 +192,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{E0466000-F8E4-416B-B605-C65F7602367A} = {E28025A7-EF6A-45BF-8FA0-75E394D3D42B}
 		{F646F4E8-EA06-4EA8-9CD3-79778B264320} = {D8B86171-2147-49EF-8ADA-1CF8B0A20D40}
-		{868CA980-5903-480E-8360-C51F5EC83275} = {D8B86171-2147-49EF-8ADA-1CF8B0A20D40}
 		{5B1EA296-538E-40E5-BF1D-6CB0F20BB52E} = {E28025A7-EF6A-45BF-8FA0-75E394D3D42B}
 		{7DABAB8F-4A02-4992-A3A2-6C550F98C13B} = {D8B86171-2147-49EF-8ADA-1CF8B0A20D40}
 		{600EA6E9-C9F2-4F02-99EF-1F992711DB1C} = {9F888E39-5D40-4E29-9529-67C466722431}

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

@@ -9,7 +9,7 @@
         <Compile Include="SampleDomain.fs" />
         <Compile Include="TestData.fs" />
         <Compile Include="Expect.fs" />
-        <Compile Include="../FsToolkit.ErrorHandling.TaskResult.Tests/Expecto.fs" />
+        <Compile Include="../FsToolkit.ErrorHandling.Tests/Expecto.fs" />
         <Compile Include="CancellableTaskResultCE.fs" />
         <Compile Include="CancellableTaskValidationCE.fs" />
         <Compile Include="Main.fs" />

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

@@ -9,7 +9,6 @@ let makeDisposable () =
         member this.Dispose() = ()
     }
 
-[<Tests>]
 let ceTests =
     testList "Background TaskOption CE" [
         testCaseTask "Return value"
@@ -431,7 +430,6 @@ let specialCaseTask returnValue =
     Task.FromResult returnValue
 #endif
 
-[<Tests>]
 let ceTestsApplicative =
     testList "BackgroundTaskOptionCE applicative tests" [
         testCaseTask "Happy Path Option/AsyncOption/Ply/ValueTask"
@@ -480,7 +478,6 @@ let ceTestsApplicative =
             }
     ]
 
-[<Tests>]
 let ``BackgroundTaskOptionCE inference checks`` =
     testList "BackgroundTaskOptionCE inference checks" [
         testCase "Inference checks"
@@ -491,3 +488,10 @@ let ``BackgroundTaskOptionCE inference checks`` =
             f (TaskOption.some ())
             |> ignore
     ]
+
+let allTests =
+    testList "BackgroundTaskOptionCE CE Tests" [
+        ceTests
+        ceTestsApplicative
+        ``BackgroundTaskOptionCE inference checks``
+    ]