Skip to content

Move ErrorMessages/NameResolution Tests to NUnit #7237

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

Move ErrorMessages/NameResolution Tests to NUnit #7237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bee8d13
Mark name resoltion error message tests for port to NUnit
kMutagene Jul 15, 2019
7d0eb47
Add Nunit tests for FieldNotInRecord, RecordFieldProposal, and Global…
kMutagene Jul 15, 2019
6a6acbf
Fix expected error message in FieldNotInRecord Compiler test
kMutagene Jul 15, 2019
f08b53d
Change global Qualifier after dot test back to original fsharpqa vers…
kMutagene Jul 16, 2019
938940d
Remove unnecessary double ticks from NameResolution tests
kMutagene Jul 16, 2019
9cc8864
Merge branch 'master' into MoveNameResolutionTests
KevinRansom Jul 16, 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
45 changes: 45 additions & 0 deletions tests/fsharp/Compiler/ErrorMessages/NameResolutionTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.

namespace FSharp.Compiler.UnitTests

open NUnit.Framework
open FSharp.Compiler.SourceCodeServices

[<TestFixture>]
module NameResolutionTests =

[<Test>]
let FieldNotInRecord () =
CompilerAssert.TypeCheckSingleError
"""
type A = { Hello:string; World:string }
type B = { Size:int; Height:int }
type C = { Wheels:int }
type D = { Size:int; Height:int; Walls:int }
type E = { Unknown:string }
type F = { Wallis:int; Size:int; Height:int; }

let r:F = { Size=3; Height=4; Wall=1 }
"""
FSharpErrorSeverity.Error
1129
(9, 31, 9, 35)
"The record type 'F' does not contain a label 'Wall'."

[<Test>]
let RecordFieldProposal () =
CompilerAssert.TypeCheckSingleError
"""
type A = { Hello:string; World:string }
type B = { Size:int; Height:int }
type C = { Wheels:int }
type D = { Size:int; Height:int; Walls:int }
type E = { Unknown:string }
type F = { Wallis:int; Size:int; Height:int; }

let r = { Size=3; Height=4; Wall=1 }
"""
FSharpErrorSeverity.Error
39
(9, 29, 9, 33)
"The record label 'Wall' is not defined."
1 change: 1 addition & 0 deletions tests/fsharp/FSharpSuite.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<Compile Include="Compiler\ErrorMessages\AccessOfTypeAbbreviationTests.fs" />
<Compile Include="Compiler\ErrorMessages\ElseBranchHasWrongTypeTests.fs" />
<Compile Include="Compiler\ErrorMessages\MissingElseBranch.fs" />
<Compile Include="Compiler\ErrorMessages\NameResolutionTests.fs" />
<Compile Include="Compiler\ErrorMessages\UpcastDowncastTests.fs" />
<Compile Include="Compiler\SourceTextTests.fs" />
<Compile Include="Compiler\Language\AnonRecordTests.fs" />
Expand Down
13 changes: 0 additions & 13 deletions tests/fsharpqa/Source/ErrorMessages/NameResolution/E_FieldNotInRecord.fs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/fsharpqa/Source/ErrorMessages/NameResolution/E_GlobalQualifierAfterDot.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

let x = global.System.String.Empty.global.System.String.Empty

exit 0
Copy link
Contributor

@KevinRansom KevinRansom Jul 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kMutagene,

Do you propose following up with a PR to migrate this test case? Feel free to add whatever is necessary to the CompilerAssert class.

Thanks

Kevin

Copy link
Contributor

@forki forki Jul 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the new function is already coming in #7244 - so after merging that one @kMutagene can continue

Copy link
Contributor

@forki forki Jul 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK the new assertion function is in.

Copy link
Contributor Author

@kMutagene kMutagene Jul 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @forki

exit 0
13 changes: 0 additions & 13 deletions tests/fsharpqa/Source/ErrorMessages/NameResolution/E_RecordFieldProposal.fs
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions tests/fsharpqa/Source/ErrorMessages/NameResolution/env.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
SOURCE=E_RecordFieldProposal.fs # E_RecordFieldProposal
SOURCE=E_GlobalQualifierAfterDot.fs # E_GlobalQualifierAfterDot
SOURCE=E_FieldNotInRecord.fs # E_FieldNotInRecord
SOURCE=E_GlobalQualifierAfterDot.fs # E_GlobalQualifierAfterDot