Skip to content

Minor code clean-up #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CaptnCodr merged 1 commit into from
Sep 13, 2024
Merged

Minor code clean-up #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Common.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Common =
open Microsoft.FSharp.Reflection

let isUnionCase x =
FSharpType.IsUnion(<@ x @>.Type) |> not && (box x) = null
FSharpType.IsUnion(<@ x @>.Type) |> not && isNull(box x)
|| FSharpType.IsUnion(x.GetType())

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions src/FsUnit.Xunit/CustomMatchers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ let equalWithin (tolerance: obj) (expected: obj) =
let matches(actual: obj) =
let parseValue(v: string) =
match Double.TryParse(v, NumberStyles.Any, CultureInfo("en-US")) with
| true, x -> Some(x)
| false, _ -> None
| true, x -> ValueSome x
| false, _ -> ValueNone

let actual = string actual |> parseValue
let expect = string expected |> parseValue
let tol = string tolerance |> parseValue

if [| actual; expect; tol |] |> Array.contains None |> not then
if [| actual; expect; tol |] |> Array.contains ValueNone |> not then
abs(actual.Value - expect.Value) <= tol.Value
else
false
Expand Down