From a0883bff8f9f0d8798106f187ad2e38126a6e77a Mon Sep 17 00:00:00 2001
From: Ravi Chande <rchande@microsoft.com>
Date: Thu, 2 Feb 2017 10:12:31 -0800
Subject: [PATCH] Fix up tests

---
 .../Intellisense/TestCompletionPresenterSession.vb  |  2 ++
 .../SuggestionModeCompletionProviderTests.vb        | 13 -------------
 .../CSharpDebuggerIntellisenseTests.vb              | 12 ++++++------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/EditorFeatures/TestUtilities2/Intellisense/TestCompletionPresenterSession.vb b/src/EditorFeatures/TestUtilities2/Intellisense/TestCompletionPresenterSession.vb
index 98df09d28bd..9775068ae2f 100644
--- a/src/EditorFeatures/TestUtilities2/Intellisense/TestCompletionPresenterSession.vb
+++ b/src/EditorFeatures/TestUtilities2/Intellisense/TestCompletionPresenterSession.vb
@@ -16,6 +16,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
         Public SelectedItem As CompletionItem
         Public IsSoftSelected As Boolean
         Public SuggestionModeItem As CompletionItem
+        Public SuggestionMode As Boolean
 
         Public Event Dismissed As EventHandler(Of EventArgs) Implements ICompletionPresenterSession.Dismissed
         Public Event ItemSelected As EventHandler(Of CompletionItemEventArgs) Implements ICompletionPresenterSession.ItemSelected
@@ -40,6 +41,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
             Me.SelectedItem = selectedItem
             Me.IsSoftSelected = isSoftSelected
             Me.SuggestionModeItem = suggestionModeItem
+            Me.SuggestionMode = suggestionMode
             Me._completionFilters = completionItemFilters
         End Sub
 
diff --git a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb
index 35a87e62d0d..f8803fb9f4d 100644
--- a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb
@@ -289,19 +289,6 @@ End Class
             Await VerifyBuilderAsync(markup)
         End Function
 
-        <WorkItem(1044441, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1044441")>
-        <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function BuilderInDebugger() As Task
-            Dim markup = <a> 
-Class C1
-    Sub Foo()
-        Dim __o = $$
-    End Sub
-End Class
-</a>
-            Await VerifyBuilderAsync(markup, CompletionTrigger.Default, useDebuggerOptions:=True)
-        End Function
-
         <WorkItem(7213, "https://github.com/dotnet/roslyn/issues/7213")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
         Public Async Function NamespaceDeclarationName_Unqualified() As Task
diff --git a/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb b/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
index 5c1b735cc0e..c9a0375914d 100644
--- a/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
+++ b/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
@@ -687,13 +687,13 @@ $$</Document>
                 Await state.WaitForAsynchronousOperationsAsync()
                 Assert.Equal("args", state.GetCurrentViewLineText())
                 Await state.AssertCompletionSession()
-                Assert.NotNull(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.True(state.CurrentCompletionPresenterSession.SuggestionMode)
                 state.SendToggleCompletionMode()
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.Null(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.False(state.CurrentCompletionPresenterSession.SuggestionMode)
                 state.SendTypeChars(".")
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.Null(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.False(state.CurrentCompletionPresenterSession.SuggestionMode)
             End Using
         End Function
 
@@ -717,13 +717,13 @@ $$</Document>
                 Await state.WaitForAsynchronousOperationsAsync()
                 Assert.Equal("args", state.GetCurrentViewLineText())
                 Await state.AssertCompletionSession()
-                Assert.NotNull(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.True(state.CurrentCompletionPresenterSession.SuggestionMode)
                 state.SendToggleCompletionMode()
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.Null(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.False(state.CurrentCompletionPresenterSession.SuggestionMode)
                 state.SendTypeChars(".")
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.Null(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.False(state.CurrentCompletionPresenterSession.SuggestionMode)
             End Using
         End Function
 
-- 
GitLab