From ba3f3c71021d9a4dd24f3704df23abfce197f1b4 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Wed, 28 Jun 2017 18:18:28 -0500 Subject: [PATCH] Fix tests which changed behavior due to .editorconfig Since tests are run in a subfolder of the solution, they can currently see the changes we make to .editorconfig. --- .../CSharp/CSharpAddMissingReference.cs | 12 ++++++++---- .../IntegrationTests/CSharp/CSharpGoToDefinition.cs | 3 ++- .../CSharp/CSharpGoToImplementation.cs | 3 ++- .../VisualBasic/BasicAddMissingReference.cs | 12 ++++++++---- .../IntegrationTests/VisualBasic/BasicLineCommit.cs | 3 ++- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpAddMissingReference.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpAddMissingReference.cs index cc4f2a23257..9dde6337dbd 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpAddMissingReference.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpAddMissingReference.cs @@ -46,7 +46,8 @@ End Sub Public Sub PerformClick() Implements System.Windows.Forms.IButtonControl.PerformClick End Sub -End Class"; +End Class +"; private const string FileInLibraryProject2 = @"Public Class Class1 Inherits System.Xml.XmlAttribute Sub New() @@ -56,7 +57,8 @@ Sub foo() End Sub Public bar As ClassLibrary3.Class1 -End Class"; +End Class +"; private const string FileInLibraryProject3 = @"Public Class Class1 Public Enum E E1 @@ -69,7 +71,8 @@ Return x End Function -End Class"; +End Class +"; private const string FileInConsoleProject1 = @" class Program { @@ -87,7 +90,8 @@ static void Main(string[] args) var a = new ClassLibrary2.Class1(); var d = a.bar; } -}"; +} +"; private const string ClassLibrary1Name = "ClassLibrary1"; private const string ClassLibrary2Name = "ClassLibrary2"; diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGoToDefinition.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGoToDefinition.cs index 5ece24cf69e..826e4384264 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGoToDefinition.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGoToDefinition.cs @@ -52,7 +52,8 @@ public void GoToDefinitionOpensProvisionalTabIfDocumentNotAlreadyOpen() VisualStudio.Editor.SetText( @"class SomeClass { -}"); +} +"); VisualStudio.SolutionExplorer.CloseFile(project, "FileDef.cs", saveFile: true); VisualStudio.SolutionExplorer.AddFile(project, "FileConsumer.cs"); VisualStudio.SolutionExplorer.OpenFile(project, "FileConsumer.cs"); diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGoToImplementation.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGoToImplementation.cs index b783f52a2c7..f96ffde2c93 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGoToImplementation.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpGoToImplementation.cs @@ -49,7 +49,8 @@ public void GoToImplementationOpensProvisionalTabIfDocumentNotOpen() VisualStudio.Editor.SetText( @"class Implementation : IBar { -}"); +} +"); VisualStudio.SolutionExplorer.CloseFile(project, "FileImplementation.cs", saveFile: true); VisualStudio.SolutionExplorer.AddFile(project, "FileInterface.cs"); VisualStudio.SolutionExplorer.OpenFile(project, "FileInterface.cs"); diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicAddMissingReference.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicAddMissingReference.cs index c5a0598a3ad..b519c9f1cea 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicAddMissingReference.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicAddMissingReference.cs @@ -46,7 +46,8 @@ End Sub Public Sub PerformClick() Implements System.Windows.Forms.IButtonControl.PerformClick End Sub -End Class"; +End Class +"; private const string FileInLibraryProject2 = @"Public Class Class1 Inherits System.Xml.XmlAttribute Sub New() @@ -56,7 +57,8 @@ Sub foo() End Sub Public bar As ClassLibrary3.Class1 -End Class"; +End Class +"; private const string FileInLibraryProject3 = @"Public Class Class1 Public Enum E E1 @@ -69,7 +71,8 @@ Return x End Function -End Class"; +End Class +"; private const string FileInConsoleProject1 = @"Imports System.Data.XLinq Module Module1 @@ -95,7 +98,8 @@ Sub Main() Dim d = a.bar End Sub -End Module"; +End Module +"; private const string ClassLibrary1Name = "ClassLibrary1"; private const string ClassLibrary2Name = "ClassLibrary2"; diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicLineCommit.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicLineCommit.cs index dddae47f99a..837d83bd765 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicLineCommit.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicLineCommit.cs @@ -81,7 +81,8 @@ void CommitOnSave() VisualStudio.Editor.SetText(@"Module Module1 Sub Main() End Sub -End Module"); +End Module +"); VisualStudio.Editor.PlaceCaret("(", charsOffset: 1); VisualStudio.Editor.SendKeys("x as integer", VirtualKey.Tab); -- GitLab