Make more tests async.

src/EditorFeatures/Test2/Simplification/AbstractSimplificationTests.vb

@@ -12,8 +12,8 @@ Imports Roslyn.Utilities
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
     Public MustInherit Class AbstractSimplificationTests
 
-        Protected Sub Test(definition As XElement, expected As XElement, Optional simplificationOptions As Dictionary(Of OptionKey, Object) = Nothing)
-            Using workspace = TestWorkspaceFactory.CreateWorkspace(definition)
+        Protected Async Function TestAsync(definition As XElement, expected As XElement, Optional simplificationOptions As Dictionary(Of OptionKey, Object) = Nothing) As System.Threading.Tasks.Task
+            Using workspace = Await TestWorkspaceFactory.CreateWorkspaceAsync(definition)
                 Dim hostDocument = workspace.Documents.Single()
 
                 Dim spansToAddSimplifierAnnotation = hostDocument.AnnotatedSpans.Where(Function(kvp) kvp.Key.StartsWith("Simplify", StringComparison.Ordinal))
@@ -34,7 +34,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
                 Test(workspace, spansToAddSimplifierAnnotation, explicitSpansToSimplifyWithin, expected, simplificationOptions)
             End Using
 
-        End Sub
+        End Function
 
         Private Sub Test(workspace As Workspace,
                          listOfLabelToAddSimplifierAnnotationSpans As IEnumerable(Of KeyValuePair(Of String, IList(Of TextSpan))),

src/EditorFeatures/Test2/Simplification/ExtensionMethodSimplificationTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+Imports System.Threading.Tasks
+
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
     Public Class ExtensionMethodSimplificationTests
         Inherits AbstractSimplificationTests
 
 #Region "Visual Basic tests"
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub VisualBasic_SimplifyExtensionMethodOnce()
+        Public Async Function TestVisualBasic_SimplifyExtensionMethodOnce() As Task
             Dim input =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true">
@@ -49,12 +51,11 @@ Module ProgramExtensions
 End Module
 </code>
 
-            Test(input, expected)
-
-        End Sub
+            Await TestAsync(input, expected)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub VisualBasic_SimplifyExtensionMethodChained()
+        Public Async Function TestVisualBasic_SimplifyExtensionMethodChained() As Task
             Dim input =
 <Workspace>
     <Project Language="Visual Basic" CommonReferences="true">
@@ -97,16 +98,16 @@ Module ProgramExtensions
 End Module
 </code>
 
-            Test(input, expected)
+            Await TestAsync(input, expected)
 
-        End Sub
+        End Function
 
 #End Region
 
 
 #Region "CSharp tests"
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub CSharp_SimplifyExtensionMethodOnce()
+        Public Async Function TestCSharp_SimplifyExtensionMethodOnce() As Task
             Dim input =
 <Workspace>
     <Project Language="C#" CommonReferences="true">
@@ -151,12 +152,12 @@ public static class ProgramExtensions
 }
 </code>
 
-            Test(input, expected)
+            Await TestAsync(input, expected)
 
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub CSharp_SimplifyExtensionMethodChained()
+        Public Async Function TestCSharp_SimplifyExtensionMethodChained() As Task
             Dim input =
 <Workspace>
     <Project Language="C#" CommonReferences="true">
@@ -201,9 +202,9 @@ public static class ProgramExtensions
 }
 </code>
 
-            Test(input, expected)
+            Await TestAsync(input, expected)
 
-        End Sub
+        End Function
 #End Region
 
     End Class

src/EditorFeatures/Test2/Simplification/ModuleNameSimplificationTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+Imports System.Threading.Tasks
+
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
     Public Class ModuleNameSimplifierTest
         Inherits AbstractSimplificationTests
 
         <WorkItem(624131)>
         <WpfFact(), Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub SimplifyModuleNameInNewStatement()
+        Public Async Function TestSimplifyModuleNameInNewStatement() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -43,11 +45,11 @@ Module Program
 End Module
             </text>
 
-            Test(input, expected)
-        End Sub
+            Await TestAsync(input, expected)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub SimplifyModuleNameInNestedNamespaces()
+        Public Async Function TestSimplifyModuleNameInNestedNamespaces() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -108,11 +110,11 @@ Namespace N
 End Namespace
             </text>
 
-            Test(input, expected)
-        End Sub
+            Await TestAsync(input, expected)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub SimplifyModuleNameInDelegateConstruct()
+        Public Async Function TestSimplifyModuleNameInDelegateConstruct() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -123,7 +125,7 @@ Namespace N
         Class C
             Shared Sub Foo()
 
-            End Sub
+            End Function
         End Class
     End Module
 End Namespace
@@ -145,7 +147,7 @@ Namespace N
         Class C
             Shared Sub Foo()
 
-            End Sub
+            End Function
         End Class
     End Module
 End Namespace
@@ -157,12 +159,12 @@ Module Program
 End Module
             </text>
 
