Use AssertCompletionItemsContainAll instead of CompletionItemsContainsAll

src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb

@@ -144,7 +144,7 @@ class c : $$
                 state.SendTypeChars("A")
                 Await state.AssertCompletionSession()
 
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"Attribute", "Exception", "IDisposable"}))
+                state.AssertCompletionItemsContainAll(displayText:={"Attribute", "Exception", "IDisposable"})
             End Using
         End Function
 
@@ -161,7 +161,7 @@ class c { $$
                 state.SendTypeChars("Sy")
                 Await state.AssertCompletionSession()
 
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"OperatingSystem", "System", "SystemException"}))
+                state.AssertCompletionItemsContainAll(displayText:={"OperatingSystem", "System", "SystemException"})
                 state.AssertCompletionItemsDoNotContainAny(displayText:={"Exception", "Activator"})
             End Using
         End Function
@@ -178,7 +178,7 @@ class C { $$ } struct S { } enum E { } interface I { } delegate void D();
 
                 state.SendTypeChars("C")
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"C", "S", "E", "I", "D"}))
+                state.AssertCompletionItemsContainAll(displayText:={"C", "S", "E", "I", "D"})
             End Using
         End Function
 
@@ -194,7 +194,7 @@ $$
 
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"abstract", "class", "namespace"}))
+                state.AssertCompletionItemsContainAll(displayText:={"abstract", "class", "namespace"})
             End Using
         End Function
 
@@ -221,7 +221,7 @@ class c { void M() { 3.$$ } }
 
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ToString"}))
+                state.AssertCompletionItemsContainAll({"ToString"})
             End Using
         End Function
 
@@ -238,7 +238,7 @@ class c { void M() { this$$.ToString() } }
 
                 state.SendTypeChars(".")
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ToString"}))
+                state.AssertCompletionItemsContainAll({"ToString"})
             End Using
         End Function
 
@@ -271,7 +271,7 @@ class c { void M() { this.$$.ToString() } }
 
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ToString"}))
+                state.AssertCompletionItemsContainAll({"ToString"})
             End Using
         End Function
 
@@ -340,11 +340,11 @@ class C
                 state.SendTypeChars(" ")
                 Await state.WaitForAsynchronousOperationsAsync()
                 Await state.AssertSelectedCompletionItem(displayText:="List<int>", isHardSelected:=True)
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"LinkedList", "List", "System"}))
+                state.AssertCompletionItemsContainAll(displayText:={"LinkedList", "List", "System"})
                 state.SendTypeChars("Li")
                 Await state.WaitForAsynchronousOperationsAsync()
                 Await state.AssertSelectedCompletionItem(displayText:="List<int>", isHardSelected:=True)
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"LinkedList", "List"}))
+                state.AssertCompletionItemsContainAll(displayText:={"LinkedList", "List"})
                 state.AssertCompletionItemsDoNotContainAny(displayText:={"System"})
                 state.SendTypeChars("n")
                 Await state.WaitForAsynchronousOperationsAsync()
@@ -519,7 +519,7 @@ class Variable
                 state.SendTypeChars(" ")
                 Assert.Contains("(Variable x, Variable ", state.GetLineTextFromCaretPosition(), StringComparison.Ordinal)
                 Await state.AssertSelectedCompletionItem(displayText:="Variable", isHardSelected:=False)
-                Assert.True(state.CompletionItemsContainsAll({"variable"}))
+                state.AssertCompletionItemsContainAll({"variable"})
             End Using
         End Function
 
@@ -1755,7 +1755,7 @@ class Goo
                 state.SendTypeChars("a")
                 Await state.AssertCompletionSession()
                 Assert.True(state.GetCompletionItems().Any(Function(i) i.DisplayText = "num" AndAlso i.DisplayTextSuffix = ":"))
-                Assert.True(state.CompletionItemsContainsAll({"System", "int"}))
+                state.AssertCompletionItemsContainAll({"System", "int"})
             End Using
         End Function
 

src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests_InternalsVisibleTo.vb

@@ -29,7 +29,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 </Workspace>)
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1", "ClassLibrary2", "ClassLibrary3"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1", "ClassLibrary2", "ClassLibrary3"})
             End Using
         End Function
 
@@ -47,7 +47,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 </Workspace>)
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -66,7 +66,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 Await state.AssertNoCompletionSession()
                 state.SendTypeChars(""""c)
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -93,7 +93,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1"})
                 state.SendTypeChars(""""c)
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -112,7 +112,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 Await state.AssertNoCompletionSession()
                 state.SendTypeChars("a"c)
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -206,7 +206,7 @@ using System.Reflection;
                 Await state.WaitForAsynchronousOperationsAsync()
                 If hasItems Then
                     Await state.AssertCompletionSession()
-                    Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                    state.AssertCompletionItemsContainAll({"ClassLibrary1"})
                 Else
                     Await state.AssertNoCompletionSession
                 End If
@@ -321,7 +321,7 @@ using IVT = System.Runtime.CompilerServices.InternalsVisibleToAttribute;
                 </Workspace>)
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -486,7 +486,7 @@ namespace Test
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1", "ClassLibrary2"})
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary3"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary3"})
             End Using
         End Function
 
@@ -520,7 +520,7 @@ namespace A {
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1", "ClassLibrary2"})
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary3"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary3"})
             End Using
         End Function
 
@@ -564,7 +564,7 @@ namespace A {
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1", "ClassLibrary2", "ClassLibrary3", "ClassLibrary4", "ClassLibrary5", "ClassLibrary6", "ClassLibrary7", "ClassLibrary8"})
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary9"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary9"})
             End Using
         End Function
 
