Skip to content

move some error and warning tests to NUnit #7244

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
cartermp merged 4 commits into from
Jul 17, 2019
Merged

move some error and warning tests to NUnit #7244

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b11202b
move some error and warning tests to NUnit
Jul 17, 2019
f85b425
CompilerAssert.ParseWithErrors now uses ParseFile instead of ParseAnd…
smcl Jul 17, 2019
e1e971a
merge conflicts
smcl Jul 17, 2019
3d5b949
one more file
smcl Jul 17, 2019
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
Prev Previous commit
Next Next commit
CompilerAssert.ParseWithErrors now uses ParseFile instead of ParseAnd… 
…CheckFileInProject
  • Loading branch information
@smcl
smcl committed Jul 17, 2019
commit f85b425081544739d59295de00c5dee5398f3865
29 changes: 14 additions & 15 deletions tests/fsharp/Compiler/CompilerAssert.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,22 +218,21 @@ module CompilerAssert =
)

let ParseWithErrors (source: string) expectedParseErrors =
lock gate <| fun () ->
let parseResults, _ = checker.ParseAndCheckFileInProject("test.fs", 0, SourceText.ofString source, defaultProjectOptions) |> Async.RunSynchronously
let parseResults = checker.ParseFile("test.fs", SourceText.ofString source, FSharpParsingOptions.Default) |> Async.RunSynchronously

Assert.True(parseResults.ParseHadErrors)
Assert.True(parseResults.ParseHadErrors)

let errors =
parseResults.Errors
|> Array.distinctBy (fun e -> e.Severity, e.ErrorNumber, e.StartLineAlternate, e.StartColumn, e.EndLineAlternate, e.EndColumn, e.Message)
let errors =
parseResults.Errors
|> Array.distinctBy (fun e -> e.Severity, e.ErrorNumber, e.StartLineAlternate, e.StartColumn, e.EndLineAlternate, e.EndColumn, e.Message)

Assert.AreEqual(Array.length expectedParseErrors, errors.Length, sprintf "Type check errors: %A" parseResults.Errors)
Assert.AreEqual(Array.length expectedParseErrors, errors.Length, sprintf "Type check errors: %A" parseResults.Errors)

Array.zip errors expectedParseErrors
|> Array.iter (fun (info, expectedError) ->
let (expectedServerity: FSharpErrorSeverity, expectedErrorNumber: int, expectedErrorRange: int * int * int * int, expectedErrorMsg: string) = expectedError
Assert.AreEqual(expectedServerity, info.Severity)
Assert.AreEqual(expectedErrorNumber, info.ErrorNumber, "expectedErrorNumber")
Assert.AreEqual(expectedErrorRange, (info.StartLineAlternate, info.StartColumn + 1, info.EndLineAlternate, info.EndColumn + 1), "expectedErrorRange")
Assert.AreEqual(expectedErrorMsg, info.Message, "expectedErrorMsg")
)
Array.zip errors expectedParseErrors
|> Array.iter (fun (info, expectedError) ->
let (expectedServerity: FSharpErrorSeverity, expectedErrorNumber: int, expectedErrorRange: int * int * int * int, expectedErrorMsg: string) = expectedError
Assert.AreEqual(expectedServerity, info.Severity)
Assert.AreEqual(expectedErrorNumber, info.ErrorNumber, "expectedErrorNumber")
Assert.AreEqual(expectedErrorRange, (info.StartLineAlternate, info.StartColumn + 1, info.EndLineAlternate, info.EndColumn + 1), "expectedErrorRange")
Assert.AreEqual(expectedErrorMsg, info.Message, "expectedErrorMsg")
)