提交 fa44d42d 编写于 作者: J Jonathon Marolf

fix copy paste error.

上级 8bef61a7
......@@ -36,18 +36,24 @@ protected AbstractEditorTest(VisualStudioInstanceFactory instanceFactory, string
{
}
protected AbstractEditorTest(VisualStudioInstanceFactory instanceFactory, string solutionName, string projectTemplate, bool clearEditor = true)
protected AbstractEditorTest(
VisualStudioInstanceFactory instanceFactory,
string solutionName,
string projectTemplate)
: base(instanceFactory)
{
VisualStudio.Instance.SolutionExplorer.CreateSolution(solutionName);
VisualStudio.Instance.SolutionExplorer.AddProject(ProjectName, projectTemplate, LanguageName);
VisualStudioWorkspaceOutOfProc = VisualStudio.Instance.VisualStudioWorkspace;
VisualStudioWorkspaceOutOfProc.SetUseSuggestionMode(false);
Editor = VisualStudio.Instance.Editor;
if (clearEditor)
// Winforms and XAML do not open text files on creation
// so these editor tasks will not work if that is the project template being used.
if (projectTemplate != WellKnownProjectTemplates.WinFormsApplication &&
projectTemplate != WellKnownProjectTemplates.WpfApplication)
{
VisualStudioWorkspaceOutOfProc.SetUseSuggestionMode(false);
ClearEditor();
}
}
......
......@@ -13,7 +13,7 @@ public class CSharpWinForms : AbstractEditorTest
protected override string LanguageName => LanguageNames.CSharp;
public CSharpWinForms(VisualStudioInstanceFactory instanceFactory)
: base(instanceFactory, nameof(CSharpWinForms), WellKnownProjectTemplates.WinFormsApplication, clearEditor: false)
: base(instanceFactory, nameof(CSharpWinForms), WellKnownProjectTemplates.WinFormsApplication)
{
}
......
......@@ -14,7 +14,7 @@ public class BasicWinForms : AbstractEditorTest
protected override string LanguageName => LanguageNames.VisualBasic;
public BasicWinForms(VisualStudioInstanceFactory instanceFactory)
: base(instanceFactory, nameof(BasicWinForms), WellKnownProjectTemplates.WinFormsApplication, clearEditor: false)
: base(instanceFactory, nameof(BasicWinForms), WellKnownProjectTemplates.WinFormsApplication)
{
}
......@@ -49,7 +49,7 @@ End Sub
[Fact, Trait(Traits.Feature, Traits.Features.WinForms)]
public void Add_Control()
{
OpenFileWithDesigner(ProjectName, "Form1.cs");
OpenFileWithDesigner(ProjectName, "Form1.vb");
AddWinFormButton("SomeButton");
CloseFile(ProjectName, "Form1.vb", saveFile: true);
OpenFile(ProjectName, "Form1.Designer.vb");
......@@ -60,7 +60,7 @@ public void Add_Control()
[Fact, Trait(Traits.Feature, Traits.Features.WinForms)]
public void Change_Control_Property()
{
OpenFileWithDesigner(ProjectName, "Form1.cs");
OpenFileWithDesigner(ProjectName, "Form1.vb");
AddWinFormButton("SomeButton");
EditWinFormButtonProperty(buttonName: "SomeButton", propertyName: "Text", propertyValue: "NewButtonText");
CloseFile(ProjectName, "Form1.vb", saveFile: true);
......@@ -71,7 +71,7 @@ public void Change_Control_Property()
[Fact, Trait(Traits.Feature, Traits.Features.WinForms)]
public void Change_Control_Property_In_Code()
{
OpenFileWithDesigner(ProjectName, "Form1.cs");
OpenFileWithDesigner(ProjectName, "Form1.vb");
AddWinFormButton("SomeButton");
EditWinFormButtonProperty(buttonName: "SomeButton", propertyName: "Text", propertyValue: "ButtonTextGoesHere");
var expectedPropertyValue = "ButtonTextGoesHere";
......@@ -96,7 +96,7 @@ public void Change_Control_Property_In_Code()
[Fact, Trait(Traits.Feature, Traits.Features.WinForms)]
public void Add_Click_Handler()
{
OpenFileWithDesigner(ProjectName, "Form1.cs");
OpenFileWithDesigner(ProjectName, "Form1.vb");
AddWinFormButton("SomeButton");
EditWinFormsButtonEvent(buttonName: "SomeButton", eventName: "Click", eventHandlerName: "ExecuteWhenButtonClicked");
OpenFile(ProjectName, "Form1.vb");
......@@ -107,7 +107,7 @@ public void Add_Click_Handler()
[Fact, Trait(Traits.Feature, Traits.Features.WinForms)]
public void Rename_Control()
{
OpenFileWithDesigner(ProjectName, "Form1.cs");
OpenFileWithDesigner(ProjectName, "Form1.vb");
AddWinFormButton("SomeButton");
// Add some control properties and events
EditWinFormButtonProperty(buttonName: "SomeButton", propertyName: "Text", propertyValue: "ButtonTextValue");
......@@ -134,7 +134,7 @@ public void Rename_Control()
[Fact, Trait(Traits.Feature, Traits.Features.WinForms)]
public void Remove_Event_Handler()
{
OpenFileWithDesigner(ProjectName, "Form1.cs");
OpenFileWithDesigner(ProjectName, "Form1.vb");
AddWinFormButton("SomeButton");
EditWinFormsButtonEvent(buttonName: "SomeButton", eventName: "Click", eventHandlerName: "FooHandler");
// Remove the event handler
......@@ -148,7 +148,7 @@ public void Remove_Event_Handler()
[Fact, Trait(Traits.Feature, Traits.Features.WinForms)]
public void Change_Accessibility()
{
OpenFileWithDesigner(ProjectName, "Form1.cs");
OpenFileWithDesigner(ProjectName, "Form1.vb");
AddWinFormButton("SomeButton");
EditWinFormButtonProperty(
buttonName: "SomeButton",
......@@ -163,7 +163,7 @@ public void Change_Accessibility()
[Fact, Trait(Traits.Feature, Traits.Features.WinForms)]
public void Delete_Control()
{
OpenFileWithDesigner(ProjectName, "Form1.cs");
OpenFileWithDesigner(ProjectName, "Form1.vb");
AddWinFormButton("SomeButton");
DeleteWinFormButton("SomeButton");
VerifyNoBuildErrors();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册