From 245c71788c6def825f6e8e99207f2fdd7c8195f2 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 19 Nov 2015 21:38:05 -0800
Subject: [PATCH] Make more tests async.

---
 .../Core/Test/VsNavInfo/VsNavInfoTests.vb     | 191 +++++++++---------
 1 file changed, 96 insertions(+), 95 deletions(-)

diff --git a/src/VisualStudio/Core/Test/VsNavInfo/VsNavInfoTests.vb b/src/VisualStudio/Core/Test/VsNavInfo/VsNavInfoTests.vb
index 9a47406558b..2ee2dd3c406 100644
--- a/src/VisualStudio/Core/Test/VsNavInfo/VsNavInfoTests.vb
+++ b/src/VisualStudio/Core/Test/VsNavInfo/VsNavInfoTests.vb
@@ -1,4 +1,5 @@
 Imports System.Threading
+Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 Imports Microsoft.CodeAnalysis.FindSymbols
 Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library
@@ -11,7 +12,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
 #Region "C# Tests"
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestNamespace()
+        Public Async Function TestCSharp_TestNamespace() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -21,7 +22,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("CSharpTestAssembly"),
                     [Namespace]("N")
@@ -30,10 +31,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     Package("CSharpTestAssembly"),
                     [Namespace]("N")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestClass()
+        Public Async Function TestCSharp_TestClass() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -46,7 +47,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("CSharpTestAssembly"),
                     [Namespace]("N"),
@@ -57,10 +58,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Namespace]("N"),
                     [Class]("C")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestMethod()
+        Public Async Function TestCSharp_TestMethod() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -76,7 +77,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("CSharpTestAssembly"),
                     [Namespace]("N"),
@@ -89,10 +90,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("C"),
                     Member("M()")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestMethod_Parameters()
+        Public Async Function TestCSharp_TestMethod_Parameters() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -111,7 +112,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("CSharpTestAssembly"),
                     [Namespace]("N"),
@@ -124,10 +125,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("C"),
                     Member("M(int, int)")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestMetadata_Class1()
+        Public Async Function TestCSharp_TestMetadata_Class1() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -141,7 +142,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -152,10 +153,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Namespace]("System"),
                     [Class]("String")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestMetadata_Class2()
+        Public Async Function TestCSharp_TestMetadata_Class2() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -169,7 +170,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -181,10 +182,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Namespace]("System.Text"),
                     [Class]("StringBuilder")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestMetadata_Ctor1()
+        Public Async Function TestCSharp_TestMetadata_Ctor1() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -198,7 +199,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -212,10 +213,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("StringBuilder"),
                     Member("StringBuilder()")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestMetadata_Ctor2()
+        Public Async Function TestCSharp_TestMetadata_Ctor2() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -229,7 +230,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -242,10 +243,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("String"),
                     Member("String(char, int)")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestMetadata_Method()
+        Public Async Function TestCSharp_TestMetadata_Method() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -259,7 +260,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -272,10 +273,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("String"),
                     Member("Replace(char, char)")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestMetadata_GenericType()
+        Public Async Function TestCSharp_TestMetadata_GenericType() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -289,7 +290,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -302,10 +303,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Namespace]("System.Collections.Generic"),
                     [Class]("List<T>")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestMetadata_GenericMethod()
+        Public Async Function TestCSharp_TestMetadata_GenericMethod() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -323,7 +324,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -336,10 +337,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("Array"),
                     Member("AsReadOnly<T>(T[])")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestNull_Parameter()
+        Public Async Function TestCSharp_TestNull_Parameter() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -352,11 +353,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            TestIsNull(workspace)
-        End Sub
+            Await TestIsNullAsync(workspace)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestNull_Local()
+        Public Async Function TestCSharp_TestNull_Local() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -372,11 +373,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            TestIsNull(workspace)
-        End Sub
+            Await TestIsNullAsync(workspace)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub CSharp_TestNull_Label()
+        Public Async Function TestCSharp_TestNull_Label() As Task
             Dim workspace =
 <Workspace>
     <Project Language="C#" CommonReferences="true" AssemblyName="CSharpTestAssembly">
@@ -393,15 +394,15 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            TestIsNull(workspace)
-        End Sub
+            Await TestIsNullAsync(workspace)
+        End Function
 
 #End Region
 
 #Region "Visual Basic Tests"
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestNamespace()
+        Public Async Function TestVisualBasic_TestNamespace() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -412,7 +413,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("VBTestAssembly"),
                     [Namespace]("N")
@@ -421,10 +422,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     Package("VBTestAssembly"),
                     [Namespace]("N")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestClass()
+        Public Async Function TestVisualBasic_TestClass() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -437,7 +438,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("VBTestAssembly"),
                     [Namespace]("N"),
@@ -448,10 +449,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Namespace]("N"),
                     [Class]("C")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMember_Sub()
+        Public Async Function TestVisualBasic_TestMember_Sub() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -466,7 +467,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("VBTestAssembly"),
                     [Namespace]("N"),
@@ -479,10 +480,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("C"),
                     Member("M()")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMember_Function()
+        Public Async Function TestVisualBasic_TestMember_Function() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -497,7 +498,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("VBTestAssembly"),
                     [Namespace]("N"),