@@ -587,7 +587,7 @@ using System.Reflection;
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 ' ClassLibrary1 must be listed because the existing attribute argument can't be resolved to a constant.
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -615,7 +615,7 @@ using System.Reflection;
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1"})
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary2"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary2"})
             End Using
         End Function
 

src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests.vb

@@ -652,7 +652,7 @@ Class c
 End Class</document>)
                 state.SendTypeChars("Sy")
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"OperatingSystem", "System"}))
+                state.AssertCompletionItemsContainAll(displayText:={"OperatingSystem", "System"})
                 state.AssertCompletionItemsDoNotContainAny(displayText:={"Exception", "Activator"})
             End Using
         End Function
@@ -668,7 +668,7 @@ Class c
 End Class</document>)
                 state.SendTypeChars(" ")
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"Attribute", "Exception"}))
+                state.AssertCompletionItemsContainAll(displayText:={"Attribute", "Exception"})
             End Using
         End Function
 
@@ -711,11 +711,11 @@ End Module]]></Document>)
                 state.SendTypeChars(" ")
                 Await state.WaitForAsynchronousOperationsAsync()
                 Await state.AssertSelectedCompletionItem(displayText:="List(Of Integer)", isHardSelected:=True)
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"LinkedList", "List", "System"}))
+                state.AssertCompletionItemsContainAll(displayText:={"LinkedList", "List", "System"})
                 state.SendTypeChars("Li")
                 Await state.WaitForAsynchronousOperationsAsync()
                 Await state.AssertSelectedCompletionItem(displayText:="List(Of Integer)", isHardSelected:=True)
-                Assert.True(state.CompletionItemsContainsAll(displayText:={"LinkedList", "List"}))
+                state.AssertCompletionItemsContainAll(displayText:={"LinkedList", "List"})
                 state.AssertCompletionItemsDoNotContainAny(displayText:={"System"})
                 state.SendTypeChars("n")
                 Await state.WaitForAsynchronousOperationsAsync()
@@ -874,7 +874,7 @@ end class
 
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ToString"}))
+                state.AssertCompletionItemsContainAll({"ToString"})
             End Using
         End Function
 
@@ -2839,7 +2839,7 @@ End Class
 
                 state.SendInvokeCompletionList()
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.True(state.CompletionItemsContainsAll({"x", "Shortcut"}))
+                state.AssertCompletionItemsContainAll({"x", "Shortcut"})
             End Using
         End Function
 

src/EditorFeatures/Test2/IntelliSense/VisualBasicCompletionCommandHandlerTests_InternalsVisibleTo.vb

@@ -28,7 +28,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 </Workspace>)
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1", "ClassLibrary2", "ClassLibrary3"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1", "ClassLibrary2", "ClassLibrary3"})
             End Using
         End Function
 
@@ -46,7 +46,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 </Workspace>)
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -65,7 +65,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 Await state.AssertNoCompletionSession()
                 state.SendTypeChars(""""c)
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -92,7 +92,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1"})
                 state.SendTypeChars(""""c)
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -111,7 +111,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
                 Await state.AssertNoCompletionSession()
                 state.SendTypeChars("a"c)
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -201,7 +201,7 @@ Imports System.Reflection
                 Await state.WaitForAsynchronousOperationsAsync()
                 If hasItems Then
                     Await state.AssertCompletionSession()
-                    Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                    state.AssertCompletionItemsContainAll({"ClassLibrary1"})
                 Else
                     Await state.AssertSessionIsNothingOrNoCompletionItemLike("ClassLibrary1")
                 End If
@@ -298,7 +298,7 @@ Imports IVT = System.Runtime.CompilerServices.InternalsVisibleToAttribute
                 </Workspace>)
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -462,7 +462,7 @@ End Namespace
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1", "ClassLibrary2"})
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary3"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary3"})
             End Using
         End Function
 
@@ -496,7 +496,7 @@ End Namespace
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1", "ClassLibrary2"})
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary3"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary3"})
             End Using
         End Function
 
@@ -538,7 +538,7 @@ End Class
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1", "ClassLibrary2", "ClassLibrary3", "ClassLibrary4", "ClassLibrary5", "ClassLibrary6", "ClassLibrary7"})
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary8"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary8"})
             End Using
         End Function
 
@@ -561,7 +561,7 @@ Imports System.Reflection
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 ' ClassLibrary1 must be listed because the existing attribute argument can't be resolved to a constant.
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary1"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary1"})
             End Using
         End Function
 
@@ -590,7 +590,7 @@ Imports System.Reflection
                 state.SendInvokeCompletionList()
                 Await state.AssertCompletionSession()
                 state.AssertCompletionItemsDoNotContainAny({"ClassLibrary1"})
-                Assert.True(state.CompletionItemsContainsAll({"ClassLibrary2"}))
+                state.AssertCompletionItemsContainAll({"ClassLibrary2"})
             End Using
         End Function
     End Class

src/EditorFeatures/TestUtilities2/Intellisense/TestStateBase.vb

@@ -213,6 +213,12 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
 
         Public MustOverride Overloads Function CompletionItemsContainsAll(displayText As String()) As Boolean
 
+        Public Sub AssertCompletionItemsContainAll(displayText As String())
+            AssertNoAsynchronousOperationsRunning()
+            Dim items = GetCompletionItems()
+            Assert.True(displayText.All(Function(v) items.Any(Function(i) i.DisplayText = v)))
+        End Sub
+
         Public Sub AssertCompletionItemsDoNotContainAny(displayText As String())
             AssertNoAsynchronousOperationsRunning()
             Dim items = GetCompletionItems()