Skip to content

Commit 9b1ff8f

Browse files
gdziadkiewiczgdziadkiewicz
committed
Tests amends
1 parent 33455b3 commit 9b1ff8f

File tree

4 files changed

+53
-39
lines changed

4 files changed

+53
-39
lines changed

‎build/build.fs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,40 +232,51 @@ let initTargets () =
232232
==> "NuGet"
233233
==> "BuildPackage"
234234
==> "All"
235+
|> ignore
235236

236237
"Clean"
237238
==> "Release"
238-
239+
|> ignore
240+
239241
"Clean"
240242
?=> "Build"
243+
|> ignore
241244

242245
"Clean"
243246
?=> "Publish"
247+
|> ignore
244248

245249
"Clean"
246250
?=> "GenerateDocs"
251+
|> ignore
247252

248253
"BuildPackage"
249254
==> "PublishNuget"
250255
==> "Release"
256+
|> ignore
251257

252258
"GenerateDocs"
253259
==> "ReleaseDocs"
254260
==> "Release"
261+
|> ignore
255262

256263
// fsdocs requires build for api references and publish for examples compilation
257264
"Publish"
258265
==> "WatchDocs"
266+
|> ignore
259267

260268
"Build"
261269
==> "WatchDocs"
270+
|> ignore
262271

263272
"Build"
264273
==> "GenerateDocs"
274+
|> ignore
265275

266276
"Publish"
267277
==> "GenerateDocs"
268278
==> "All"
279+
|> ignore
269280

270281
//-----------------------------------------------------------------------------
271282
// Target Start

‎paket.lock‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -247,47 +247,45 @@ NUGET
247247

248248
GROUP Test
249249
STORAGE: NONE
250-
RESTRICTION: || (== net48) (== net6.0)
250+
RESTRICTION: || (== net48) (== net6.0) (== net8.0)
251251
NUGET
252252
remote: https://api.nuget.org/v3/index.json
253-
FsCheck (2.16.5)
253+
FsCheck (2.16.6)
254254
FSharp.Core (>= 4.2.3)
255-
FsCheck.NUnit (2.16.5)
256-
FsCheck (2.16.5)
255+
FsCheck.NUnit (2.16.6)
256+
FsCheck (2.16.6)
257257
NUnit (>= 3.13.1 < 4.0)
258-
FSharp.Core (8.0.301)
259-
FsUnit (5.1)
258+
FSharp.Core (8.0.401)
259+
FsUnit (5.6.1)
260260
FSharp.Core (>= 5.0.2)
261-
NUnit (>= 3.13.3 < 3.14)
262-
GitHubActionsTestLogger (2.0.1)
263-
Microsoft.TestPlatform.ObjectModel (>= 17.2)
264-
Microsoft.CodeCoverage (17.3.2)
265-
Microsoft.NET.Test.Sdk (17.3.2)
266-
Microsoft.CodeCoverage (>= 17.3.2)
267-
Microsoft.TestPlatform.TestHost (>= 17.3.2) - restriction: || (&& (== net48) (>= netcoreapp1.0)) (== net6.0)
268-
Microsoft.NETCore.Platforms (6.0.6) - restriction: || (&& (== net48) (< net35)) (&& (== net48) (>= netcoreapp2.0)) (&& (== net48) (< netstandard1.0) (>= win8)) (&& (== net48) (< netstandard1.3) (>= wpa81)) (&& (== net48) (< netstandard1.5) (>= uap10.0)) (&& (== net48) (>= uap10.1)) (&& (== net48) (>= wp8)) (== net6.0)
269-
Microsoft.TestPlatform.ObjectModel (17.3.2)
270-
NuGet.Frameworks (>= 5.11)
261+
NUnit (>= 3.14 < 4.0)
262+
GitHubActionsTestLogger (2.4.1)
263+
Microsoft.TestPlatform.ObjectModel (>= 17.10)
264+
Microsoft.CodeCoverage (17.11.1)
265+
Microsoft.NET.Test.Sdk (17.11.1)
266+
Microsoft.CodeCoverage (>= 17.11.1)
267+
Microsoft.TestPlatform.TestHost (>= 17.11.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
268+
Microsoft.NETCore.Platforms (6.0.6) - restriction: || (&& (== net48) (< net35)) (&& (== net48) (>= netcoreapp2.0)) (&& (== net48) (< netstandard1.0) (>= win8)) (&& (== net48) (< netstandard1.3) (>= wpa81)) (&& (== net48) (< netstandard1.5) (>= uap10.0)) (&& (== net48) (>= uap10.1)) (&& (== net48) (>= wp8)) (== net6.0) (== net8.0)
269+
Microsoft.TestPlatform.ObjectModel (17.11.1)
271270
System.Reflection.Metadata (>= 1.6)
272-
Microsoft.TestPlatform.TestHost (17.3.2) - restriction: || (&& (== net48) (>= netcoreapp1.0)) (== net6.0)
273-
Microsoft.TestPlatform.ObjectModel (>= 17.3.2) - restriction: || (&& (== net48) (>= netcoreapp1.0)) (&& (== net48) (>= uap10.0)) (== net6.0)
274-
Newtonsoft.Json (>= 9.0.1) - restriction: || (&& (== net48) (>= netcoreapp1.0)) (&& (== net48) (>= uap10.0)) (== net6.0)
275-
NETStandard.Library (2.0.3) - restriction: || (&& (== net48) (< net35)) (== net6.0)
271+
Microsoft.TestPlatform.TestHost (17.11.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
272+
Microsoft.TestPlatform.ObjectModel (>= 17.11.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
273+
Newtonsoft.Json (>= 13.0.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
274+
NETStandard.Library (2.0.3) - restriction: || (&& (== net48) (< net35)) (== net6.0) (== net8.0)
276275
Microsoft.NETCore.Platforms (>= 1.1)
277-
Newtonsoft.Json (13.0.1) - restriction: || (&& (== net48) (>= netcoreapp1.0)) (== net6.0)
278-
NuGet.Frameworks (6.3.1)
279-
NUnit (3.13.3)
280-
NETStandard.Library (>= 2.0) - restriction: || (&& (== net48) (< net35)) (== net6.0)
281-
NUnit3TestAdapter (4.3)
282-
System.Buffers (4.5.1) - restriction: || (== net48) (&& (== net6.0) (>= net461))
276+
Newtonsoft.Json (13.0.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
277+
NUnit (3.14)
278+
NETStandard.Library (>= 2.0) - restriction: || (&& (== net48) (< net35)) (== net6.0) (== net8.0)
279+
NUnit3TestAdapter (4.6)
280+
System.Buffers (4.5.1) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0) (>= xamarinios)) (&& (== net8.0) (< net6.0) (>= xamarinmac)) (&& (== net8.0) (< net6.0) (>= xamarintvos)) (&& (== net8.0) (< net6.0) (>= xamarinwatchos)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0))
283281
System.Collections.Immutable (6.0)
284-
System.Memory (>= 4.5.4) - restriction: || (== net48) (&& (== net6.0) (>= net461))
282+
System.Memory (>= 4.5.4) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0))
285283
System.Runtime.CompilerServices.Unsafe (>= 6.0)
286-
System.Memory (4.5.5) - restriction: || (== net48) (&& (== net6.0) (>= net461))
287-
System.Buffers (>= 4.5.1) - restriction: || (== net48) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos))
288-
System.Numerics.Vectors (>= 4.5) - restriction: || (== net48) (&& (== net6.0) (>= net461))
289-
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net48) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos))
290-
System.Numerics.Vectors (4.5) - restriction: || (== net48) (&& (== net6.0) (>= net461))
284+
System.Memory (4.5.5) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0))
285+
System.Buffers (>= 4.5.1) - restriction: || (== net48) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos))
286+
System.Numerics.Vectors (>= 4.5) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461))
287+
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net48) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos))
288+
System.Numerics.Vectors (4.5) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461))
291289
System.Reflection.Metadata (6.0.1)
292290
System.Collections.Immutable (>= 6.0)
293291
System.Runtime.CompilerServices.Unsafe (6.0)