@@ -510,10 +511,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("C"),
                     Member("M() As Integer")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMember_Parameters()
+        Public Async Function TestVisualBasic_TestMember_Parameters() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -528,7 +529,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("VBTestAssembly"),
                     [Namespace]("N"),
@@ -541,10 +542,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("C"),
                     Member("M(Integer, Integer) As Integer")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMetadata_Class1()
+        Public Async Function TestVisualBasic_TestMetadata_Class1() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -557,7 +558,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -568,10 +569,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Namespace]("System"),
                     [Class]("String")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMetadata_Class2()
+        Public Async Function TestVisualBasic_TestMetadata_Class2() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -584,7 +585,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -596,10 +597,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Namespace]("System.Text"),
                     [Class]("StringBuilder")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMetadata_Ctor1()
+        Public Async Function TestVisualBasic_TestMetadata_Ctor1() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -612,7 +613,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -626,10 +627,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("StringBuilder"),
                     Member("New()")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMetadata_Ctor2()
+        Public Async Function TestVisualBasic_TestMetadata_Ctor2() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -642,7 +643,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -655,10 +656,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("String"),
                     Member("New(Char, Integer)")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMetadata_Method()
+        Public Async Function TestVisualBasic_TestMetadata_Method() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -671,7 +672,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -684,10 +685,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("String"),
                     Member("Replace(Char, Char) As String")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMetadata_GenericType()
+        Public Async Function TestVisualBasic_TestMetadata_GenericType() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -700,7 +701,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -713,10 +714,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Namespace]("System.Collections.Generic"),
                     [Class]("List(Of T)")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestMetadata_GenericMethod()
+        Public Async Function TestVisualBasic_TestMetadata_GenericMethod() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VisualBasicTestAssembly">
@@ -732,7 +733,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            Test(workspace,
+            Await TestAsync(workspace,
                  canonicalNodes:={
                     Package("Z:\FxReferenceAssembliesUri"),
                     [Namespace]("System"),
@@ -745,10 +746,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     [Class]("Array"),
                     Member("AsReadOnly(Of T)(T()) As System.Collections.ObjectModel.ReadOnlyCollection(Of T)")
                  })
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestNull_Parameter()
+        Public Async Function TestVisualBasic_TestNull_Parameter() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -761,11 +762,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            TestIsNull(workspace)
-        End Sub
+            Await TestIsNullAsync(workspace)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestNull_Local()
+        Public Async Function TestVisualBasic_TestNull_Local() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -779,11 +780,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            TestIsNull(workspace)
-        End Sub
+            Await TestIsNullAsync(workspace)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.VsNavInfo)>
-        Public Sub VisualBasic_TestNull_Label()
+        Public Async Function TestVisualBasic_TestNull_Label() As Task
             Dim workspace =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true" AssemblyName="VBTestAssembly">
@@ -801,8 +802,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
     </Project>
 </Workspace>
 
-            TestIsNull(workspace)
-        End Sub
+            Await TestIsNullAsync(workspace)
+        End Function
 
 #End Region
 
@@ -858,14 +859,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
             Assert.Equal(index, verifiers.Length)
         End Sub
 
-        Private Shared Sub Test(
+        Private Shared Async Function TestAsync(
             workspaceDefinition As XElement,
             Optional useExpandedHierarchy As Boolean = False,
             Optional canonicalNodes As NodeVerifier() = Nothing,
             Optional presentationNodes As NodeVerifier() = Nothing
-        )
+        ) As Tasks.Task
 
-            Using workspace = TestWorkspaceFactory.CreateWorkspace(workspaceDefinition, exportProvider:=VisualStudioTestExportProvider.ExportProvider)
+            Using workspace = Await TestWorkspaceFactory.CreateWorkspaceAsync(workspaceDefinition, exportProvider:=VisualStudioTestExportProvider.ExportProvider)
                 Dim hostDocument = workspace.DocumentWithCursor
                 Assert.True(hostDocument IsNot Nothing, "Test defined without cursor position")
 
@@ -896,14 +897,14 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                     VerifyNodes(enumerator, presentationNodes)
                 End If
             End Using
-        End Sub
+        End Function
 
-        Private Shared Sub TestIsNull(
+        Private Shared Async Function TestIsNullAsync(
             workspaceDefinition As XElement,
             Optional useExpandedHierarchy As Boolean = False
-        )
+        ) As Tasks.Task
 
-            Using workspace = TestWorkspaceFactory.CreateWorkspace(workspaceDefinition, exportProvider:=VisualStudioTestExportProvider.ExportProvider)
+            Using workspace = Await TestWorkspaceFactory.CreateWorkspaceAsync(workspaceDefinition, exportProvider:=VisualStudioTestExportProvider.ExportProvider)
                 Dim hostDocument = workspace.DocumentWithCursor
                 Assert.True(hostDocument IsNot Nothing, "Test defined without cursor position")
 
@@ -920,7 +921,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.VsNavInfo
                 Dim navInfo = libraryService.NavInfoFactory.CreateForSymbol(symbol, document.Project, compilation, useExpandedHierarchy)
                 Assert.Null(navInfo)
             End Using
-        End Sub
+        End Function
 
     End Class
 End Namespace
\ No newline at end of file
-- 
GitLab