From b1043c3227ac20931094c131414cc28bae876190 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Fri, 20 Nov 2015 00:43:53 -0800
Subject: [PATCH] Make more tests async.

---
 .../AbstractKeywordHighlightingTests.vb            |  6 +++---
 .../CSharpKeywordHighlightingTests.vb              | 14 ++++++++------
 .../VisualBasicKeywordHighlightingTests.vb         | 12 ++++++------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/EditorFeatures/Test2/KeywordHighlighting/AbstractKeywordHighlightingTests.vb b/src/EditorFeatures/Test2/KeywordHighlighting/AbstractKeywordHighlightingTests.vb
index 46c4bc30984..ac908894a95 100644
--- a/src/EditorFeatures/Test2/KeywordHighlighting/AbstractKeywordHighlightingTests.vb
+++ b/src/EditorFeatures/Test2/KeywordHighlighting/AbstractKeywordHighlightingTests.vb
@@ -18,8 +18,8 @@ Imports Roslyn.Utilities
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.KeywordHighlighting
 
     Public MustInherit Class AbstractKeywordHighlightingTests
-        Protected Sub VerifyHighlights(test As XElement, Optional optionIsEnabled As Boolean = True)
-            Using workspace = TestWorkspaceFactory.CreateWorkspace(test)
+        Protected Async Function VerifyHighlightsAsync(test As XElement, Optional optionIsEnabled As Boolean = True) As Tasks.Task
+            Using workspace = Await TestWorkspaceFactory.CreateWorkspaceAsync(test)
                 Dim testDocument = workspace.Documents.Single(Function(d) d.CursorPosition.HasValue)
                 Dim buffer = testDocument.TextBuffer
                 Dim snapshot = testDocument.InitialTextSnapshot
@@ -51,7 +51,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.KeywordHighlighting
 
                 AssertEx.Equal(expectedTags, producedTags)
             End Using
-        End Sub
+        End Function
 
     End Class
 
diff --git a/src/EditorFeatures/Test2/KeywordHighlighting/CSharpKeywordHighlightingTests.vb b/src/EditorFeatures/Test2/KeywordHighlighting/CSharpKeywordHighlightingTests.vb
index d741812af6a..c262cd651c4 100644
--- a/src/EditorFeatures/Test2/KeywordHighlighting/CSharpKeywordHighlightingTests.vb
+++ b/src/EditorFeatures/Test2/KeywordHighlighting/CSharpKeywordHighlightingTests.vb
@@ -1,12 +1,14 @@
 ' 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.KeywordHighlighting
     Public Class CSharpKeywordHighlightingTests
         Inherits AbstractKeywordHighlightingTests
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.KeywordHighlighting)>
-        Public Sub VerifyNoHighlightsWhenOptionDisabled()
-            VerifyHighlights(
+        Public Async Function TestVerifyNoHighlightsWhenOptionDisabled() As Task
+            Await VerifyHighlightsAsync(
                 <Workspace>
                     <Project Language="C#" CommonReferences="true">
                         <Document>
@@ -22,11 +24,11 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.KeywordHighlighting
                     </Project>
                 </Workspace>,
                 optionIsEnabled:=False)
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.KeywordHighlighting)>
-        Public Sub VerifyHighlightsWhenOptionEnabled()
-            VerifyHighlights(
+        Public Async Function TestVerifyHighlightsWhenOptionEnabled() As Task
+            Await VerifyHighlightsAsync(
                 <Workspace>
                     <Project Language="C#" CommonReferences="true">
                         <Document>
@@ -41,6 +43,6 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.KeywordHighlighting
                         </Document>
                     </Project>
                 </Workspace>)
-        End Sub
+        End Function
     End Class
 End Namespace
diff --git a/src/EditorFeatures/Test2/KeywordHighlighting/VisualBasicKeywordHighlightingTests.vb b/src/EditorFeatures/Test2/KeywordHighlighting/VisualBasicKeywordHighlightingTests.vb
index ebfcf2fe831..f7188507f36 100644
--- a/src/EditorFeatures/Test2/KeywordHighlighting/VisualBasicKeywordHighlightingTests.vb
+++ b/src/EditorFeatures/Test2/KeywordHighlighting/VisualBasicKeywordHighlightingTests.vb
@@ -5,8 +5,8 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.KeywordHighlighting
         Inherits AbstractKeywordHighlightingTests
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.KeywordHighlighting)>
-        Public Sub VerifyNoHighlightsWhenOptionDisabled()
-            VerifyHighlights(
+        Public Async Function VerifyNoHighlightsWhenOptionDisabled() As System.Threading.Tasks.Task
+            Await VerifyHighlightsAsync(
                 <Workspace>
                     <Project Language="Visual Basic" CommonReferences="true">
                         <Document>
@@ -21,11 +21,11 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.KeywordHighlighting
                     </Project>
                 </Workspace>,
                 optionIsEnabled:=False)
-        End Sub
+        End Function
 
         <WpfFact, Trait(Traits.Feature, Traits.Features.KeywordHighlighting)>
-        Public Sub VerifyHighlightsWhenOptionEnabled()
-            VerifyHighlights(
+        Public Async Function VerifyHighlightsWhenOptionEnabled() As System.Threading.Tasks.Task
+            Await VerifyHighlightsAsync(
                 <Workspace>
                     <Project Language="Visual Basic" CommonReferences="true">
                         <Document>
@@ -39,6 +39,6 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.KeywordHighlighting
                         </Document>
                     </Project>
                 </Workspace>)
-        End Sub
+        End Function
     End Class
 End Namespace
-- 
GitLab