Skip to content

Commit c805f6d

Browse files
psfinakipsfinaki
authored
Compiler test cleanup, part 3 (and the last one) (dotnet#15777)
* Update * up * Update AssemblyReaderShim.fs
1 parent 7e59327 commit c805f6d

File tree

66 files changed

+1093
-1934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1093
-1934
lines changed

‎FSharp.Compiler.Service.sln

-6
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core", "src\FSharp.C
5353
EndProject
5454
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Interactive.Settings", "src\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj", "{AF887C2E-640D-4CD6-A0BD-88AE1517797D}"
5555
EndProject
56-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}"
57-
EndProject
5856
Global
5957
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6058
Debug|Any CPU = Debug|Any CPU
@@ -121,10 +119,6 @@ Global
121119
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Debug|Any CPU.Build.0 = Debug|Any CPU
122120
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Release|Any CPU.ActiveCfg = Release|Any CPU
123121
{AF887C2E-640D-4CD6-A0BD-88AE1517797D}.Release|Any CPU.Build.0 = Release|Any CPU
124-
{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
125-
{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}.Debug|Any CPU.Build.0 = Debug|Any CPU
126-
{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}.Release|Any CPU.ActiveCfg = Release|Any CPU
127-
{0C0BDAF4-7D47-4BDA-9992-077F63D6B494}.Release|Any CPU.Build.0 = Release|Any CPU
128122
EndGlobalSection
129123
GlobalSection(SolutionProperties) = preSolution
130124
HideSolutionNode = FALSE

‎FSharp.sln

-15
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Test.Utilities", "te
1515
EndProject
1616
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpSuite.Tests", "tests\fsharp\FSharpSuite.Tests.fsproj", "{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
1717
EndProject
18-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
19-
EndProject
2018
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core.UnitTests", "tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
2119
EndProject
2220
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
@@ -234,18 +232,6 @@ Global
234232
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|Any CPU.Build.0 = Release|Any CPU
235233
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|x86.ActiveCfg = Release|Any CPU
236234
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|x86.Build.0 = Release|Any CPU
237-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
238-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
239-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|x86.ActiveCfg = Debug|Any CPU
240-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|x86.Build.0 = Debug|Any CPU
241-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|Any CPU.ActiveCfg = Release|Any CPU
242-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|Any CPU.Build.0 = Release|Any CPU
243-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|x86.ActiveCfg = Release|Any CPU
244-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|x86.Build.0 = Release|Any CPU
245-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
246-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|Any CPU.Build.0 = Release|Any CPU
247-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|x86.ActiveCfg = Release|Any CPU
248-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|x86.Build.0 = Release|Any CPU
249235
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
250236
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.Build.0 = Debug|Any CPU
251237
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -472,7 +458,6 @@ Global
472458
{649FA588-F02E-457C-9FCF-87E46407481E} = {B8DDA694-7939-42E3-95E5-265C2217C142}
473459
{60D275B0-B14A-41CB-A1B2-E815A7448FCB} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
474460
{C163E892-5BF7-4B59-AA99-B0E8079C67C4} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
475-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
476461
{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
477462
{53C0DAAD-158C-4658-8EC7-D7341530239F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
478463
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}

‎TESTGUIDE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ The F# tests are split as follows:
104104

105105
* [FSharp.Core.UnitTests](tests/FSharp.Core.UnitTests) - Validation of the core F# types and the public surface area of `FSharp.Core.dll`.
106106

107-
* [FSharp.Compiler.UnitTests](tests/FSharp.Compiler.UnitTests) - Validation of compiler internals.
107+
* [FSharp.Compiler.Service.Tests](tests/FSharp.Compiler.Service.Tests) - Validation of compiler internals.
108108

109109
* [FSharp.Compiler.ComponentTests](tests/FSharp.Compiler.ComponentTests) - Validation of compiler APIs.
110110

@@ -151,7 +151,7 @@ Tags are in the left column, paths to to corresponding test folders are in the r
151151

152152
If you want to re-run a particular test area, the easiest way to do so is to set a temporary tag for that area in test.lst (e.g. "RERUN") and adjust `ttags` [run.fsharpqa.test.fsx script](tests/fsharpqa/run.fsharpqa.test.fsx) and run it.
153153

154-
### FSharp.Compiler.Service.Tests, VisualFSharp.UnitTests
154+
### VisualFSharp.UnitTests, FSharpSuite.Tests
155155

156156
These are all currently NUnit tests (we hope to migrate them to xUnit). You can execute these tests individually via the Visual Studio NUnit3 runner
157157
extension or the command line via `nunit3-console.exe`.

‎VisualFSharp.sln

-15
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpSuite.Tests", "tests\
9191
{EB015235-1E07-4CDA-9CC6-3FBCC27910D1} = {EB015235-1E07-4CDA-9CC6-3FBCC27910D1}
9292
EndProjectSection
9393
EndProject
94-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
95-
EndProject
9694
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core.UnitTests", "tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
9795
EndProject
9896
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppConfig", "vsintegration\ItemTemplates\AppConfig\AppConfig.csproj", "{6BA13AA4-C25F-480F-856B-8E8000299A72}"
@@ -529,18 +527,6 @@ Global
529527
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|Any CPU.Build.0 = Release|Any CPU
530528
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|x86.ActiveCfg = Release|Any CPU
531529
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Release|x86.Build.0 = Release|Any CPU
532-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
533-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
534-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|x86.ActiveCfg = Debug|Any CPU
535-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Debug|x86.Build.0 = Debug|Any CPU
536-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|Any CPU.ActiveCfg = Release|Any CPU
537-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|Any CPU.Build.0 = Release|Any CPU
538-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|x86.ActiveCfg = Release|Any CPU
539-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Proto|x86.Build.0 = Release|Any CPU
540-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
541-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|Any CPU.Build.0 = Release|Any CPU
542-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|x86.ActiveCfg = Release|Any CPU
543-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}.Release|x86.Build.0 = Release|Any CPU
544530
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
545531
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.Build.0 = Debug|Any CPU
546532
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -1070,7 +1056,6 @@ Global
10701056
{649FA588-F02E-457C-9FCF-87E46407481E} = {B8DDA694-7939-42E3-95E5-265C2217C142}
10711057
{60D275B0-B14A-41CB-A1B2-E815A7448FCB} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
10721058
{C163E892-5BF7-4B59-AA99-B0E8079C67C4} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
1073-
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
10741059
{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
10751060
{6BA13AA4-C25F-480F-856B-8E8000299A72} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
10761061
{12AC2813-E895-4AAA-AE6C-94E21DA09F64} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}

‎buildtools/AssemblyCheck/SkipVerifyEmbeddedPdb.txt

-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ FSharp.Compiler.ComponentTests.dll
55
FSharp.Test.Utilities.dll
66
FSharp.Compiler.Private.Scripting.UnitTests.dll
77
FSharp.Compiler.Service.Tests.dll
8-
FSharp.Compiler.UnitTests.dll
98
FSharp.Core.UnitTests.dll
109
FSharpSuite.Tests.dll

‎eng/Build.ps1

+6-8
Original file line numberDiff line numberDiff line change
@@ -585,8 +585,7 @@ try {
585585
$bgJob = TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharpSuite.Tests\" -asBackgroundJob $true
586586

587587
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.ComponentTests\"
588-
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.UnitTests\"
589-
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
588+
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
590589
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Private.Scripting.UnitTests\"
591590
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Build.UnitTests\"
592591
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests\"
@@ -600,8 +599,7 @@ try {
600599
$bgJob = TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharpSuite.Tests\" -asBackgroundJob $true
601600

602601
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.ComponentTests\" -noTestFilter $true
603-
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.UnitTests\"
604-
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
602+
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
605603
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Private.Scripting.UnitTests\"
606604
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Build.UnitTests\"
607605
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Core.UnitTests\"
@@ -646,8 +644,8 @@ try {
646644
if ($testCompiler) {
647645
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.ComponentTests\" -noTestFilter $true
648646
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.ComponentTests\" -noTestFilter $true
649-
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.UnitTests\"
650-
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.UnitTests\"
647+
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
648+
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
651649
}
652650

653651

@@ -658,8 +656,8 @@ try {
658656

659657

660658
if ($testCompilerService) {
661-
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
662-
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
659+
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
660+
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -targetFramework $script:desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.Service.Tests\"
663661
}
664662

665663
if ($testCambridge) {

‎eng/build.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,7 @@ BuildSolution
325325
if [[ "$test_core_clr" == true ]]; then
326326
coreclrtestframework=$tfm
327327
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework --notestfilter
328-
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" --targetframework $coreclrtestframework --notestfilter
329-
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
328+
TestUsingXUnit --testproject "$repo_root/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" --targetframework $coreclrtestframework --notestfilter
330329
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework
331330
TestUsingXUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclrtestframework
332331
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj" --targetframework $coreclrtestframework

‎src/Compiler/FSharp.Compiler.Service.fsproj

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<InternalsVisibleTo Include="VisualFSharp.Salsa" />
7272
<InternalsVisibleTo Include="VisualFSharp.UnitTests" />
7373
<InternalsVisibleTo Include="FSharp.Compiler.ComponentTests" />
74-
<InternalsVisibleTo Include="FSharp.Compiler.UnitTests" />
7574
<InternalsVisibleTo Include="FSharp.Compiler.Service.Tests" />
7675
<InternalsVisibleTo Include="HostedCompilerServer" />
7776
<InternalsVisibleTo Include="FSharp.Tests.FSharpSuite" />

‎tests/service/AssemblyContentProviderTests.fs renamed to ‎tests/FSharp.Compiler.Service.Tests/AssemblyContentProviderTests.fs

+6-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
#if INTERACTIVE
2-
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
3-
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
4-
#load "FsUnit.fs"
5-
#load "Common.fs"
6-
#else
7-
module Tests.Service.AssemblyContentProviderTests
8-
#endif
1+
module FSharp.Compiler.Service.Tests.AssemblyContentProviderTests
92

103
open System
11-
open NUnit.Framework
4+
open Xunit
125
open FSharp.Compiler.CodeAnalysis
136
open FSharp.Compiler.EditorServices
147
open FSharp.Compiler.Service.Tests.Common
@@ -70,7 +63,7 @@ let private getSymbolMap (getSymbolProperty: AssemblySymbol -> 'a) (source: stri
7063
|> List.map (fun s -> getCleanedFullName s, getSymbolProperty s)
7164
|> Map.ofList
7265

73-
[<Test>]
66+
[<Fact>]
7467
let ``implicitly added Module suffix is removed``() =
7568
"""
7669
type MyType = { F: int }
@@ -83,7 +76,7 @@ module MyType =
8376
"Test.MyType"
8477
"Test.MyType.func123"]
8578

86-
[<Test>]
79+
[<Fact>]
8780
let ``Module suffix added by an explicitly applied ModuleSuffix attribute is removed``() =
8881
"""
8982
[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
@@ -94,7 +87,7 @@ module MyType =
9487
"Test.MyType"
9588
"Test.MyType.func123" ]
9689

97-
[<Test>]
90+
[<Fact>]
9891
let ``Property getters and setters are removed``() =
9992
"""
10093
type MyType() =
@@ -104,7 +97,7 @@ let ``Property getters and setters are removed``() =
10497
"Test.MyType"
10598
"Test.MyType.MyProperty" ]
10699

107-
[<Test>]
100+
[<Fact>]
108101
let ``TopRequireQualifiedAccessParent property should be valid``() =
109102
let source = """
110103
module M1 =

‎tests/FSharp.Compiler.Service.Tests/AssemblyInfo.fs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module FSharp.Compiler.Service.Tests.AssemblyInfo
2+
3+
open Xunit
4+
5+
[<assembly: CollectionBehavior(DisableTestParallelization = true)>]
6+
7+
do()

‎tests/service/AssemblyReaderShim.fs renamed to ‎tests/FSharp.Compiler.Service.Tests/AssemblyReaderShim.fs

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
#if INTERACTIVE
2-
#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive
3-
#r "../../artifacts/bin/fcs/net461/nunit.framework.dll"
4-
#load "FsUnit.fs"
5-
#load "Common.fs"
6-
#else
7-
module FSharp.Compiler.Service.Tests.AssemblyReaderShim
8-
#endif
1+
module FSharp.Compiler.Service.Tests.AssemblyReaderShim
92

103
open FsUnit
114
open FSharp.Compiler.Text
125
open FSharp.Compiler.AbstractIL.ILBinaryReader
13-
open NUnit.Framework
6+
open Xunit
147

15-
[<Test>]
8+
[<Fact(Skip = "Flaky: seems to run fine locally but often fails in CI")>]
169
let ``Assembly reader shim gets requests`` () =
1710
let defaultReader = AssemblyReader
1811
let mutable gotRequest = false

‎tests/FSharp.Compiler.UnitTests/AssemblySigningAttributes.fs renamed to ‎tests/FSharp.Compiler.Service.Tests/AssemblySigningAttributes.fs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
22

3-
namespace FSharp.Compiler.UnitTests
3+
namespace FSharp.Compiler.Service.Tests
44

55
open Xunit
66
open FSharp.Test
77
open FSharp.Test.Compiler
88

9-
module AssemblySigning =
9+
module AssemblySigningAttributes =
1010

1111
[<FactForDESKTOP>]
1212
let ``--keycontainer:name DESKTOP`` () =

‎tests/FSharp.Compiler.UnitTests/BlockTests.fs renamed to ‎tests/FSharp.Compiler.Service.Tests/BlockTests.fs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2-
namespace FSharp.Compiler.UnitTests
2+
namespace FSharp.Compiler.Service.Tests
33

44
open Xunit
55
open FSharp.Test
66
open Internal.Utilities.Library
77

8-
module ImmutableArrayTests =
8+
module BlockTests =
99

1010
[<Fact>]
1111
let ``Iter should work correctly``() =

‎tests/FSharp.Compiler.UnitTests/BuildGraphTests.fs renamed to ‎tests/FSharp.Compiler.Service.Tests/BuildGraphTests.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2-
namespace FSharp.Compiler.UnitTests
2+
namespace FSharp.Compiler.Service.Tests
33

44
open System
55
open System.Threading

0 commit comments

Comments
 (0)