-            Test(input, expected)
-        End Sub
+            Await TestAsync(input, expected)
+        End Function
 
         <WorkItem(608198)>
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub DontSimplifyModuleNameInFieldInitializerAndConflictOfModuleNameAndField()
+        Public Async Function TestDontSimplifyModuleNameInFieldInitializerAndConflictOfModuleNameAndField() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -181,12 +183,12 @@ Module X
 End Module
             </text>
 
-            Test(input, expected)
-        End Sub
+            Await TestAsync(input, expected)
+        End Function
 
         <WorkItem(608198)>
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub DontSimplifyModuleNameInFieldInitializerAndConflictOfModuleNameAndField_2()
+        Public Async Function TestDontSimplifyModuleNameInFieldInitializerAndConflictOfModuleNameAndField_2() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -205,8 +207,8 @@ Module X
 End Module
             </text>
 
-            Test(input, expected)
-        End Sub
+            Await TestAsync(input, expected)
+        End Function
 
     End Class
 End Namespace

src/EditorFeatures/Test2/Simplification/TypeInferenceSimplifierTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis.Options
 Imports Microsoft.CodeAnalysis.Simplification
 
@@ -8,7 +9,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
         Inherits AbstractSimplificationTests
         <WorkItem(734369)>
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestDontSimplify1()
+        Public Async Function TestDontSimplify1() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -69,12 +70,12 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WorkItem(734369)>
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestSimplify_ArrayElementConversion()
+        Public Async Function TestSimplify_ArrayElementConversion() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -101,11 +102,11 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestDontSimplify_Using()
+        Public Async Function TestDontSimplify_Using() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -166,11 +167,11 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestDontSimplify_For_0()
+        Public Async Function TestDontSimplify_For_0() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -203,11 +204,11 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestDontSimplify_For_1()
+        Public Async Function TestDontSimplify_For_1() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -254,12 +255,12 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WorkItem(734377)>
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestSimplify1()
+        Public Async Function TestSimplify1() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -304,11 +305,11 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestSimplify2()
+        Public Async Function TestSimplify2() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -357,11 +358,11 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestSimplify_For_1()
+        Public Async Function TestSimplify_For_1() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -408,13 +409,13 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
 #Region "Type Argument Expand/Reduce for Generic Method Calls - 639136"
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestSimplify_For_GenericMethods()
+        Public Async Function TestSimplify_For_GenericMethods() As Task
             Dim input =
         <Workspace>
             <Project Language="C#" CommonReferences="true">
@@ -468,11 +469,11 @@ class D : C
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInference, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub TestSimplify_For_GenericMethods_VB()
+        Public Async Function TestSimplify_For_GenericMethods_VB() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -523,12 +524,12 @@ End Class
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInference, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WorkItem(734377)>
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub VisualBasic_ExplicitTypeDecl_FieldDecl()
+        Public Async Function TestVisualBasic_ExplicitTypeDecl_FieldDecl() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -569,12 +570,12 @@ End Namespace
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 
         <WorkItem(860111)>
         <WpfFact, Trait(Traits.Feature, Traits.Features.Simplification)>
-        Public Sub VisualBasic_ExplicitTypeDecl_MustGetNewSMForAnyReducer()
+        Public Async Function TestVisualBasic_ExplicitTypeDecl_MustGetNewSMForAnyReducer() As Task
             Dim input =
         <Workspace>
             <Project Language="Visual Basic" CommonReferences="true">
@@ -584,7 +585,7 @@ Namespace Y
         Module Program
             Public Dim {|SimplifyParent:t as Integer = {|SimplifyParentParent:Y.X.A|}.getInt()|}
             Sub Main(args As String())
-            End Sub
+            End Function
         End Module
 
         Class A
@@ -605,7 +606,7 @@ Namespace Y
         Module Program
             Public Dim t = A.getInt()
             Sub Main(args As String())
-            End Sub
+            End Function
         End Module
 
         Class A
@@ -619,8 +620,8 @@ End Namespace
 
             Dim simplificationOptionSet = New Dictionary(Of OptionKey, Object) From {{SimplificationOptions.PreferImplicitTypeInLocalDeclaration, True}}
 
-            Test(input, expected, simplificationOptionSet)
-        End Sub
+            Await TestAsync(input, expected, simplificationOptionSet)
+        End Function
 #End Region
 
     End Class

src/EditorFeatures/VisualBasicTest/VisualBasicGoToAdjacentMemberTests.vb

@@ -7,7 +7,6 @@ Imports Microsoft.CodeAnalysis.Editor.CommandHandlers
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 
 Public Class VisualBasicGoToAdjacentMemberTests
-
     <Fact, Trait(Traits.Feature, Traits.Features.GoToAdjacentMember)>
     <WorkItem(4311, "https://github.com/dotnet/roslyn/issues/4311")>
     Public Async Function EmptyFile() As Task