Skip to content
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

Fixing JaroWinkler tests with InvariantCulture and fixing async tests by removing Debugger.Break() #3627

Merged
merged 2 commits into from
Sep 25, 2017
Merged

Fixing JaroWinkler tests with InvariantCulture and fixing async tests by removing Debugger.Break() #3627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4269aa1
Fixing JaroWinkler tests to use InvariantCulture for number-to-string
abelbraaksma Sep 22, 2017
45740a5
Fixing the crashing of test runners because of a Debugger.Break() in …
abelbraaksma Sep 22, 2017
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
3 changes: 2 additions & 1 deletion src/fsharp/FSharp.Compiler.Unittests/EditDistance.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
namespace FSharp.Compiler.Unittests

open System
open System.Globalization
open System.Text
open NUnit.Framework
open Microsoft.FSharp.Compiler
Expand All @@ -16,7 +17,7 @@ module EditDistance =
[<TestCase("DWAYNE", "DUANE", ExpectedResult = "0.840")>]
[<TestCase("DIXON", "DICKSONX", ExpectedResult = "0.813")>]
let JaroWinklerTest (str1 : string, str2 : string) : string =
String.Format("{0:0.000}", JaroWinklerDistance str1 str2)
String.Format(CultureInfo.InvariantCulture, "{0:0.000}", JaroWinklerDistance str1 str2)

[<Test>]
[<TestCase("RICK", "RICK", ExpectedResult = 0)>]
Expand Down
3 changes: 1 addition & 2 deletions src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ type AsyncType() =
match a.InnerException with
| :? TaskCanceledException as t -> ()
| _ -> reraise()
System.Diagnostics.Debugger.Break() |> ignore
Assert.IsTrue (t.IsCompleted, "Task is not completed")

[<Test>]
Expand Down Expand Up @@ -408,4 +407,4 @@ type AsyncType() =
cts.Cancel()
ewh.WaitOne(10000) |> ignore

#endif
#endif