Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

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

Run VB tests OOP

上级 9d30c3e2
隐藏空白更改
内联 并排
Showing with 83 addition and 64 deletion
src/EditorFeatures/VisualBasicTest/CodeActions/EncapsulateField/EncapsulateFieldTests.vb
浏览文件 @ 218d1bfe
...@@ -4,9 +4,16 @@ ...@@ -4,9 +4,16 @@
Imports Microsoft.CodeAnalysis.CodeRefactorings Imports Microsoft.CodeAnalysis.CodeRefactorings
Imports Microsoft.CodeAnalysis.CodeStyle Imports Microsoft.CodeAnalysis.CodeStyle
Imports Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions
Imports Microsoft.CodeAnalysis.EncapsulateField Imports Microsoft.CodeAnalysis.EncapsulateField
Imports Microsoft.CodeAnalysis.Test.Utilities.RemoteHost
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings.EncapsulateField Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings.EncapsulateField
Public Enum TestHost
InProcess
OutOfProcess
End Enum
Public Class EncapsulateFieldTests Public Class EncapsulateFieldTests
Inherits AbstractVisualBasicCodeActionTest Inherits AbstractVisualBasicCodeActionTest
...@@ -14,8 +21,14 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings.E ...@@ -14,8 +21,14 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings.E
Return New EncapsulateFieldRefactoringProvider() Return New EncapsulateFieldRefactoringProvider()
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> Private Function GetHostOptions(host As TestHost) As OptionsCollection
Public Async Function TestEncapsulatePrivateFieldAndUpdateReferences() As Task Return New OptionsCollection(GetLanguage()) From {
{RemoteHostOptions.RemoteHostTest, host <> TestHost.InProcess}
}
End Function
<Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulatePrivateFieldAndUpdateReferences(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Private ReadOnly x[||] As Integer Private ReadOnly x[||] As Integer
...@@ -48,12 +61,11 @@ Class C ...@@ -48,12 +61,11 @@ Class C
End Sub End Sub
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulateDimField() As Task Public Async Function TestEncapsulateDimField(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Dim x[||] As Integer Dim x[||] As Integer
...@@ -81,12 +93,12 @@ Class C ...@@ -81,12 +93,12 @@ Class C
End Sub End Sub
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulateGenericField() As Task Public Async Function TestEncapsulateGenericField(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C(Of T) Class C(Of T)
Dim x[||] As T Dim x[||] As T
...@@ -114,12 +126,12 @@ Class C(Of T) ...@@ -114,12 +126,12 @@ Class C(Of T)
End Sub End Sub
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulatePublicFieldIgnoringReferences() As Task Public Async Function TestEncapsulatePublicFieldIgnoringReferences(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Public [|x|] As Integer Public [|x|] As Integer
...@@ -147,11 +159,11 @@ Class C ...@@ -147,11 +159,11 @@ Class C
End Sub End Sub
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected, index:=1) Await TestInRegularAndScriptAsync(text, expected, index:=1, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulatePublicFieldUpdatingReferences() As Task Public Async Function TestEncapsulatePublicFieldUpdatingReferences(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Public [|x|] As Integer Public [|x|] As Integer
...@@ -179,11 +191,11 @@ Class C ...@@ -179,11 +191,11 @@ Class C
End Sub End Sub
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulateMultiplePrivateFieldsWithReferences() As Task Public Async Function TestEncapsulateMultiplePrivateFieldsWithReferences(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Private [|x, y|] As Integer Private [|x, y|] As Integer
...@@ -222,11 +234,11 @@ Class C ...@@ -222,11 +234,11 @@ Class C
End Sub End Sub
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulateMultiplePublicFieldsWithReferences() As Task Public Async Function TestEncapsulateMultiplePublicFieldsWithReferences(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
[|Public x As String [|Public x As String
...@@ -267,11 +279,11 @@ Class C ...@@ -267,11 +279,11 @@ Class C
End Sub End Sub
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected, index:=1) Await TestInRegularAndScriptAsync(text, expected, index:=1, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestNoSetterForConstField() As Task Public Async Function TestNoSetterForConstField(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class Program Class Program
Private Const [|goo|] As Integer = 3 Private Const [|goo|] As Integer = 3
...@@ -288,12 +300,12 @@ Class Program ...@@ -288,12 +300,12 @@ Class Program
End Property End Property
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulateEscapedIdentifier() As Task Public Async Function TestEncapsulateEscapedIdentifier(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Private [|[Class]|] As String Private [|[Class]|] As String
...@@ -313,12 +325,12 @@ Class C ...@@ -313,12 +325,12 @@ Class C
End Property End Property
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulateEscapedIdentifierWithQualifiedAccess() As Task Public Async Function TestEncapsulateEscapedIdentifierWithQualifiedAccess(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Private [|[Class]|] As String Private [|[Class]|] As String
...@@ -338,12 +350,16 @@ Class C ...@@ -338,12 +350,16 @@ Class C
End Property End Property
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected, options:=[Option](CodeStyleOptions2.QualifyFieldAccess, True, NotificationOption2.Error)) Await TestInRegularAndScriptAsync(
text, expected,
options:=New OptionsCollection(GetLanguage()) From {
{CodeStyleOptions2.QualifyFieldAccess, True, NotificationOption2.Error},
{RemoteHostOptions.RemoteHostTest, host <> TestHost.InProcess}
})
End Function End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <WpfTheory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulateFieldNamedValue() As Task Public Async Function TestEncapsulateFieldNamedValue(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Private [|value|] As Integer = 3 Private [|value|] As Integer = 3
...@@ -363,12 +379,12 @@ Class C ...@@ -363,12 +379,12 @@ Class C
End Property End Property
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulateFieldName__() As Task Public Async Function TestEncapsulateFieldName__(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class D Class D
Public [|__|] As Integer Public [|__|] As Integer
...@@ -390,12 +406,12 @@ Class D ...@@ -390,12 +406,12 @@ Class D
End Class End Class
</File>.ConvertTestSourceTag() </File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<WorkItem(694262, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/694262")> <WorkItem(694262, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/694262")>
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestPreserveTrivia() As Task Public Async Function TestPreserveTrivia(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class AA Class AA
Private name As String : Public [|dsds|] As Integer Private name As String : Public [|dsds|] As Integer
...@@ -417,12 +433,12 @@ Class AA ...@@ -417,12 +433,12 @@ Class AA
End Class End Class
</File>.ConvertTestSourceTag() </File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<WorkItem(694241, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/694241")> <WorkItem(694241, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/694241")>
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestNewPropertyNameIsUnique() As Task Public Async Function TestNewPropertyNameIsUnique(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class AA Class AA
Private [|name|] As String Private [|name|] As String
...@@ -460,23 +476,23 @@ Class AA ...@@ -460,23 +476,23 @@ Class AA
End Class End Class
</File>.ConvertTestSourceTag() </File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<WorkItem(695046, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/695046")> <WorkItem(695046, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/695046")>
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestAvailableNotJustOnVariableName() As Task Public Async Function TestAvailableNotJustOnVariableName(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Private [||] ReadOnly x As Integer Private [||] ReadOnly x As Integer
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestActionCountAsync(text, 2) Await TestActionCountAsync(text, 2, New TestParameters(options:=GetHostOptions(host)))
End Function End Function
<WorkItem(705898, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/705898")> <WorkItem(705898, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/705898")>
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestCopyAccessibility() As Task Public Async Function TestCopyAccessibility(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Protected [|x|] As Integer Protected [|x|] As Integer
...@@ -496,12 +512,12 @@ Class C ...@@ -496,12 +512,12 @@ Class C
End Property End Property
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<WorkItem(707080, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/707080")> <WorkItem(707080, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/707080")>
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestBackingFieldStartsWithUnderscore() As Task Public Async Function TestBackingFieldStartsWithUnderscore(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Public Class Class1 Public Class Class1
Public [|Name|] As String Public [|Name|] As String
...@@ -530,11 +546,11 @@ Public Class Class1 ...@@ -530,11 +546,11 @@ Public Class Class1
End Class End Class
</File>.ConvertTestSourceTag() </File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestEncapsulateShadowingField() As Task Public Async Function TestEncapsulateShadowingField(host As TestHost) As Task
Dim text = <File> Dim text = <File>
Class C Class C
Protected _goo As Integer Protected _goo As Integer
...@@ -584,16 +600,16 @@ Class D ...@@ -584,16 +600,16 @@ Class D
End Property End Property
End Class</File>.ConvertTestSourceTag() End Class</File>.ConvertTestSourceTag()
Await TestInRegularAndScriptAsync(text, expected) Await TestInRegularAndScriptAsync(text, expected, options:=GetHostOptions(host))
End Function End Function
<WorkItem(1096007, "https://github.com/dotnet/roslyn/issues/282")> <WorkItem(1096007, "https://github.com/dotnet/roslyn/issues/282")>
<Fact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function TestDoNotEncapsulateOutsideTypeDeclaration() As Task Public Async Function TestDoNotEncapsulateOutsideTypeDeclaration(host As TestHost) As Task
Dim globalField = <File> Dim globalField = <File>
Dim [|x|] = 1 Dim [|x|] = 1
</File>.ConvertTestSourceTag() </File>.ConvertTestSourceTag()
Await TestMissingInRegularAndScriptAsync(globalField) Await TestMissingInRegularAndScriptAsync(globalField, New TestParameters(options:=GetHostOptions(host)))
Dim namespaceField = <File> Dim namespaceField = <File>
...@@ -601,20 +617,20 @@ Namespace N ...@@ -601,20 +617,20 @@ Namespace N
Dim [|x|] = 1 Dim [|x|] = 1
End Namespace End Namespace
</File>.ConvertTestSourceTag() </File>.ConvertTestSourceTag()
Await TestMissingInRegularAndScriptAsync(namespaceField) Await TestMissingInRegularAndScriptAsync(namespaceField, New TestParameters(options:=GetHostOptions(host)))
Dim enumField = <File> Dim enumField = <File>
Enum E Enum E
[|x|] = 1 [|x|] = 1
End Enum End Enum
</File>.ConvertTestSourceTag() </File>.ConvertTestSourceTag()
Await TestMissingInRegularAndScriptAsync(enumField) Await TestMissingInRegularAndScriptAsync(enumField, New TestParameters(options:=GetHostOptions(host)))
End Function End Function
<WorkItem(7090, "https://github.com/dotnet/roslyn/issues/7090")> <WorkItem(7090, "https://github.com/dotnet/roslyn/issues/7090")>
<WpfFact, Trait(Traits.Feature, Traits.Features.EncapsulateField)> <WpfTheory, CombinatorialData, Trait(Traits.Feature, Traits.Features.EncapsulateField)>
Public Async Function ApplyCurrentMePrefixStyle() As Task Public Async Function ApplyCurrentMePrefixStyle(host As TestHost) As Task
Await TestInRegularAndScriptAsync(" Await TestInRegularAndScriptAsync("
Class C Class C
Dim [|i|] As Integer Dim [|i|] As Integer
...@@ -633,7 +649,10 @@ Class C ...@@ -633,7 +649,10 @@ Class C
End Property End Property
End Class End Class
", ",
options:=[Option](CodeStyleOptions2.QualifyFieldAccess, True, NotificationOption2.Error)) options:=New OptionsCollection(GetLanguage()) From {
{CodeStyleOptions2.QualifyFieldAccess, True, NotificationOption2.Error},
{RemoteHostOptions.RemoteHostTest, host <> TestHost.InProcess}
})
End Function End Function
End Class End Class
End Namespace End Namespace
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或