Migrate VisualFSharp tests to Xunit (dotnet#17751)

* Migrate last Nunit tests to Xunit * up * up * up * Update TestLib.LanguageService.fs * up * up * up * Remove unused tests * one more * up --------- Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
esbenbjerre · Sep 30, 2024 · 197029b · 197029b
1 parent d380caa
commit 197029b
Show file tree

Hide file tree

Showing 37 changed files with 2,046 additions and 2,759 deletions.
diff --git a/TESTGUIDE.md b/TESTGUIDE.md
@@ -151,14 +151,6 @@ Tags are in the left column, paths to to corresponding test folders are in the r
 
 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.
 
-### VisualFSharp.UnitTests
-
-These are currently NUnit tests (we hope to migrate them to xUnit). You can execute these tests individually via the Visual Studio NUnit3 runner
-extension or the command line via `nunit3-console.exe`.
-
-Note that for compatibility reasons, the IDE unit tests should be run in a 32-bit process,
-using the `--x86` flag to `nunit3-console.exe`
-
 ### Logs and output
 
 All test execution logs and result files will be dropped into the `tests\TestResults` folder, and have file names matching

diff --git a/vsintegration/tests/UnitTests/AssemblyResolver.fs b/vsintegration/tests/UnitTests/AssemblyResolver.fs
@@ -1,6 +1,5 @@
 namespace Microsoft.VisualStudio.FSharp
 
-open NUnit.Framework
 open System
 open System.IO
 open System.Reflection
@@ -46,9 +45,3 @@ module AssemblyResolver =
             match found() with
             | None -> Unchecked.defaultof<Assembly>
             | Some name -> Assembly.Load(name) )
-
-[<SetUpFixture>]
-type public AssemblyResolverTestFixture () =
-
-    [<OneTimeSetUp>]
-    member public _.Init () = AssemblyResolver.addResolver ()
diff --git a/vsintegration/tests/UnitTests/DocCommentIdParserTests.fs b/vsintegration/tests/UnitTests/DocCommentIdParserTests.fs
@@ -1,14 +1,11 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-[<NUnit.Framework.TestFixture>]
+
 module Tests.ServiceAnalysis.DocCommentIdParser
 
-open NUnit.Framework
+open Xunit
 open Microsoft.VisualStudio.FSharp.Editor
 
-
-
-
-[<Test>]
+[<Fact>]
 let ``Test DocCommentId parser``() =
     let testData = dict [
         "T:N.X.Nested", DocCommentId.Type ["N"; "X"; "Nested"];

diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorRecovery.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorRecovery.fs
@@ -4,16 +4,14 @@ namespace Tests.LanguageService.ErrorRecovery
 
 open System
 open System.IO
-open NUnit.Framework
+open Xunit
 open Salsa.Salsa
 open Salsa.VsOpsUtils
 open UnitTests.TestLib.Salsa
 open UnitTests.TestLib.Utils
 open UnitTests.TestLib.LanguageService
 open UnitTests.TestLib.ProjectSystem
 
-[<TestFixture>]
-[<Category "LanguageService">] 
 type UsingMSBuild()  = 
     inherit LanguageServiceBaseTests()
 
@@ -25,14 +23,13 @@ type UsingMSBuild()  =
             [ for i = 0 to errorList.Length - 1 do
                 yield errorList.[i].Message]
 
-        Assert.IsTrue(errorList
+        Assert.True(errorList
                           |> GetErrorMessages
                           |> Seq.exists (fun errorMessage ->
                                 errorMessage.Contains(expectedStr)))
 
    // Not a recovery case, but make sure we get a squiggle at the unfinished Main()
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4538_3``() = 
         let fileContent = """
             type MyType() = 
@@ -43,8 +40,7 @@ type UsingMSBuild()  =
         this.VerifyErrorListContainedExpectedString(fileContent,expectedStr)
 
     // Not a recovery case, but make sure we get a squiggle at the unfinished Main()
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4538_4``() =  
         let fileContent = """
             type MyType() = 
@@ -54,8 +50,7 @@ type UsingMSBuild()  =
         let expectedStr = "The block following this 'use' is unfinished. Every code block is an expression and must have a result. 'use' cannot be the final code element in a block. Consider giving this block an explicit result."
         this.VerifyErrorListContainedExpectedString(fileContent,expectedStr)
 
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4881_1``() =  
         let code = 
                                     ["let s = \"\""
@@ -70,8 +65,7 @@ type UsingMSBuild()  =
         let completions = AutoCompleteAtCursor file
         AssertCompListContains(completions,"Split")       
 
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4881_2``() =  
         let code =
                                     ["let s = \"\""
@@ -87,8 +81,7 @@ type UsingMSBuild()  =
         let completions = AutoCompleteAtCursor file
         AssertCompListContains(completions,"Split")      
 
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4881_3``() =  
         let code = 
                                     ["let s = \"\""
@@ -105,8 +98,7 @@ type UsingMSBuild()  =
         AssertCompListContains(completions,"Split")  
 
 
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4881_4``() =  
         let code = 
                                     ["let s = \"\""
@@ -122,8 +114,7 @@ type UsingMSBuild()  =
 
 
     // This case was fixed while investigating 4538.            
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.NotFixing4538_1``() =  
         let code = 
                                     ["type MyType() = "
@@ -139,8 +130,7 @@ type UsingMSBuild()  =
         AssertCompListContains(completions,"MyType")
 
     // This case was fixed while investigating 4538.            
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.NotFixing4538_2``() =  
         let code =
                                     ["type MyType() = "
@@ -156,8 +146,7 @@ type UsingMSBuild()  =
         AssertCompListContains(completions,"MyType")
 
     // This case was fixed while investigating 4538.            
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.NotFixing4538_3``() =  
         let code = 
                                     ["type MyType() = "
@@ -171,8 +160,7 @@ type UsingMSBuild()  =
         let completions = CtrlSpaceCompleteAtCursor file
         AssertCompListContains(completions,"MyType")
 
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4538_1``() =  
         let code = 
                                     ["type MyType() = "
@@ -187,8 +175,7 @@ type UsingMSBuild()  =
         let completions = CtrlSpaceCompleteAtCursor file
         AssertCompListContains(completions,"MyType")    
 
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4538_2``() =  
         let code = 
                                     ["type MyType() = "
@@ -207,8 +194,7 @@ type UsingMSBuild()  =
 
 
 
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4538_5``() =  
         let code = 
                                     ["type MyType() = "
@@ -224,8 +210,7 @@ type UsingMSBuild()  =
         AssertCompListContains(completions,"MyType")          
 
 
-    [<Test>]
-    [<Category("error_recovery")>]
+    [<Fact>]
     member public this.``ErrorRecovery.Bug4594_1``() =  
         let code = 
                                     ["let Bar(xyz) ="
@@ -241,7 +226,7 @@ type UsingMSBuild()  =
     /// In this bug, the Module. at the very end of the file was treated as if it were in the scope
     /// of Module rather than right after it. This check just makes sure we can see a data tip because
     /// Module is available.
-    [<Test>]
+    [<Fact>]
     member public this.``ErrorRecovery.5878_1``() =
         Helper.AssertMemberDataTipContainsInOrder
             (
@@ -268,6 +253,5 @@ type UsingMSBuild()  =
 
 
 // Context project system
-[<TestFixture>] 
 type UsingProjectSystem() = 
     inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)