Skip to content

Commit efcab72

Browse files
tw0po1nttw0po1nt
committed
Move TaskValidation tests to FsToolkit.ErrorHandling.TaskResult.Tests project
1 parent 0d1cce0 commit efcab72

File tree

5 files changed

+18
-39
lines changed

5 files changed

+18
-39
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<Compile Include="BackgroundTaskOptionCE.fs" />
2323
<Compile Include="List.fs" />
2424
<Compile Include="TaskResultOption.fs" />
25+
<Compile Include="TaskValidation.fs" />
26+
<Compile Include="TaskValidationCE.fs" />
2527
<Compile Include="Main.fs" />
2628
<None Include="paket.references" />
2729
<Watch Include="@(None)" />

‎tests/FsToolkit.ErrorHandling.Tests/TaskValidation.fs‎ renamed to ‎tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskValidation.fs‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ open FsToolkit.ErrorHandling.Operator.TaskValidation
1818

1919
let lift = TaskValidation.ofResult
2020

21+
[<Tests>]
2122
let map2Tests =
2223
testList "TaskValidation.map2 Tests" [
2324
testCaseTask "map2 with two ok parts"
@@ -64,6 +65,7 @@ let map2Tests =
6465
}
6566
]
6667

68+
[<Tests>]
6769
let map3Tests =
6870
testList "TaskValidation.map3 Tests" [
6971
testCaseTask "map3 with three ok parts"
@@ -147,7 +149,7 @@ let map3Tests =
147149
}
148150
]
149151

150-
152+
[<Tests>]
151153
let applyTests =
152154

153155
testList "TaskValidation.apply tests" [
@@ -182,7 +184,7 @@ let applyTests =
182184
}
183185
]
184186

185-
187+
[<Tests>]
186188
let operatorsTests =
187189

188190
testList "TaskValidation Operators Tests" [
@@ -219,6 +221,7 @@ let operatorsTests =
219221
}
220222
]
221223

224+
[<Tests>]
222225
let zipTests =
223226
testList "zip tests" [
224227
testCaseTask "Ok, Ok"
@@ -271,7 +274,7 @@ let zipTests =
271274
}
272275
]
273276

274-
277+
[<Tests>]
275278
let orElseTests =
276279
testList "TaskValidation.orElseWith Tests" [
277280
testCaseTask "Ok Ok takes first Ok"
@@ -339,6 +342,7 @@ let orElseTests =
339342
}
340343
]
341344

345+
[<Tests>]
342346
let orElseWithTests =
343347
testList "TaskValidation.orElse Tests" [
344348
testCaseTask "Ok Ok takes first Ok"
@@ -405,14 +409,3 @@ let orElseWithTests =
405409
|> Expect.hasErrorValue [ "Second" ]
406410
}
407411
]
408-
409-
let allTests =
410-
testList "TaskValidationTests" [
411-
map2Tests
412-
map3Tests
413-
applyTests
414-
operatorsTests
415-
orElseTests
416-
orElseWithTests
417-
zipTests
418-
]

‎tests/FsToolkit.ErrorHandling.Tests/TaskValidationCE.fs‎ renamed to ‎tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskValidationCE.fs‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
module TaskValidationCETests
22

3-
43
open Expecto
5-
open SampleDomain
6-
open TestData
74
open FsToolkit.ErrorHandling
85
open System.Threading.Tasks
96

7+
[<Tests>]
108
let ``TaskValidationCE return Tests`` =
119
testList "TaskValidationCE Tests" [
1210
testCaseTask "Return string"
@@ -18,6 +16,7 @@ let ``TaskValidationCE return Tests`` =
1816
}
1917
]
2018

19+
[<Tests>]
2120
let ``TaskValidationCE return! Tests`` =
2221
testList "TaskValidationCE return! Tests" [
2322
testCaseTask "Return Ok Validation"
@@ -97,6 +96,7 @@ let ``TaskValidationCE return! Tests`` =
9796
}
9897
]
9998