‎tests/FSharpx.Tests/EnumTest.fs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,13 @@ let ``toString should handle dotnet enums`` () =
7474
let ``getValues works as expected for dotnet enum`` ()=
7575
let result = Enum.getValues<System.Globalization.NumberStyles>()
7676
let expectedResult =
77-
[NumberStyles.None; NumberStyles.AllowLeadingWhite; NumberStyles.AllowTrailingWhite; NumberStyles.AllowLeadingSign; NumberStyles.Integer;
78-
NumberStyles.AllowTrailingSign; NumberStyles.AllowParentheses; NumberStyles.AllowDecimalPoint; NumberStyles.AllowThousands; NumberStyles.Number;
79-
NumberStyles.AllowExponent; NumberStyles.Float; NumberStyles.AllowCurrencySymbol; NumberStyles.Currency; NumberStyles.Any; NumberStyles.AllowHexSpecifier;
80-
NumberStyles.HexNumber]
81-
result |> Seq.toList |> shouldEqual expectedResult
77+
[
78+
NumberStyles.None; NumberStyles.AllowLeadingWhite; NumberStyles.AllowTrailingWhite; NumberStyles.AllowLeadingSign; NumberStyles.Integer;
79+
NumberStyles.AllowTrailingSign; NumberStyles.AllowParentheses; NumberStyles.AllowDecimalPoint; NumberStyles.AllowThousands; NumberStyles.Number;
80+
NumberStyles.AllowExponent; NumberStyles.Float; NumberStyles.AllowCurrencySymbol; NumberStyles.Currency; NumberStyles.Any; NumberStyles.AllowHexSpecifier;
81+
NumberStyles.HexNumber;
82+
#if NET8_0
83+
NumberStyles.BinaryNumber; NumberStyles.AllowBinarySpecifier
84+
#endif
85+
]
86+
result |> Seq.toList |> fun result -> CollectionAssert.AreEquivalent(expectedResult, result)

‎tests/FSharpx.Tests/ValidationTests.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ let ``using sequenceIgnore``() =
142142
| Choice2Of2 _ -> failwith "Validation failed on success values"
143143

144144
[<Test>]
145-
let ``using mapMIgnore`` =
145+
let ``using mapMIgnore``() =
146146
let okAndErr = [ "ok"; "err" ]
147147
let oks = [ "ok1"; "ok2" ]
148148

0 commit comments

Comments
 (0)