Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 f2745d7c 编写于 作者: C Cyrus Najmabadi
浏览文件
操作

Make codemodel tests async.

上级 3a9597d9
展开全部 隐藏空白更改
内联 并排
Showing with 6265 addition and 6217 deletion
src/VisualStudio/Core/Test/CodeModel/AbstractCodeAttributeTests.vb
浏览文件 @ f2745d7c
......@@ -55,8 +55,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Return codeElement.AddArgument(data.Value, data.Name, data.Position)
End Function
Protected Sub TestAttributeArguments(code As XElement, ParamArray expectedAttributeArguments() As Action(Of Object))
TestElement(code,
Protected Async Function TestAttributeArguments(code As XElement, ParamArray expectedAttributeArguments() As Action(Of Object)) As Tasks.Task
Await TestElement(code,
Sub(codeElement)
Dim attributes = GetAttributeArguments(codeElement)
Assert.Equal(expectedAttributeArguments.Length, attributes.Count)
......@@ -65,61 +65,61 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
expectedAttributeArguments(i - 1)(attributes.Item(i))
Next
End Sub)
End Sub
End Function
Protected Sub TestTarget(code As XElement, expectedTarget As String)
TestElement(code,
Protected Async Function TestTarget(code As XElement, expectedTarget As String) As Tasks.Task
Await TestElement(code,
Sub(codeElement)
Dim target = GetTarget(codeElement)
Assert.Equal(expectedTarget, target)
End Sub)
End Sub
End Function
Protected Sub TestSetTarget(code As XElement, expectedCode As XElement, target As String)
TestElementUpdate(code, expectedCode,
Protected Async Function TestSetTarget(code As XElement, expectedCode As XElement, target As String) As Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
codeElement.Target = target
End Sub)
End Sub
End Function
Protected Sub TestValue(code As XElement, expectedValue As String)
TestElement(code,
Protected Async Function TestValue(code As XElement, expectedValue As String) As Tasks.Task
Await TestElement(code,
Sub(codeElement)
Dim target = GetValue(codeElement)
Assert.Equal(expectedValue, target)
End Sub)
End Sub
End Function
Protected Sub TestSetValue(code As XElement, expectedCode As XElement, value As String)
TestElementUpdate(code, expectedCode,
Protected Async Function TestSetValue(code As XElement, expectedCode As XElement, value As String) As Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
codeElement.Value = value
End Sub)
End Sub
End Function
Protected Sub TestAddAttributeArgument(code As XElement, expectedCode As XElement, data As AttributeArgumentData)
TestElementUpdate(code, expectedCode,
Protected Async Function TestAddAttributeArgument(code As XElement, expectedCode As XElement, data As AttributeArgumentData) As Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
Dim attributeArgument = AddAttributeArgument(codeElement, data)
Assert.NotNull(attributeArgument)
Assert.Equal(data.Name, attributeArgument.Name)
End Sub)
End Sub
End Function
Protected Sub TestDelete(code As XElement, expectedCode As XElement)
TestElementUpdate(code, expectedCode,
Protected Async Function TestDelete(code As XElement, expectedCode As XElement) As Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
codeElement.Delete()
End Sub)
End Sub
End Function
Protected Sub TestDeleteAttributeArgument(code As XElement, expectedCode As XElement, indexToDelete As Integer)
TestElementUpdate(code, expectedCode,
Protected Async Function TestDeleteAttributeArgument(code As XElement, expectedCode As XElement, indexToDelete As Integer) As Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
Dim argument = CType(codeElement.Arguments.Item(indexToDelete), EnvDTE80.CodeAttributeArgument)
argument.Delete()
End Sub)
End Sub
End Function
Protected Function IsAttributeArgument(Optional name As String = Nothing, Optional value As String = Nothing) As Action(Of Object)
Return _
......@@ -137,8 +137,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
End Sub
End Function
Protected Sub TestAttributeArgumentStartPoint(code As XElement, index As Integer, ParamArray expectedParts() As Action(Of Func(Of EnvDTE.vsCMPart, EnvDTE.TextPoint)))
TestElement(code,
Protected Async Function TestAttributeArgumentStartPoint(code As XElement, index As Integer, ParamArray expectedParts() As Action(Of Func(Of EnvDTE.vsCMPart, EnvDTE.TextPoint))) As Tasks.Task
Await TestElement(code,
Sub(codeElement)
Dim arg = CType(codeElement.Arguments.Item(index), EnvDTE80.CodeAttributeArgument)
......@@ -148,10 +148,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
action(startPointGetter)
Next
End Sub)
End Sub
End Function
Protected Sub TestAttributeArgumentEndPoint(code As XElement, index As Integer, ParamArray expectedParts() As Action(Of Func(Of EnvDTE.vsCMPart, EnvDTE.TextPoint)))
TestElement(code,
Protected Async Function TestAttributeArgumentEndPoint(code As XElement, index As Integer, ParamArray expectedParts() As Action(Of Func(Of EnvDTE.vsCMPart, EnvDTE.TextPoint))) As Tasks.Task
Await TestElement(code,
Sub(codeElement)
Dim arg = CType(codeElement.Arguments.Item(index), EnvDTE80.CodeAttributeArgument)
......@@ -161,7 +161,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
action(endPointGetter)
Next
End Sub)
End Sub
End Function
End Class
End Namespace
......
src/VisualStudio/Core/Test/CodeModel/AbstractCodeClassTests.vb
浏览文件 @ f2745d7c
......@@ -166,8 +166,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
codeElement.RemoveInterface(element)
End Sub
Protected Sub TestGetBaseName(code As XElement, expectedBaseName As String)
TestElement(code,
Protected Async Function TestGetBaseName(code As XElement, expectedBaseName As String) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeClass)
Dim codeClassBase = TryCast(codeClass, ICodeClassBase)
Assert.NotNull(codeClassBase)
......@@ -178,6 +178,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Assert.Equal(expectedBaseName, baseName)
End Sub)
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractCodeDelegateTests.vb
浏览文件 @ f2745d7c
......@@ -76,13 +76,13 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
codeElement.RemoveParameter(child)
End Sub
Protected Sub TestBaseClass(code As XElement, expectedFullName As String)
TestElement(code,
Protected Async Function TestBaseClass(code As XElement, expectedFullName As String) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.NotNull(codeElement.BaseClass)
Assert.Equal(expectedFullName, codeElement.BaseClass.FullName)
End Sub)
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractCodeEventTests.vb
浏览文件 @ f2745d7c
......@@ -72,12 +72,12 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Return codeElement.AddAttribute(data.Name, data.Value, data.Position)
End Function
Protected Sub TestIsPropertyStyleEvent(code As XElement, expected As Boolean)
TestElement(code,
Protected Async Function TestIsPropertyStyleEvent(code As XElement, expected As Boolean) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, codeElement.IsPropertyStyleEvent)
End Sub)
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractCodeFunctionTests.vb
浏览文件 @ f2745d7c
......@@ -130,34 +130,34 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Throw New NotSupportedException
End Function
Protected Sub TestCanOverride(code As XElement, expected As Boolean)
TestElement(code,
Protected Async Function TestCanOverride(code As XElement, expected As Boolean) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, codeElement.CanOverride)
End Sub)
End Sub
End Function
Protected Sub TestSetCanOverride(code As XElement, expectedCode As XElement, value As Boolean)
TestSetCanOverride(code, expectedCode, value, NoThrow(Of Boolean)())
End Sub
Protected Async Function TestSetCanOverride(code As XElement, expectedCode As XElement, value As Boolean) As Threading.Tasks.Task
Await TestSetCanOverride(code, expectedCode, value, NoThrow(Of Boolean)())
End Function
Protected Sub TestSetCanOverride(code As XElement, expectedCode As XElement, value As Boolean, action As SetterAction(Of Boolean))
TestElementUpdate(code, expectedCode,
Protected Async Function TestSetCanOverride(code As XElement, expectedCode As XElement, value As Boolean, action As SetterAction(Of Boolean)) As Threading.Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
action(value, Sub(v) codeElement.CanOverride = v)
End Sub)
End Sub
End Function
Protected Sub TestIsOverloaded(code As XElement, expectedOverloaded As Boolean)
TestElement(code,
Protected Async Function TestIsOverloaded(code As XElement, expectedOverloaded As Boolean) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Dim overloaded = GetIsOverloaded(codeElement)
Assert.Equal(expectedOverloaded, overloaded)
End Sub)
End Sub
End Function
Protected Sub TestOverloadsUniqueSignatures(code As XElement, ParamArray expectedOverloadNames As String())
TestElement(code,
Protected Async Function TestOverloadsUniqueSignatures(code As XElement, ParamArray expectedOverloadNames As String()) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Dim actualOverloads = GetOverloads(codeElement)
Assert.Equal(expectedOverloadNames.Count, actualOverloads.Count)
......@@ -167,49 +167,49 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Assert.True(expectedOverloadNames.Contains(signature))
Next
End Sub)
End Sub
End Function
Protected Sub TestFunctionKind(code As XElement, expected As EnvDTE.vsCMFunction)
TestElement(code,
Protected Async Function TestFunctionKind(code As XElement, expected As EnvDTE.vsCMFunction) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, codeElement.FunctionKind)
End Sub)
End Sub
End Function
Protected Sub TestFunctionKind(code As XElement, expected As EnvDTE80.vsCMFunction2)
TestElement(code,
Protected Async Function TestFunctionKind(code As XElement, expected As EnvDTE80.vsCMFunction2) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, CType(codeElement.FunctionKind, EnvDTE80.vsCMFunction2))
End Sub)
End Sub
End Function
Protected Sub TestExtensionMethodExtender_IsExtension(code As XElement, expected As Boolean)
TestElement(code,
Protected Async Function TestExtensionMethodExtender_IsExtension(code As XElement, expected As Boolean) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, ExtensionMethodExtender_GetIsExtension(codeElement))
End Sub)
End Sub
End Function
Protected Sub TestPartialMethodExtender_IsPartial(code As XElement, expected As Boolean)
TestElement(code,
Protected Async Function TestPartialMethodExtender_IsPartial(code As XElement, expected As Boolean) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, PartialMethodExtender_GetIsPartial(codeElement))
End Sub)
End Sub
End Function
Protected Sub TestPartialMethodExtender_IsDeclaration(code As XElement, expected As Boolean)
TestElement(code,
Protected Async Function TestPartialMethodExtender_IsDeclaration(code As XElement, expected As Boolean) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, PartialMethodExtender_GetIsDeclaration(codeElement))
End Sub)
End Sub
End Function
Protected Sub TestPartialMethodExtender_HasOtherPart(code As XElement, expected As Boolean)
TestElement(code,
Protected Async Function TestPartialMethodExtender_HasOtherPart(code As XElement, expected As Boolean) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, PartialMethodExtender_GetHasOtherPart(codeElement))
End Sub)
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractCodeImportTests.vb
浏览文件 @ f2745d7c
......@@ -36,12 +36,12 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Return Sub(value) codeElement.Name = value
End Function
Protected Sub TestNamespace(code As XElement, expectedNamespace As String)
TestElement(code,
Protected Async Function TestNamespace(code As XElement, expectedNamespace As String) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expectedNamespace, codeElement.Namespace)
End Sub)
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractCodeModelObjectTests.vb
浏览文件 @ f2745d7c
......@@ -13,65 +13,65 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
</Workspace>
End Function
Protected Overridable Sub TestAddAttribute(code As XElement, expectedCode As XElement, data As AttributeData)
Protected Overridable Function TestAddAttribute(code As XElement, expectedCode As XElement, data As AttributeData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddClass(code As XElement, expectedCode As XElement, data As ClassData)
Protected Overridable Function TestAddClass(code As XElement, expectedCode As XElement, data As ClassData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddDelegate(code As XElement, expectedCode As XElement, data As DelegateData)
Protected Overridable Function TestAddDelegate(code As XElement, expectedCode As XElement, data As DelegateData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddEnum(code As XElement, expectedCode As XElement, data As EnumData)
Protected Overridable Function TestAddEnum(code As XElement, expectedCode As XElement, data As EnumData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddEnumMember(code As XElement, expectedCode As XElement, data As EnumMemberData)
Protected Overridable Function TestAddEnumMember(code As XElement, expectedCode As XElement, data As EnumMemberData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddEvent(code As XElement, expectedCode As XElement, data As EventData)
Protected Overridable Function TestAddEvent(code As XElement, expectedCode As XElement, data As EventData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddFunction(code As XElement, expectedCode As XElement, data As FunctionData)
Protected Overridable Function TestAddFunction(code As XElement, expectedCode As XElement, data As FunctionData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddImport(code As XElement, expectedCode As XElement, data As ImportData)
Protected Overridable Function TestAddImport(code As XElement, expectedCode As XElement, data As ImportData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddInterface(code As XElement, expectedCode As XElement, data As InterfaceData)
Protected Overridable Function TestAddInterface(code As XElement, expectedCode As XElement, data As InterfaceData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddNamespace(code As XElement, expectedCode As XElement, data As NamespaceData)
Protected Overridable Function TestAddNamespace(code As XElement, expectedCode As XElement, data As NamespaceData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddParameter(code As XElement, expectedCode As XElement, data As ParameterData)
Protected Overridable Function TestAddParameter(code As XElement, expectedCode As XElement, data As ParameterData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddProperty(code As XElement, expectedCode As XElement, data As PropertyData)
Protected Overridable Function TestAddProperty(code As XElement, expectedCode As XElement, data As PropertyData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddStruct(code As XElement, expectedCode As XElement, data As StructData)
Protected Overridable Function TestAddStruct(code As XElement, expectedCode As XElement, data As StructData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestAddVariable(code As XElement, expectedCode As XElement, data As VariableData)
Protected Overridable Function TestAddVariable(code As XElement, expectedCode As XElement, data As VariableData) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Overridable Sub TestRemoveChild(code As XElement, expectedCode As XElement, child As Object)
Protected Overridable Function TestRemoveChild(code As XElement, expectedCode As XElement, child As Object) As Threading.Tasks.Task
Throw New NotImplementedException
End Sub
End Function
Protected Sub TestCodeTypeRef(codeTypeRef As EnvDTE.CodeTypeRef, data As CodeTypeRefData)
Assert.NotNull(codeTypeRef)
......
src/VisualStudio/Core/Test/CodeModel/AbstractCodeParameterTests.vb
浏览文件 @ f2745d7c
......@@ -64,42 +64,42 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Return codeElement.AddAttribute(data.Name, data.Value, data.Position)
End Function
Protected Sub TestParameterKind(code As XElement, kind As vsCMParameterKind)
TestElement(code,
Protected Async Function TestParameterKind(code As XElement, kind As vsCMParameterKind) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(kind, codeElement.ParameterKind)
End Sub)
End Sub
End Function
Protected Sub TestDefaultValue(code As XElement, expectedValue As String)
TestElement(code,
Protected Async Function TestDefaultValue(code As XElement, expectedValue As String) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expectedValue, codeElement.DefaultValue)
End Sub)
End Sub
End Function
Protected Sub TestSetParameterKind(code As XElement, expectedCode As XElement, kind As EnvDTE80.vsCMParameterKind)
TestSetParameterKind(code, expectedCode, kind, NoThrow(Of EnvDTE80.vsCMParameterKind)())
End Sub
Protected Async Function TestSetParameterKind(code As XElement, expectedCode As XElement, kind As EnvDTE80.vsCMParameterKind) As Threading.Tasks.Task
Await TestSetParameterKind(code, expectedCode, kind, NoThrow(Of EnvDTE80.vsCMParameterKind)())
End Function
Protected Sub TestSetParameterKind(code As XElement, expectedCode As XElement, kind As EnvDTE80.vsCMParameterKind, action As SetterAction(Of EnvDTE80.vsCMParameterKind))
TestElementUpdate(code, expectedCode,
Protected Async Function TestSetParameterKind(code As XElement, expectedCode As XElement, kind As EnvDTE80.vsCMParameterKind, action As SetterAction(Of EnvDTE80.vsCMParameterKind)) As Threading.Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
Dim parameterKindSetter = GetParameterKindSetter(codeElement)
action(kind, parameterKindSetter)
End Sub)
End Sub
End Function
Protected Sub TestSetDefaultValue(code As XElement, expected As XElement, defaultValue As String)
TestSetDefaultValue(code, expected, defaultValue, NoThrow(Of String)())
End Sub
Protected Async Function TestSetDefaultValue(code As XElement, expected As XElement, defaultValue As String) As Threading.Tasks.Task
Await TestSetDefaultValue(code, expected, defaultValue, NoThrow(Of String)())
End Function
Protected Sub TestSetDefaultValue(code As XElement, expectedCode As XElement, defaultValue As String, action As SetterAction(Of String))
TestElementUpdate(code, expectedCode,
Protected Async Function TestSetDefaultValue(code As XElement, expectedCode As XElement, defaultValue As String, action As SetterAction(Of String)) As Threading.Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
Dim defaultValueSetter = GetDefaultValueSetter(codeElement)
action(defaultValue, defaultValueSetter)
End Sub)
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractCodePropertyTests.vb
浏览文件 @ f2745d7c
......@@ -100,26 +100,26 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Throw New NotSupportedException
End Function
Protected Sub TestAutoImplementedPropertyExtender_IsAutoImplemented(code As XElement, expected As Boolean)
TestElement(code,
Protected Async Function TestAutoImplementedPropertyExtender_IsAutoImplemented(code As XElement, expected As Boolean) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, AutoImplementedPropertyExtender_GetIsAutoImplemented(codeElement))
End Sub)
End Sub
End Function
Protected Sub TestGetter(code As XElement, verifier As Action(Of EnvDTE.CodeFunction))
TestElement(code,
Protected Async Function TestGetter(code As XElement, verifier As Action(Of EnvDTE.CodeFunction)) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
verifier(codeElement.Getter)
End Sub)
End Sub
End Function
Protected Sub TestSetter(code As XElement, verifier As Action(Of EnvDTE.CodeFunction))
TestElement(code,
Protected Async Function TestSetter(code As XElement, verifier As Action(Of EnvDTE.CodeFunction)) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
verifier(codeElement.Setter)
End Sub)
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractCodeVariableTests.vb
浏览文件 @ f2745d7c
......@@ -94,41 +94,41 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Return Sub(value) codeElement.Type = value
End Function
Protected Sub TestIsConstant(code As XElement, expected As Boolean)
TestElement(code,
Protected Async Function TestIsConstant(code As XElement, expected As Boolean) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, codeElement.IsConstant)
End Sub)
End Sub
End Function
Protected Sub TestSetIsConstant(code As XElement, expectedCode As XElement, value As Boolean)
TestSetIsConstant(code, expectedCode, value, NoThrow(Of Boolean)())
End Sub
Protected Async Function TestSetIsConstant(code As XElement, expectedCode As XElement, value As Boolean) As Threading.Tasks.Task
Await TestSetIsConstant(code, expectedCode, value, NoThrow(Of Boolean)())
End Function
Protected Sub TestSetIsConstant(code As XElement, expectedCode As XElement, value As Boolean, action As SetterAction(Of Boolean))
TestElementUpdate(code, expectedCode,
Protected Async Function TestSetIsConstant(code As XElement, expectedCode As XElement, value As Boolean, action As SetterAction(Of Boolean)) As Threading.Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
action(value, Sub(v) codeElement.IsConstant = v)
End Sub)
End Sub
End Function
Protected Sub TestInitExpression(code As XElement, expected As Object)
TestElement(code,
Protected Async Function TestInitExpression(code As XElement, expected As Object) As Threading.Tasks.Task
Await TestElement(code,
Sub(codeElement)
Assert.Equal(expected, codeElement.InitExpression)
End Sub)
End Sub
End Function
Protected Sub TestSetInitExpression(code As XElement, expectedCode As XElement, value As Object)
TestSetInitExpression(code, expectedCode, value, NoThrow(Of Object)())
End Sub
Protected Async Function TestSetInitExpression(code As XElement, expectedCode As XElement, value As Object) As Threading.Tasks.Task
Await TestSetInitExpression(code, expectedCode, value, NoThrow(Of Object)())
End Function
Protected Sub TestSetInitExpression(code As XElement, expectedCode As XElement, value As Object, action As SetterAction(Of Object))
TestElementUpdate(code, expectedCode,
Protected Async Function TestSetInitExpression(code As XElement, expectedCode As XElement, value As Object, action As SetterAction(Of Object)) As Threading.Tasks.Task
Await TestElementUpdate(code, expectedCode,
Sub(codeElement)
action(value, Sub(v) codeElement.InitExpression = v)
End Sub)
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractEventCollectorTests.vb
浏览文件 @ f2745d7c
......@@ -85,7 +85,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
End If
End Sub
Friend Sub Test(code As XElement, change As XElement, ParamArray expectedEvents As Action(Of CodeModelEvent, ICodeModelService)())
Friend Async Function TestAsync(code As XElement, change As XElement, ParamArray expectedEvents As Action(Of CodeModelEvent, ICodeModelService)()) As Threading.Tasks.Task
Dim definition =
<Workspace>
<Project Language=<%= LanguageName %> CommonReferences="true">
......@@ -94,7 +94,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
</Project>
</Workspace>
Using workspace = TestWorkspaceFactory.CreateWorkspace(definition, exportProvider:=VisualStudioTestExportProvider.ExportProvider)
Using workspace = Await TestWorkspaceFactory.CreateWorkspaceAsync(definition, exportProvider:=VisualStudioTestExportProvider.ExportProvider)
Dim project = workspace.CurrentSolution.Projects.First()
Dim codeModelService = project.LanguageServices.GetService(Of ICodeModelService)()
Assert.NotNull(codeModelService)
......@@ -114,7 +114,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
expectedEvent(collectedEvent, codeModelService)
Next
End Using
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractFileCodeModelTests.vb
浏览文件 @ f2745d7c
......@@ -7,8 +7,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Public MustInherit Class AbstractFileCodeModelTests
Inherits AbstractCodeModelObjectTests(Of EnvDTE80.FileCodeModel2)
Protected Sub TestOperation(code As XElement, expectedCode As XElement, operation As Action(Of EnvDTE80.FileCodeModel2))
Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
Protected Async Function TestOperation(code As XElement, expectedCode As XElement, operation As Action(Of EnvDTE80.FileCodeModel2)) As Tasks.Task
Using state = Await CreateCodeModelTestStateAsync(GetWorkspaceDefinition(code))
Dim fileCodeModel = state.FileCodeModel
Assert.NotNull(fileCodeModel)
......@@ -19,7 +19,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Assert.Equal(expectedCode.NormalizedValue.Trim(), text.Trim())
End Using
Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
Using state = Await CreateCodeModelTestStateAsync(GetWorkspaceDefinition(code))
Dim fileCodeModel = state.FileCodeModel
Assert.NotNull(fileCodeModel)
......@@ -31,17 +31,17 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Assert.Equal(expectedCode.NormalizedValue.Trim(), text.Trim())
End Using
End Sub
End Function
Protected Sub TestOperation(code As XElement, operation As Action(Of EnvDTE80.FileCodeModel2))
Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
Protected Async Function TestOperation(code As XElement, operation As Action(Of EnvDTE80.FileCodeModel2)) As Tasks.Task
Using state = Await CreateCodeModelTestStateAsync(GetWorkspaceDefinition(code))
Dim fileCodeModel = state.FileCodeModel
Assert.NotNull(fileCodeModel)
operation(fileCodeModel)
End Using
Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
Using state = Await CreateCodeModelTestStateAsync(GetWorkspaceDefinition(code))
Dim fileCodeModel = state.FileCodeModel
Assert.NotNull(fileCodeModel)
......@@ -49,56 +49,56 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
operation(fileCodeModel)
fileCodeModel.EndBatch()
End Using
End Sub
End Function
Protected Overrides Sub TestAddAttribute(code As XElement, expectedCode As XElement, data As AttributeData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddAttribute(code As XElement, expectedCode As XElement, data As AttributeData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Dim newAttribute = fileCodeModel.AddAttribute(data.Name, data.Value, data.Position)
Assert.NotNull(newAttribute)
Assert.Equal(data.Name, newAttribute.Name)
End Sub)
End Sub
End Function
Protected Overrides Sub TestAddClass(code As XElement, expectedCode As XElement, data As ClassData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddClass(code As XElement, expectedCode As XElement, data As ClassData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Dim newClass = fileCodeModel.AddClass(data.Name, data.Position, data.Bases, data.ImplementedInterfaces, data.Access)
Assert.NotNull(newClass)
Assert.Equal(data.Name, newClass.Name)
End Sub)
End Sub
End Function
Protected Overrides Sub TestAddDelegate(code As XElement, expectedCode As XElement, data As DelegateData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddDelegate(code As XElement, expectedCode As XElement, data As DelegateData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Dim newDelegate = fileCodeModel.AddDelegate(data.Name, data.Type, data.Position, data.Access)
Assert.NotNull(newDelegate)
Assert.Equal(data.Name, newDelegate.Name)
End Sub)
End Sub
End Function
Protected Overrides Sub TestAddEnum(code As XElement, expectedCode As XElement, data As EnumData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddEnum(code As XElement, expectedCode As XElement, data As EnumData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Dim newEnum = fileCodeModel.AddEnum(data.Name, data.Position, data.Base, data.Access)
Assert.NotNull(newEnum)
Assert.Equal(data.Name, newEnum.Name)
End Sub)
End Sub
End Function
Protected Overrides Sub TestAddFunction(code As XElement, expectedCode As XElement, data As FunctionData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddFunction(code As XElement, expectedCode As XElement, data As FunctionData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Assert.Throws(Of System.Runtime.InteropServices.COMException)(
Sub()
fileCodeModel.AddFunction(data.Name, data.Kind, data.Type, data.Position, data.Access)
End Sub)
End Sub)
End Sub
End Function
Protected Overrides Sub TestAddImport(code As XElement, expectedCode As XElement, data As ImportData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddImport(code As XElement, expectedCode As XElement, data As ImportData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Dim newImport = fileCodeModel.AddImport(data.Namespace, data.Position, data.Alias)
Assert.NotNull(newImport)
......@@ -108,51 +108,51 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Assert.Equal(data.Alias, newImport.Alias)
End If
End Sub)
End Sub
End Function
Protected Overrides Sub TestAddInterface(code As XElement, expectedCode As XElement, data As InterfaceData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddInterface(code As XElement, expectedCode As XElement, data As InterfaceData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Dim newInterface = fileCodeModel.AddInterface(data.Name, data.Position, data.Bases, data.Access)
Assert.NotNull(newInterface)
Assert.Equal(data.Name, newInterface.Name)
End Sub)
End Sub
End Function
Protected Overrides Sub TestAddNamespace(code As XElement, expectedCode As XElement, data As NamespaceData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddNamespace(code As XElement, expectedCode As XElement, data As NamespaceData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Dim newNamespace = fileCodeModel.AddNamespace(data.Name, data.Position)
Assert.NotNull(newNamespace)
Assert.Equal(data.Name, newNamespace.Name)
End Sub)
End Sub
End Function
Protected Overrides Sub TestAddStruct(code As XElement, expectedCode As XElement, data As StructData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddStruct(code As XElement, expectedCode As XElement, data As StructData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Dim newStruct = fileCodeModel.AddStruct(data.Name, data.Position, data.Bases, data.ImplementedInterfaces, data.Access)
Assert.NotNull(newStruct)
Assert.Equal(data.Name, newStruct.Name)
End Sub)
End Sub
End Function
Protected Overrides Sub TestAddVariable(code As XElement, expectedCode As XElement, data As VariableData)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestAddVariable(code As XElement, expectedCode As XElement, data As VariableData) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
Assert.Throws(Of System.Runtime.InteropServices.COMException)(
Sub()
fileCodeModel.AddVariable(data.Name, data.Type, data.Position, data.Access)
End Sub)
End Sub)
End Sub
End Function
Protected Overrides Sub TestRemoveChild(code As XElement, expectedCode As XElement, element As Object)
TestOperation(code, expectedCode,
Protected Overrides Async Function TestRemoveChild(code As XElement, expectedCode As XElement, element As Object) As Tasks.Task
Await TestOperation(code, expectedCode,
Sub(fileCodeModel)
fileCodeModel.Remove(element)
End Sub)
End Sub
End Function
End Class
End Namespace
src/VisualStudio/Core/Test/CodeModel/AbstractRootCodeModelTests.vb
浏览文件 @ f2745d7c
......@@ -4,26 +4,26 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Public MustInherit Class AbstractRootCodeModelTests
Inherits AbstractCodeModelObjectTests(Of EnvDTE80.CodeModel2)
Protected Sub TestRootCodeModel(workspaceDefinition As XElement, action As Action(Of EnvDTE80.CodeModel2))
Using state = CreateCodeModelTestState(workspaceDefinition)
Protected Async Function TestRootCodeModel(workspaceDefinition As XElement, action As Action(Of EnvDTE80.CodeModel2)) As Threading.Tasks.Task
Using state = Await CreateCodeModelTestStateAsync(workspaceDefinition)
Dim rootCodeModel = TryCast(state.RootCodeModel, EnvDTE80.CodeModel2)
Assert.NotNull(rootCodeModel)
action(rootCodeModel)
End Using
End Sub
End Function
Protected Sub TestRootCodeModelWithCodeFile(code As XElement, action As Action(Of EnvDTE80.CodeModel2))
Using state = CreateCodeModelTestState(GetWorkspaceDefinition(code))
Protected Async Function TestRootCodeModelWithCodeFile(code As XElement, action As Action(Of EnvDTE80.CodeModel2)) As Threading.Tasks.Task
Using state = Await CreateCodeModelTestStateAsync(GetWorkspaceDefinition(code))
Dim rootCodeModel = TryCast(state.RootCodeModel, EnvDTE80.CodeModel2)
Assert.NotNull(rootCodeModel)
action(rootCodeModel)
End Using
End Sub
End Function
Protected Sub TestCodeElements(code As XElement, ParamArray expectedChildren() As Action(Of Object))
TestRootCodeModelWithCodeFile(code,
Protected Async Function TestCodeElements(code As XElement, ParamArray expectedChildren() As Action(Of Object)) As Threading.Tasks.Task
Await TestRootCodeModelWithCodeFile(code,
Sub(rootCodeModel)
Dim codeElements = rootCodeModel.CodeElements
Assert.Equal(expectedChildren.Length, rootCodeModel.CodeElements.Count)
......@@ -32,10 +32,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
expectedChildren(i - 1)(codeElements.Item(i))
Next
End Sub)
End Sub
End Function
Protected Sub TestCodeElements(code As XElement, ParamArray names() As String)
TestRootCodeModelWithCodeFile(code,
Protected Async Function TestCodeElements(code As XElement, ParamArray names() As String) As Threading.Tasks.Task
Await TestRootCodeModelWithCodeFile(code,
Sub(rootCodeModel)
Assert.Equal(names.Length, rootCodeModel.CodeElements.Count)
......@@ -45,41 +45,41 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Assert.Contains(names(i), actualNames)
Next
End Sub)
End Sub
End Function
Protected Sub TestCreateCodeTypeRef(type As Object, data As CodeTypeRefData)
TestCreateCodeTypeRef(<code></code>, type, data)
End Sub
Protected Async Function TestCreateCodeTypeRef(type As Object, data As CodeTypeRefData) As Threading.Tasks.Task
Await TestCreateCodeTypeRef(<code></code>, type, data)
End Function
Protected Sub TestCreateCodeTypeRef(code As XElement, type As Object, data As CodeTypeRefData)
TestRootCodeModelWithCodeFile(code,
Protected Async Function TestCreateCodeTypeRef(code As XElement, type As Object, data As CodeTypeRefData) As Threading.Tasks.Task
Await TestRootCodeModelWithCodeFile(code,
Sub(rootCodeModel)
Dim codeTypeRef = rootCodeModel.CreateCodeTypeRef(type)
TestCodeTypeRef(codeTypeRef, data)
End Sub)
End Sub
End Function
Protected Sub TestCreateCodeTypeRefThrows(Of TException As Exception)(type As Object)
TestCreateCodeTypeRef(Of TException)(<code></code>, type)
End Sub
Protected Async Function TestCreateCodeTypeRefThrows(Of TException As Exception)(type As Object) As Threading.Tasks.Task
Await TestCreateCodeTypeRef(Of TException)(<code></code>, type)
End Function
Protected Sub TestCreateCodeTypeRef(Of TException As Exception)(code As XElement, type As Object)
TestRootCodeModelWithCodeFile(code,
Protected Async Function TestCreateCodeTypeRef(Of TException As Exception)(code As XElement, type As Object) As Threading.Tasks.Task
Await TestRootCodeModelWithCodeFile(code,
Sub(rootCodeModel)
Assert.Throws(Of TException)(
Sub()
rootCodeModel.CreateCodeTypeRef(type)
End Sub)
End Sub)
End Sub
End Function
Protected Sub TestCodeTypeFromFullName(workspaceDefinition As XElement, fullName As String, action As Action(Of EnvDTE.CodeType))
TestRootCodeModel(workspaceDefinition,
Protected Async Function TestCodeTypeFromFullName(workspaceDefinition As XElement, fullName As String, action As Action(Of EnvDTE.CodeType)) As Threading.Tasks.Task
Await TestRootCodeModel(workspaceDefinition,
Sub(rootCodeModel)
action(rootCodeModel.CodeTypeFromFullName(fullName))
End Sub)
End Sub
End Function
End Class
End Namespace
......
src/VisualStudio/Core/Test/CodeModel/CSharp/CodeAccessorFunctionTests.vb
浏览文件 @ f2745d7c
' 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
Imports Roslyn.Test.Utilities
......@@ -10,7 +11,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
#Region "Access tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access1()
Public Async Function TestAccess1() As Task
Dim code =
<Code>
class C
......@@ -28,11 +29,11 @@ class C
}
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPublic)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPublic)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access2()
Public Async Function TestAccess2() As Task
Dim code =
<Code>
class C
......@@ -50,13 +51,13 @@ class C
}
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPrivate)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPrivate)
End Function
#End Region
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TypeDescriptor_GetProperties()
Public Async Function TestTypeDescriptor_GetProperties() As Task
Dim code =
<Code>
class C
......@@ -72,8 +73,8 @@ class C
"IsShared", "MustImplement", "Overloads", "Attributes", "DocComment", "Comment",
"CanOverride", "OverrideKind", "IsGeneric"}
TestPropertyDescriptors(code, expectedPropertyNames)
End Sub
Await TestPropertyDescriptors(code, expectedPropertyNames)
End Function
Protected Overrides ReadOnly Property LanguageName As String
Get
......
src/VisualStudio/Core/Test/CodeModel/CSharp/CodeDelegateTests.vb
浏览文件 @ f2745d7c
' 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
Imports Roslyn.Test.Utilities
......@@ -10,13 +11,13 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
#Region "GetStartPoint() tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub GetStartPoint1()
Public Async Function TestGetStartPoint1() As Task
Dim code =
<Code>
delegate void $$Foo(int i);
</Code>
TestGetStartPoint(code,
Await TestGetStartPoint(code,
Part(EnvDTE.vsCMPart.vsCMPartAttributes,
ThrowsNotImplementedException),
Part(EnvDTE.vsCMPart.vsCMPartAttributesWithDelimiter,
......@@ -37,17 +38,17 @@ delegate void $$Foo(int i);
ThrowsNotImplementedException),
Part(EnvDTE.vsCMPart.vsCMPartWholeWithAttributes,
TextPoint(line:=1, lineOffset:=1, absoluteOffset:=1, lineLength:=25)))
End Sub
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub GetStartPoint2()
Public Async Function TestGetStartPoint2() As Task
Dim code =
<Code>
[System.CLSCompliant(true)]
delegate void $$Foo(int i);
</Code>
TestGetStartPoint(code,
Await TestGetStartPoint(code,
Part(EnvDTE.vsCMPart.vsCMPartAttributes,
ThrowsNotImplementedException),
Part(EnvDTE.vsCMPart.vsCMPartAttributesWithDelimiter,
......@@ -68,20 +69,20 @@ delegate void $$Foo(int i);
ThrowsNotImplementedException),
Part(EnvDTE.vsCMPart.vsCMPartWholeWithAttributes,
TextPoint(line:=1, lineOffset:=1, absoluteOffset:=1, lineLength:=27)))
End Sub
End Function
#End Region
#Region "GetEndPoint() tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub GetEndPoint1()
Public Async Function TestGetEndPoint1() As Task
Dim code =
<Code>
delegate void $$Foo(int i);
</Code>
TestGetEndPoint(code,
Await TestGetEndPoint(code,
Part(EnvDTE.vsCMPart.vsCMPartAttributes,
ThrowsNotImplementedException),
Part(EnvDTE.vsCMPart.vsCMPartAttributesWithDelimiter,
......@@ -102,17 +103,17 @@ delegate void $$Foo(int i);
ThrowsNotImplementedException),
Part(EnvDTE.vsCMPart.vsCMPartWholeWithAttributes,
TextPoint(line:=1, lineOffset:=26, absoluteOffset:=26, lineLength:=25)))
End Sub
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub GetEndPoint2()
Public Async Function TestGetEndPoint2() As Task
Dim code =
<Code>
[System.CLSCompliant(true)]
delegate void $$Foo(int i);
</Code>
TestGetEndPoint(code,
Await TestGetEndPoint(code,
Part(EnvDTE.vsCMPart.vsCMPartAttributes,
ThrowsNotImplementedException),
Part(EnvDTE.vsCMPart.vsCMPartAttributesWithDelimiter,
......@@ -133,28 +134,28 @@ delegate void $$Foo(int i);
ThrowsNotImplementedException),
Part(EnvDTE.vsCMPart.vsCMPartWholeWithAttributes,
TextPoint(line:=2, lineOffset:=26, absoluteOffset:=54, lineLength:=25)))
End Sub
End Function
#End Region
#Region "BaseClass tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub BaseClass()
Public Async Function TestBaseClass1() As Task
Dim code =
<Code>
delegate void $$D();
</Code>
TestBaseClass(code, "System.Delegate")
End Sub
Await TestBaseClass(code, "System.Delegate")
End Function
#End Region
#Region "Prototype tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Prototype_UniqueSignature()
Public Async Function TestPrototype_UniqueSignature() As Task
Dim code =
<Code>
namespace N
......@@ -163,11 +164,11 @@ namespace N
}
</Code>
TestPrototype(code, EnvDTE.vsCMPrototype.vsCMPrototypeUniqueSignature, "N.D")
End Sub
Await TestPrototype(code, EnvDTE.vsCMPrototype.vsCMPrototypeUniqueSignature, "N.D")
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Prototype_ClassName()
Public Async Function TestPrototype_ClassName() As Task
Dim code =
<Code>
namespace N
......@@ -176,11 +177,11 @@ namespace N
}
</Code>
TestPrototype(code, EnvDTE.vsCMPrototype.vsCMPrototypeClassName, "delegate N.D")
End Sub
Await TestPrototype(code, EnvDTE.vsCMPrototype.vsCMPrototypeClassName, "delegate N.D")
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Prototype_FullName()
Public Async Function TestPrototype_FullName() As Task
Dim code =
<Code>
namespace N
......@@ -189,11 +190,11 @@ namespace N
}
</Code>
TestPrototype(code, EnvDTE.vsCMPrototype.vsCMPrototypeFullname, "delegate N.D")
End Sub
Await TestPrototype(code, EnvDTE.vsCMPrototype.vsCMPrototypeFullname, "delegate N.D")
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Prototype_Type()
Public Async Function TestPrototype_Type() As Task
Dim code =
<Code>
namespace N
......@@ -202,50 +203,50 @@ namespace N
}
</Code>
TestPrototype(code, EnvDTE.vsCMPrototype.vsCMPrototypeType, "delegate void D")
End Sub
Await TestPrototype(code, EnvDTE.vsCMPrototype.vsCMPrototypeType, "delegate void D")
End Function
#End Region
#Region "Type tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Type_Void()
Public Async Function TestType_Void() As Task
Dim code =
<Code>
delegate void $$D();
</Code>
TestTypeProp(code, New CodeTypeRefData With {.CodeTypeFullName = "System.Void", .TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefVoid})
End Sub
Await TestTypeProp(code, New CodeTypeRefData With {.CodeTypeFullName = "System.Void", .TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefVoid})
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Type_Int()
Public Async Function TestType_Int() As Task
Dim code =
<Code>
delegate int $$D();
</Code>
TestTypeProp(code, New CodeTypeRefData With {.CodeTypeFullName = "System.Int32", .TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefInt})
End Sub
Await TestTypeProp(code, New CodeTypeRefData With {.CodeTypeFullName = "System.Int32", .TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefInt})
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Type_SourceClass()
Public Async Function TestType_SourceClass() As Task
Dim code =
<Code>
class C { }
delegate C $$D();
</Code>
TestTypeProp(code, New CodeTypeRefData With {.CodeTypeFullName = "C", .TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefCodeType})
End Sub
Await TestTypeProp(code, New CodeTypeRefData With {.CodeTypeFullName = "C", .TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefCodeType})
End Function
#End Region
#Region "Set Type tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub SetType1()
Public Async Function TestSetType1() As Task
Dim code =
<Code>
public delegate int $$D();
......@@ -256,11 +257,11 @@ public delegate int $$D();
public delegate void D();
</Code>
TestSetTypeProp(code, expected, "void")
End Sub
Await TestSetTypeProp(code, expected, "void")
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub SetType2()
Public Async Function TestSetType2() As Task
Dim code =
<Code>
public delegate string $$D();
......@@ -271,8 +272,8 @@ public delegate string $$D();
public delegate int? D();
</Code>
TestSetTypeProp(code, expected, "System.Nullable<System.Int32>")
End Sub
Await TestSetTypeProp(code, expected, "System.Nullable<System.Int32>")
End Function
#End Region
......@@ -280,31 +281,31 @@ public delegate int? D();
<WorkItem(1147885)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TestParameterNameWithEscapeCharacters()
Public Async Function TestParameterNameWithEscapeCharacters() As Task
Dim code =
<Code>
public delegate int $$M(int @int);
</Code>
TestAllParameterNames(code, "@int")
End Sub
Await TestAllParameterNames(code, "@int")
End Function
<WorkItem(1147885)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TestParameterNameWithEscapeCharacters_2()
Public Async Function TestParameterNameWithEscapeCharacters_2() As Task
Dim code =
<Code>
public delegate int $$M(int @int, string @string);
</Code>
TestAllParameterNames(code, "@int", "@string")
End Sub
Await TestAllParameterNames(code, "@int", "@string")
End Function
#End Region
#Region "AddAttribute tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddAttribute1()
Public Async Function TestAddAttribute1() As Task
Dim code =
<Code>
using System;
......@@ -319,11 +320,11 @@ using System;
[Serializable()]
delegate void D();
</Code>
TestAddAttribute(code, expected, New AttributeData With {.Name = "Serializable"})
End Sub
Await TestAddAttribute(code, expected, New AttributeData With {.Name = "Serializable"})
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddAttribute2()
Public Async Function TestAddAttribute2() As Task
Dim code =
<Code>
using System;
......@@ -340,12 +341,12 @@ using System;
[CLSCompliant(true)]
delegate void D();
</Code>
TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true", .Position = 1})
End Sub
Await TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true", .Position = 1})
End Function
<WorkItem(2825, "https://github.com/dotnet/roslyn/issues/2825")>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddAttribute_BelowDocComment()
Public Async Function TestAddAttribute_BelowDocComment() As Task
Dim code =
<Code>
using System;
......@@ -362,13 +363,13 @@ using System;
[CLSCompliant(true)]
delegate void D();
</Code>
TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true"})
End Sub
Await TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true"})
End Function
#End Region
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TypeDescriptor_GetProperties()
Public Async Function TestTypeDescriptor_GetProperties() As Task
Dim code =
<Code>
delegate void $$D();
......@@ -381,8 +382,8 @@ delegate void $$D();
"Bases", "Members", "Access", "Attributes", "DocComment", "Comment",
"DerivedTypes", "BaseClass", "Type", "Parameters", "IsGeneric"}
TestPropertyDescriptors(code, expectedPropertyNames)
End Sub
Await TestPropertyDescriptors(code, expectedPropertyNames)
End Function
Protected Overrides ReadOnly Property LanguageName As String
Get
......
src/VisualStudio/Core/Test/CodeModel/CSharp/CodeEnumTests.vb
浏览文件 @ f2745d7c
' 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
Imports Roslyn.Test.Utilities
......@@ -10,17 +11,17 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
#Region "Access tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access1()
Public Async Function TestAccess1() As Task
Dim code =
<Code>
enum $$E { }
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProject)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProject)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access2()
Public Async Function TestAccess2() As Task
Dim code =
<Code>
class C
......@@ -29,65 +30,65 @@ class C
}
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPrivate)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPrivate)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access3()
Public Async Function TestAccess3() As Task
Dim code =
<Code>
private enum $$E { }
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPrivate)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPrivate)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access4()
Public Async Function TestAccess4() As Task
Dim code =
<Code>
protected enum $$E { }
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProtected)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProtected)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access5()
Public Async Function TestAccess5() As Task
Dim code =
<Code>
protected internal enum $$E { }
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProjectOrProtected)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProjectOrProtected)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access6()
Public Async Function TestAccess6() As Task
Dim code =
<Code>
internal enum $$E { }
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProject)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProject)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access7()
Public Async Function TestAccess7() As Task
Dim code =
<Code>
public enum $$E { }
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPublic)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPublic)
End Function
#End Region
#Region "Bases tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Bases1()
Public Async Function TestBases1() As Task
Dim code =
<Code>
enum $$E
......@@ -96,15 +97,15 @@ enum $$E
Bar
}</Code>
TestBases(code, IsElement("Enum"))
End Sub
Await TestBases(code, IsElement("Enum"))
End Function
#End Region
#Region "Attributes tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Attributes1()
Public Async Function TestAttributes1() As Task
Dim code =
<Code>
enum $$C
......@@ -113,11 +114,11 @@ enum $$C
}
</Code>
TestAttributes(code, NoElements)
End Sub
Await TestAttributes(code, NoElements)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Attributes2()
Public Async Function TestAttributes2() As Task
Dim code =
<Code>
using System;
......@@ -129,11 +130,11 @@ enum $$C
}
</Code>
TestAttributes(code, IsElement("Flags"))
End Sub
Await TestAttributes(code, IsElement("Flags"))
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Attributes3()
Public Async Function TestAttributes3() As Task
Dim code =
<Code>using System;
......@@ -145,11 +146,11 @@ enum $$C
}
</Code>
TestAttributes(code, IsElement("Serializable"), IsElement("Flags"))
End Sub
Await TestAttributes(code, IsElement("Serializable"), IsElement("Flags"))
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Attributes4()
Public Async Function TestAttributes4() As Task
Dim code =
<Code>using System;
......@@ -160,14 +161,14 @@ enum $$C
}
</Code>
TestAttributes(code, IsElement("Serializable"), IsElement("Flags"))
End Sub
Await TestAttributes(code, IsElement("Serializable"), IsElement("Flags"))
End Function
#End Region
#Region "FullName tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub FullName1()
Public Async Function TestFullName1() As Task
Dim code =
<Code>
enum $$E
......@@ -176,15 +177,15 @@ enum $$E
Bar
}</Code>
TestFullName(code, "E")
End Sub
Await TestFullName(code, "E")
End Function
#End Region
#Region "Name tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Name1()
Public Async Function TestName1() As Task
Dim code =
<Code>
enum $$E
......@@ -194,14 +195,14 @@ enum $$E
}
</Code>
TestName(code, "E")
End Sub
Await TestName(code, "E")
End Function
#End Region
#Region "AddAttribute tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddAttribute1()
Public Async Function TestAddAttribute1() As Task
Dim code =
<Code>
using System;
......@@ -224,11 +225,11 @@ enum E
Bar
}
</Code>
TestAddAttribute(code, expected, New AttributeData With {.Name = "Flags"})
End Sub
Await TestAddAttribute(code, expected, New AttributeData With {.Name = "Flags"})
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddAttribute2()
Public Async Function TestAddAttribute2() As Task
Dim code =
<Code>
using System;
......@@ -253,12 +254,12 @@ enum E
Bar
}
</Code>
TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true", .Position = 1})
End Sub
Await TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true", .Position = 1})
End Function
<WorkItem(2825, "https://github.com/dotnet/roslyn/issues/2825")>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddAttribute_BelowDocComment()
Public Async Function TestAddAttribute_BelowDocComment() As Task
Dim code =
<Code>
using System;
......@@ -283,15 +284,15 @@ enum E
Bar
}
</Code>
TestAddAttribute(code, expected, New AttributeData With {.Name = "Flags"})
End Sub
Await TestAddAttribute(code, expected, New AttributeData With {.Name = "Flags"})
End Function
#End Region
#Region "AddMember tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddMember1()
Public Async Function TestAddMember1() As Task
Dim code =
<Code>
enum $$E
......@@ -307,11 +308,11 @@ enum E
}
</Code>
TestAddEnumMember(code, expected, New EnumMemberData With {.Name = "V"})
End Sub
Await TestAddEnumMember(code, expected, New EnumMemberData With {.Name = "V"})
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddMember2()
Public Async Function TestAddMember2() As Task
Dim code =
<Code>
enum $$E
......@@ -327,11 +328,11 @@ enum E
}
</Code>
TestAddEnumMember(code, expected, New EnumMemberData With {.Name = "V", .Value = "1"})
End Sub
Await TestAddEnumMember(code, expected, New EnumMemberData With {.Name = "V", .Value = "1"})
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddMember3()
Public Async Function TestAddMember3() As Task
Dim code =
<Code>
enum $$E
......@@ -349,12 +350,12 @@ enum E
}
</Code>
TestAddEnumMember(code, expected, New EnumMemberData With {.Name = "U", .Value = "V"})
End Sub
Await TestAddEnumMember(code, expected, New EnumMemberData With {.Name = "U", .Value = "V"})
End Function
<WorkItem(638225)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddMember4()
Public Async Function TestAddMember4() As Task
Dim code =
<Code>
enum $$E
......@@ -372,12 +373,12 @@ enum E
}
</Code>
TestAddEnumMember(code, expected, New EnumMemberData With {.Position = -1, .Name = "B"})
End Sub
Await TestAddEnumMember(code, expected, New EnumMemberData With {.Position = -1, .Name = "B"})
End Function
<WorkItem(638225)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddMember5()
Public Async Function TestAddMember5() As Task
Dim code =
<Code>
enum $$E
......@@ -397,12 +398,12 @@ enum E
}
</Code>
TestAddEnumMember(code, expected, New EnumMemberData With {.Position = 1, .Name = "B"})
End Sub
Await TestAddEnumMember(code, expected, New EnumMemberData With {.Position = 1, .Name = "B"})
End Function
<WorkItem(638225)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddMember6()
Public Async Function TestAddMember6() As Task
Dim code =
<Code>
enum $$E
......@@ -422,12 +423,12 @@ enum E
}
</Code>
TestAddEnumMember(code, expected, New EnumMemberData With {.Position = -1, .Name = "C"})
End Sub
Await TestAddEnumMember(code, expected, New EnumMemberData With {.Position = -1, .Name = "C"})
End Function
<WorkItem(638225)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddMember7()
Public Async Function TestAddMember7() As Task
Dim code =
<Code>
enum $$E
......@@ -449,15 +450,15 @@ enum E
}
</Code>
TestAddEnumMember(code, expected, New EnumMemberData With {.Position = -1, .Name = "D"})
End Sub
Await TestAddEnumMember(code, expected, New EnumMemberData With {.Position = -1, .Name = "D"})
End Function
#End Region
#Region "RemoveMember tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub RemoveMember1()
Public Async Function TestRemoveMember1() As Task
Dim code =
<Code>
enum $$E
......@@ -473,11 +474,11 @@ enum E
}
</Code>
TestRemoveChild(code, expected, "A")
End Sub
Await TestRemoveChild(code, expected, "A")
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub RemoveMember2()
Public Async Function TestRemoveMember2() As Task
Dim code =
<Code>
enum $$E
......@@ -495,11 +496,11 @@ enum E
}
</Code>
TestRemoveChild(code, expected, "A")
End Sub
Await TestRemoveChild(code, expected, "A")
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub RemoveMember3()
Public Async Function TestRemoveMember3() As Task
Dim code =
<Code>
enum $$E
......@@ -517,11 +518,11 @@ enum E
}
</Code>
TestRemoveChild(code, expected, "B")
End Sub
Await TestRemoveChild(code, expected, "B")
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub RemoveMember4()
Public Async Function TestRemoveMember4() As Task
Dim code =
<Code>
enum $$E
......@@ -541,14 +542,14 @@ enum E
}
</Code>
TestRemoveChild(code, expected, "B")
End Sub
Await TestRemoveChild(code, expected, "B")
End Function
#End Region
#Region "Set Name tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub SetName1()
Public Async Function TestSetName1() As Task
Dim code =
<Code>
enum $$Foo
......@@ -563,12 +564,12 @@ enum Bar
}
</Code>
TestSetName(code, expected, "Bar", NoThrow(Of String)())
End Sub
Await TestSetName(code, expected, "Bar", NoThrow(Of String)())
End Function
#End Region
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TypeDescriptor_GetProperties()
Public Async Function TestTypeDescriptor_GetProperties() As Task
Dim code =
<Code>
enum $$E
......@@ -582,8 +583,8 @@ enum $$E
"ExtenderCATID", "Parent", "Namespace", "Bases", "Members", "Access", "Attributes",
"DocComment", "Comment", "DerivedTypes"}
TestPropertyDescriptors(code, expectedPropertyNames)
End Sub
Await TestPropertyDescriptors(code, expectedPropertyNames)
End Function
Protected Overrides ReadOnly Property LanguageName As String
Get
......
src/VisualStudio/Core/Test/CodeModel/CSharp/CodeImportTests.vb
浏览文件 @ f2745d7c
' 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.Runtime.InteropServices
Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis
Imports Roslyn.Test.Utilities
......@@ -11,55 +12,55 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
#Region "FullName tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub FullName1()
Public Async Function TestFullName1() As Task
Dim code =
<Code>
using $$Foo;
</Code>
Dim ex = Assert.Throws(Of COMException)(
Sub()
TestName(code, "Foo")
End Sub)
Dim ex = Await Assert.ThrowsAsync(Of COMException)(
Async Function()
Await TestName(code, "Foo")
End Function)
Assert.Equal(E_FAIL, ex.ErrorCode)
End Sub
End Function
#End Region
#Region "Name tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Name1()
Public Async Function TestName1() As Task
Dim code =
<Code>
using $$Foo;
</Code>
Dim ex = Assert.Throws(Of COMException)(
Sub()
TestName(code, "Foo")
End Sub)
Dim ex = Await Assert.ThrowsAsync(Of COMException)(
Async Function()
Await TestName(code, "Foo")
End Function)
Assert.Equal(E_FAIL, ex.ErrorCode)
End Sub
End Function
#End Region
#Region "Namespace tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Namespace1()
Public Async Function TestNamespace1() As Task
Dim code =
<Code>
using $$Foo;
</Code>
TestNamespace(code, "Foo")
End Sub
Await TestNamespace(code, "Foo")
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Namespace2()
Public Async Function TestNamespace2() As Task
Dim code =
<Code>
namespace Bar
......@@ -68,13 +69,13 @@ namespace Bar
}
</Code>
TestNamespace(code, "Foo")
End Sub
Await TestNamespace(code, "Foo")
End Function
#End Region
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TypeDescriptor_GetProperties()
Public Async Function TestTypeDescriptor_GetProperties() As Task
Dim code =
<Code>
using $$System;
......@@ -85,8 +86,8 @@ using $$System;
"InfoLocation", "Children", "Language", "StartPoint", "EndPoint", "ExtenderNames",
"ExtenderCATID", "Namespace", "Alias", "Parent"}
TestPropertyDescriptors(code, expectedPropertyNames)
End Sub
Await TestPropertyDescriptors(code, expectedPropertyNames)
End Function
Protected Overrides ReadOnly Property LanguageName As String
Get
......
src/VisualStudio/Core/Test/CodeModel/CSharp/CodeInterfaceTests.vb
浏览文件 @ f2745d7c
' 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
Imports Roslyn.Test.Utilities
......@@ -10,51 +11,51 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
#Region "Access tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access1()
Public Async Function TestAccess1() As Task
Dim code =
<Code>
interface $$I { }
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProject)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProject)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access2()
Public Async Function TestAccess2() As Task
Dim code =
<Code>
internal interface $$I { }
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProject)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessProject)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Access3()
Public Async Function TestAccess3() As Task
Dim code =
<Code>
public interface $$I { }
</Code>
TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPublic)
End Sub
Await TestAccess(code, EnvDTE.vsCMAccess.vsCMAccessPublic)
End Function
#End Region
#Region "Attributes tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Attributes1()
Public Async Function TestAttributes1() As Task
Dim code =
<Code>
interface $$C { }
</Code>
TestAttributes(code, NoElements)
End Sub
Await TestAttributes(code, NoElements)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Attributes2()
Public Async Function TestAttributes2() As Task
Dim code =
<Code>
using System;
......@@ -63,11 +64,11 @@ using System;
interface $$C { }
</Code>
TestAttributes(code, IsElement("Serializable"))
End Sub
Await TestAttributes(code, IsElement("Serializable"))
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Attributes3()
Public Async Function TestAttributes3() As Task
Dim code =
<Code>using System;
......@@ -76,11 +77,11 @@ interface $$C { }
interface $$C { }
</Code>
TestAttributes(code, IsElement("Serializable"), IsElement("CLSCompliant"))
End Sub
Await TestAttributes(code, IsElement("Serializable"), IsElement("CLSCompliant"))
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Attributes4()
Public Async Function TestAttributes4() As Task
Dim code =
<Code>using System;
......@@ -88,13 +89,13 @@ interface $$C { }
interface $$C { }
</Code>
TestAttributes(code, IsElement("Serializable"), IsElement("CLSCompliant"))
End Sub
Await TestAttributes(code, IsElement("Serializable"), IsElement("CLSCompliant"))
End Function
#End Region
#Region "Parts tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Parts1()
Public Async Function TestParts1() As Task
Dim code =
<Code>
interface $$I
......@@ -102,11 +103,11 @@ interface $$I
}
</Code>
TestParts(code, 1)
End Sub
Await TestParts(code, 1)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Parts2()
Public Async Function TestParts2() As Task
Dim code =
<Code>
partial interface $$I
......@@ -114,11 +115,11 @@ partial interface $$I
}
</Code>
TestParts(code, 1)
End Sub
Await TestParts(code, 1)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Parts3()
Public Async Function TestParts3() As Task
Dim code =
<Code>
partial interface $$I
......@@ -130,13 +131,13 @@ partial interface I
}
</Code>
TestParts(code, 2)
End Sub
Await TestParts(code, 2)
End Function
#End Region
#Region "AddAttribute tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddAttribute1()
Public Async Function TestAddAttribute1() As Task
Dim code =
<Code>
using System;
......@@ -151,11 +152,11 @@ using System;
[Serializable()]
interface I { }
</Code>
TestAddAttribute(code, expected, New AttributeData With {.Name = "Serializable"})
End Sub
Await TestAddAttribute(code, expected, New AttributeData With {.Name = "Serializable"})
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddAttribute2()
Public Async Function TestAddAttribute2() As Task
Dim code =
<Code>
using System;
......@@ -172,12 +173,12 @@ using System;
[CLSCompliant(true)]
interface I { }
</Code>
TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true", .Position = 1})
End Sub
Await TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true", .Position = 1})
End Function
<WorkItem(2825, "https://github.com/dotnet/roslyn/issues/2825")>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddAttribute_BelowDocComment()
Public Async Function TestAddAttribute_BelowDocComment() As Task
Dim code =
<Code>
using System;
......@@ -194,15 +195,15 @@ using System;
[CLSCompliant(true)]
interface I { }
</Code>
TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true"})
End Sub
Await TestAddAttribute(code, expected, New AttributeData With {.Name = "CLSCompliant", .Value = "true"})
End Function
#End Region
#Region "AddBase tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddBase1()
Public Async Function TestAddBase1() As Task
Dim code =
<Code>
interface $$I { }
......@@ -212,11 +213,11 @@ interface $$I { }
<Code>
interface I : B { }
</Code>
TestAddBase(code, "B", Nothing, expected)
End Sub
Await TestAddBase(code, "B", Nothing, expected)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddBase2()
Public Async Function TestAddBase2() As Task
Dim code =
<Code>
interface $$I : B { }
......@@ -226,11 +227,11 @@ interface $$I : B { }
<Code>
interface I : A, B { }
</Code>
TestAddBase(code, "A", Nothing, expected)
End Sub
Await TestAddBase(code, "A", Nothing, expected)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddBase3()
Public Async Function TestAddBase3() As Task
Dim code =
<Code>
interface $$I : B { }
......@@ -240,11 +241,11 @@ interface $$I : B { }
<Code>
interface I : B, A { }
</Code>
TestAddBase(code, "A", Type.Missing, expected)
End Sub
Await TestAddBase(code, "A", Type.Missing, expected)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddBase4()
Public Async Function TestAddBase4() As Task
Dim code =
<Code>
interface $$I : B { }
......@@ -254,11 +255,11 @@ interface $$I : B { }
<Code>
interface I : B, A { }
</Code>
TestAddBase(code, "A", -1, expected)
End Sub
Await TestAddBase(code, "A", -1, expected)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddBase5()
Public Async Function TestAddBase5() As Task
Dim code =
<Code>
interface $$I : B { }
......@@ -268,11 +269,11 @@ interface $$I : B { }
<Code>
interface I : A, B { }
</Code>
TestAddBase(code, "A", 0, expected)
End Sub
Await TestAddBase(code, "A", 0, expected)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddBase6()
Public Async Function TestAddBase6() As Task
Dim code =
<Code>
interface $$I
......@@ -286,15 +287,15 @@ interface I : B
{
}
</Code>
TestAddBase(code, "B", Nothing, expected)
End Sub
Await TestAddBase(code, "B", Nothing, expected)
End Function
#End Region
#Region "AddEvent tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddEvent1()
Public Async Function TestAddEvent1() As Task
Dim code =
<Code>
interface $$I
......@@ -310,11 +311,11 @@ interface I
}
</Code>
TestAddEvent(code, expected, New EventData With {.Name = "E", .FullDelegateName = "System.EventHandler"})
End Sub
Await TestAddEvent(code, expected, New EventData With {.Name = "E", .FullDelegateName = "System.EventHandler"})
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddEvent2()
Public Async Function TestAddEvent2() As Task
Dim code =
<Code>
interface $$I
......@@ -331,15 +332,15 @@ interface I
</Code>
' Note: C# Code Model apparently ignore CreatePropertyStyleEvent for interfaces in Dev10.
TestAddEvent(code, expected, New EventData With {.Name = "E", .FullDelegateName = "System.EventHandler", .CreatePropertyStyleEvent = True})
End Sub
Await TestAddEvent(code, expected, New EventData With {.Name = "E", .FullDelegateName = "System.EventHandler", .CreatePropertyStyleEvent = True})
End Function
#End Region
#Region "AddFunction tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub AddFunction1()
Public Async Function TestAddFunction1() As Task
Dim code =
<Code>
interface $$I { }
......@@ -353,15 +354,15 @@ interface I
}
</Code>
TestAddFunction(code, expected, New FunctionData With {.Name = "Foo", .Type = "void"})
End Sub
Await TestAddFunction(code, expected, New FunctionData With {.Name = "Foo", .Type = "void"})
End Function
#End Region
#Region "RemoveBase tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub RemoveBase1()
Public Async Function TestRemoveBase1() As Task
Dim code =
<Code>
interface $$I : B { }
......@@ -371,11 +372,11 @@ interface $$I : B { }
<Code>
interface I { }
</Code>
TestRemoveBase(code, "B", expected)
End Sub
Await TestRemoveBase(code, "B", expected)
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub RemoveBase2()
Public Async Function TestRemoveBase2() As Task
Dim code =
<Code>
interface $$I : A, B { }
......@@ -385,14 +386,14 @@ interface $$I : A, B { }
<Code>
interface I : B { }
</Code>
TestRemoveBase(code, "A", expected)
End Sub
Await TestRemoveBase(code, "A", expected)
End Function
#End Region
#Region "Set Name tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub SetName1()
Public Async Function TestSetName1() As Task
Dim code =
<Code>
interface $$Foo
......@@ -407,12 +408,12 @@ interface Bar
}
</Code>
TestSetName(code, expected, "Bar", NoThrow(Of String)())
End Sub
Await TestSetName(code, expected, "Bar", NoThrow(Of String)())
End Function
#End Region
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TypeDescriptor_GetProperties()
Public Async Function TestTypeDescriptor_GetProperties() As Task
Dim code =
<Code>
interface $$I
......@@ -426,8 +427,8 @@ interface $$I
"ExtenderCATID", "Parent", "Namespace", "Bases", "Members", "Access", "Attributes",
"DocComment", "Comment", "DerivedTypes", "IsGeneric", "DataTypeKind", "Parts"}
TestPropertyDescriptors(code, expectedPropertyNames)
End Sub
Await TestPropertyDescriptors(code, expectedPropertyNames)
End Function
Protected Overrides ReadOnly Property LanguageName As String
Get
......
src/VisualStudio/Core/Test/CodeModel/CSharp/CodeNamespaceTests.vb
浏览文件 @ f2745d7c
' 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
Imports Roslyn.Test.Utilities
......@@ -11,7 +12,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
#Region "Remove tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Remove1()
Public Async Function TestRemove1() As Task
Dim code =
<Code>
namespace $$Foo
......@@ -29,14 +30,14 @@ namespace Foo
}
</Code>
TestRemoveChild(code, expected, "C")
End Sub
Await TestRemoveChild(code, expected, "C")
End Function
#End Region
<WorkItem(858153)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub Children1()
Public Async Function TestChildren1() As Task
Dim code =
<Code>
namespace N$$
......@@ -47,14 +48,14 @@ namespace N$$
}
</Code>
TestChildren(code,
Await TestChildren(code,
IsElement("C1", EnvDTE.vsCMElement.vsCMElementClass),
IsElement("C2", EnvDTE.vsCMElement.vsCMElementClass),
IsElement("C3", EnvDTE.vsCMElement.vsCMElementClass))
End Sub
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TypeDescriptor_GetProperties()
Public Async Function TestTypeDescriptor_GetProperties() As Task
Dim code =
<Code>
namespace $$N
......@@ -67,8 +68,8 @@ namespace $$N
"InfoLocation", "Children", "Language", "StartPoint", "EndPoint", "ExtenderNames",
"ExtenderCATID", "Parent", "Members", "DocComment", "Comment"}
TestPropertyDescriptors(code, expectedPropertyNames)
End Sub
Await TestPropertyDescriptors(code, expectedPropertyNames)
End Function
Protected Overrides ReadOnly Property LanguageName As String
Get
......
src/VisualStudio/Core/Test/CodeModel/CSharp/ExternalCodeClassTests.vb
浏览文件 @ f2745d7c
' 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
Imports Roslyn.Test.Utilities
......@@ -10,7 +11,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
#Region "Doc Comment"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub DocComment1()
Public Async Function TestDocComment1() As Task
Dim code =
<Code>
/// &lt;summary&gt;This is my comment!&lt;/summary&gt;
......@@ -19,11 +20,11 @@ class C$$
}
</Code>
TestDocComment(code, "<doc>" & vbCrLf & " <summary>This is my comment!</summary>" & vbCrLf & "</doc>")
End Sub
Await TestDocComment(code, "<doc>" & vbCrLf & " <summary>This is my comment!</summary>" & vbCrLf & "</doc>")
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub DocComment2()
Public Async Function TestDocComment2() As Task
Dim code =
<Code>
/// &lt;summary&gt;This is my comment!&lt;/summary&gt;
......@@ -33,13 +34,13 @@ class C$$
}
</Code>
TestDocComment(code, "<doc>" & vbCrLf & " <summary>This is my comment!</summary>" & vbCrLf & " <remarks />" & vbCrLf & "</doc>")
End Sub
Await TestDocComment(code, "<doc>" & vbCrLf & " <summary>This is my comment!</summary>" & vbCrLf & " <remarks />" & vbCrLf & "</doc>")
End Function
#End Region
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub ExpectedClassMembers()
Public Async Function TestExpectedClassMembers() As Task
Dim code =
<Code>
class C$$
......@@ -60,7 +61,7 @@ class C$$
}
</Code>
TestElement(code,
Await TestElement(code,
Sub(codeElement)
Dim members = codeElement.Members
Assert.Equal(7, members.Count)
......@@ -93,7 +94,7 @@ class C$$
Assert.Equal("C", member7.Name)
Assert.Equal(EnvDTE.vsCMElement.vsCMElementFunction, member7.Kind)
End Sub)
End Sub
End Function
Protected Overrides ReadOnly Property LanguageName As String
Get
......
src/VisualStudio/Core/Test/CodeModel/CSharp/RootCodeModelTests.vb
浏览文件 @ f2745d7c
' 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
Imports Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel
Imports Microsoft.VisualStudio.LanguageServices.Implementation.Interop
......@@ -12,22 +13,22 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.CSharp
#Region "CodeElements tests"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub CodeElements1()
Public Async Function TestCodeElements1() As Task
Dim code =
<code>
class Foo { }
</code>
TestCodeElements(code,
Await TestCodeElements(code,
"Foo",
"System",
"Microsoft")
End Sub
End Function
#End Region
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TestDotNetNameFromLanguageSpecific()
Public Async Function TestDotNetNameFromLanguageSpecific() As Task
Dim code =
<code>
using N.M;
......@@ -41,21 +42,21 @@ namespace N
}
</code>
TestRootCodeModelWithCodeFile(code,
Await TestRootCodeModelWithCodeFile(code,
Sub(rootCodeModel)
Dim dotNetName = rootCodeModel.DotNetNameFromLanguageSpecific("N.M.Generic<string>")
Assert.Equal("N.M.Generic`1[System.String]", dotNetName)
End Sub)
End Sub
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TestExternalNamespaceChildren()
Public Async Function TestExternalNamespaceChildren() As Task
Dim code =
<code>
class Foo { }
</code>
TestRootCodeModelWithCodeFile(code,
Await TestRootCodeModelWithCodeFile(code,
Sub(rootCodeModel)
Dim systemNamespace = rootCodeModel.CodeElements.Find(Of EnvDTE.CodeNamespace)("System")
Assert.NotNull(systemNamespace)
......@@ -69,53 +70,53 @@ class Foo { }
Dim listClass = genericNamespace.Members.Find(Of EnvDTE.CodeClass)("List")
Assert.NotNull(listClass)
End Sub)
End Sub
End Function
#Region "CreateCodeTypeRef"
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub CreateCodeTypeRef_Int32()
TestCreateCodeTypeRef("System.Int32",
Public Async Function TestCreateCodeTypeRef_Int32() As Task
Await TestCreateCodeTypeRef("System.Int32",
New CodeTypeRefData With {
.AsString = "int",
.AsFullName = "System.Int32",
.CodeTypeFullName = "System.Int32",
.TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefInt
})
End Sub
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub CreateCodeTypeRef_System_Text_StringBuilder()
TestCreateCodeTypeRef("System.Text.StringBuilder",
Public Async Function TestCreateCodeTypeRef_System_Text_StringBuilder() As Task
Await TestCreateCodeTypeRef("System.Text.StringBuilder",
New CodeTypeRefData With {
.AsString = "System.Text.StringBuilder",
.AsFullName = "System.Text.StringBuilder",
.CodeTypeFullName = "System.Text.StringBuilder",
.TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefCodeType
})
End Sub
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub CreateCodeTypeRef_NullableInteger()
TestCreateCodeTypeRef("int?",
Public Async Function TestCreateCodeTypeRef_NullableInteger() As Task
Await TestCreateCodeTypeRef("int?",
New CodeTypeRefData With {
.AsString = "int?",
.AsFullName = "System.Nullable<System.Int32>",
.CodeTypeFullName = "System.Int32?",
.TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefCodeType
})
End Sub
End Function
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub CreateCodeTypeRef_ListOfInt()
TestCreateCodeTypeRef("System.Collections.Generic.List<int>",
Public Async Function TestCreateCodeTypeRef_ListOfInt() As Task
Await TestCreateCodeTypeRef("System.Collections.Generic.List<int>",
New CodeTypeRefData With {
.AsString = "System.Collections.Generic.List<int>",
.AsFullName = "System.Collections.Generic.List<System.Int32>",
.CodeTypeFullName = "System.Collections.Generic.List<System.Int32>",
.TypeKind = EnvDTE.vsCMTypeRef.vsCMTypeRefCodeType
})
End Sub
End Function
#End Region
......@@ -123,7 +124,7 @@ class Foo { }
<WorkItem(1107453)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TestCodeTypeFromFullName_NonGenerated()
Public Async Function TestCodeTypeFromFullName_NonGenerated() As Task
Dim workspace = <Workspace>
<Project Language=<%= LanguageName %> CommonReferences="true">
......@@ -138,7 +139,7 @@ namespace N
</Project>
</Workspace>
TestCodeTypeFromFullName(workspace, "N.C",
Await TestCodeTypeFromFullName(workspace, "N.C",
Sub(codeType)
Assert.NotNull(codeType)
Assert.Equal("N.C", codeType.FullName)
......@@ -156,12 +157,12 @@ namespace N
Assert.Equal("C.cs", filePath)
End Sub)
End Sub
End Function
<WorkItem(1107453)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TestCodeTypeFromFullName_Generated()
Public Async Function TestCodeTypeFromFullName_Generated() As Task
Dim workspace = <Workspace>
<Project Language=<%= LanguageName %> CommonReferences="true">
......@@ -176,7 +177,7 @@ namespace N
</Project>
</Workspace>
TestCodeTypeFromFullName(workspace, "N.C",
Await TestCodeTypeFromFullName(workspace, "N.C",
Sub(codeType)
Assert.NotNull(codeType)
Assert.Equal("N.C", codeType.FullName)
......@@ -194,11 +195,11 @@ namespace N
Assert.Equal("C.g.cs", filePath)
End Sub)
End Sub
End Function
<WorkItem(1107453)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TestCodeTypeFromFullName_NonGenerated_Generated()
Public Async Function TestCodeTypeFromFullName_NonGenerated_Generated() As Task
Dim workspace = <Workspace>
<Project Language=<%= LanguageName %> CommonReferences="true">
......@@ -221,7 +222,7 @@ namespace N
</Project>
</Workspace>
TestCodeTypeFromFullName(workspace, "N.C",
Await TestCodeTypeFromFullName(workspace, "N.C",
Sub(codeType)
Assert.NotNull(codeType)
Assert.Equal("N.C", codeType.FullName)
......@@ -239,11 +240,11 @@ namespace N
Assert.Equal("C.cs", filePath)
End Sub)
End Sub
End Function
<WorkItem(1107453)>
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModel)>
Public Sub TestCodeTypeFromFullName_Generated_NonGenerated()
Public Async Function TestCodeTypeFromFullName_Generated_NonGenerated() As Task
Dim workspace = <Workspace>
<Project Language=<%= LanguageName %> CommonReferences="true">
......@@ -266,7 +267,7 @@ namespace N
</Project>
</Workspace>
TestCodeTypeFromFullName(workspace, "N.C",
Await TestCodeTypeFromFullName(workspace, "N.C",
Sub(codeType)
Assert.NotNull(codeType)
Assert.Equal("N.C", codeType.FullName)
......@@ -284,7 +285,7 @@ namespace N
Assert.Equal("C.cs", filePath)
End Sub)
End Sub
End Function
#End Region
......
src/VisualStudio/Core/Test/CodeModel/CodeModelTestHelpers.vb
浏览文件 @ f2745d7c
......@@ -33,8 +33,8 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
' "probably not crash" as an improvement over "will crash when the finalizer throws."
<HandleProcessCorruptedStateExceptions()>
Public Function CreateCodeModelTestState(definition As XElement) As CodeModelTestState
Dim workspace = TestWorkspaceFactory.CreateWorkspace(definition, exportProvider:=VisualStudioTestExportProvider.ExportProvider)
Public Async Function CreateCodeModelTestStateAsync(definition As XElement) As Threading.Tasks.Task(Of CodeModelTestState)
Dim workspace = Await TestWorkspaceFactory.CreateWorkspaceAsync(definition, exportProvider:=VisualStudioTestExportProvider.ExportProvider)
Dim result As CodeModelTestState = Nothing
Try
......
src/VisualStudio/Core/Test/CodeModel/MethodXML/MethodXMLTests.vb
浏览文件 @ f2745d7c
......@@ -5,14 +5,13 @@ Imports Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.MethodXML
Partial Public Class MethodXMLTests
Private Sub Test(definition As XElement, expected As XElement)
Using state = CreateCodeModelTestState(definition)
Private Async Function TestAsync(definition As XElement, expected As XElement) As Threading.Tasks.Task
Using state = Await CreateCodeModelTestStateAsync(definition)
Dim func = state.GetCodeElementAtCursor(Of EnvDTE.CodeFunction)()
Dim actual = func.GetMethodXML()
Assert.Equal(expected.ToString(), actual.ToString())
End Using
End Sub
End Function
End Class
End Namespace
End Namespace
\ No newline at end of file
src/VisualStudio/Core/Test/CodeModel/MethodXML/MethodXMLTests_CSQuotes.vb
浏览文件 @ f2745d7c
' 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 Roslyn.Test.Utilities
Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel.MethodXML
Partial Public Class MethodXMLTests
<ConditionalWpfFact(GetType(x86)), Trait(Traits.Feature, Traits.Features.CodeModelMethodXml)>
Public Sub CSQuotes_ForLoopAndComments()
Public Async Function TestCSQuotes_ForLoopAndComments() As Task
Dim definition =
<Workspace>
<Project Language="C#" CommonReferences="true">
......@@ -47,8 +48,8 @@ public class C
<Comment> Foo3</Comment>
</Block>
Test(definition, expected)
End Sub
Await TestAsync(definition, expected)
End Function
End Class
End Namespace
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或