99+
[<Tests>]
100100
let ``TaskValidationCE bind Tests`` =
101101
testList "TaskValidationCE bind Tests" [
102102
testCaseTask "Bind Ok Validation"
@@ -233,6 +233,7 @@ let ``TaskValidationCE bind Tests`` =
233233
}
234234
]
235235

236+
[<Tests>]
236237
let ``TaskValidationCE combine/zero/delay/run Tests`` =
237238
testList "TaskValidationCE combine/zero/delay/run Tests" [
238239
testCaseTask "Zero/Combine/Delay/Run"
@@ -270,6 +271,7 @@ let ``TaskValidationCE combine/zero/delay/run Tests`` =
270271
}
271272
]
272273

274+
[<Tests>]
273275
let ``TaskValidationCE try Tests`` =
274276
testList "TaskValidationCE try Tests" [
275277
testCaseTask "Try With"
@@ -312,6 +314,7 @@ let ``TaskValidationCE try Tests`` =
312314
}
313315
]
314316

317+
[<Tests>]
315318
let ``TaskValidationCE using Tests`` =
316319
testList "TaskValidationCE using Tests" [
317320
testCaseTask "use normal disposable"
@@ -411,6 +414,7 @@ let ``TaskValidationCE using Tests`` =
411414
}
412415
]
413416

417+
[<Tests>]
414418
let ``TaskValidationCE loop Tests`` =
415419
testList "TaskValidationCE loop Tests" [
416420
yield! [
@@ -544,6 +548,7 @@ let ``TaskValidationCE loop Tests`` =
544548
}
545549
]
546550

551+
[<Tests>]
547552
let ``TaskValidationCE applicative tests`` =
548553
testList "TaskValidationCE applicative tests" [
549554
testCaseTask "Happy Path TaskValidation"
@@ -722,6 +727,7 @@ let ``TaskValidationCE applicative tests`` =
722727
}
723728
]
724729

730+
[<Tests>]
725731
let ``TaskValidationCE inference checks`` =
726732
testList "TaskValidationCE inference checks" [
727733
testCase "Inference checks"
@@ -732,16 +738,3 @@ let ``TaskValidationCE inference checks`` =
732738
f (TaskValidation.ok)
733739
|> ignore
734740
]
735-
736-
let allTests =
737-
testList "TaskValidationCETests" [
738-
``TaskValidationCE return Tests``
739-
``TaskValidationCE return! Tests``
740-
``TaskValidationCE bind Tests``
741-
``TaskValidationCE combine/zero/delay/run Tests``
742-
``TaskValidationCE try Tests``
743-
``TaskValidationCE using Tests``
744-
``TaskValidationCE loop Tests``
745-
``TaskValidationCE applicative tests``
746-
``TaskValidationCE inference checks``
747-
]

‎tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,9 @@
3434
<Compile Include="ValidationCE.fs" />
3535
<Compile Include="AsyncValidation.fs" />
3636
<Compile Include="AsyncValidationCE.fs" />
37-
<Compile Include="TaskValidation.fs" />
38-
<Compile Include="TaskValidationCE.fs" />
3937
<Compile Include="Main.fs" />
4038
<None Include="paket.references" />
4139
<Watch Include="@(None)" />
4240
</ItemGroup>
43-
<ItemGroup>
44-
<PackageReference Update="Expecto">
45-
<Version>10.2.1</Version>
46-
</PackageReference>
47-
</ItemGroup>
4841
<Import Project="..\..\.paket\Paket.Restore.targets" />
4942
</Project>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ let allTests =
3030
AsyncResultOptionCETests.allTests
3131
AsyncValidationTests.allTests
3232
AsyncValidationCETests.allTests
33-
TaskValidationTests.allTests
34-
TaskValidationCETests.allTests
3533
ValidationTests.allTests
3634
ValidationCETests.allTests
3735
ValueOptionTests.allTests

0 commit comments

Comments
 (0)