From 7c45cc0fd539690f177f6dd0f104c825bcbfecdd Mon Sep 17 00:00:00 2001 From: John Lewin Date: Mon, 30 Oct 2017 22:34:55 -0700 Subject: [PATCH] Use concise test format, use new name, discard window, click Cancel - Make InputBoxPage text field automatable - Issue MatterHackers/MCCentral#2149 Investigate CreateFolderStarsOutWithTextFiledFocusedAndEditable failure --- SetupWizard/InputBoxPage.cs | 1 + .../CreateLibraryFolder.cs | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/SetupWizard/InputBoxPage.cs b/SetupWizard/InputBoxPage.cs index 1a0f2112c..bfa53f098 100644 --- a/SetupWizard/InputBoxPage.cs +++ b/SetupWizard/InputBoxPage.cs @@ -55,6 +55,7 @@ namespace MatterHackers.MatterControl //Adds text box and check box to the above container textEditWidget = new MHTextEditWidget(initialValue, pixelWidth: 300, messageWhenEmptyAndNotSelected: emptyText); + textEditWidget.Name = "InputBoxPage TextEditWidget"; textEditWidget.HAnchor = HAnchor.Stretch; textEditWidget.Margin = new BorderDouble(5); textEditWidget.ActualTextEditWidget.EnterPressed += (s, e) => diff --git a/Tests/MatterControl.AutomationTests/CreateLibraryFolder.cs b/Tests/MatterControl.AutomationTests/CreateLibraryFolder.cs index 0fa2b3776..6d888519f 100644 --- a/Tests/MatterControl.AutomationTests/CreateLibraryFolder.cs +++ b/Tests/MatterControl.AutomationTests/CreateLibraryFolder.cs @@ -41,9 +41,9 @@ namespace MatterHackers.MatterControl.Tests.Automation public class CreateLibraryFolder { [Test, Apartment(ApartmentState.STA)] - public async Task CreateFolderStarsOutWithTextFiledFocusedAndEditable() + public async Task CreateFolderStartsWithTextFieldFocusedAndEditable() { - AutomationTest testToRun = (testRunner) => + await MatterControlUtilities.RunTest((testRunner) => { testRunner.CloseSignInAndPrinterSelect(); @@ -54,18 +54,16 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.Type("Test Text"); testRunner.Delay(.5); - SystemWindow containingWindow; - GuiWidget textInputWidget = testRunner.GetWidgetByName("Create Folder - Text Input", out containingWindow); - MHTextEditWidget textWidgetMH = textInputWidget as MHTextEditWidget; + var textWidgetMH = testRunner.GetWidgetByName("InputBoxPage TextEditWidget", out _) as MHTextEditWidget; + Assert.IsTrue(textWidgetMH != null, "Found Text Widget"); Assert.IsTrue(textWidgetMH.Text == "Test Text", "Had the right text"); - containingWindow.CloseOnIdle(); + + testRunner.ClickByName("Cancel Wizard Button"); testRunner.Delay(.5); return Task.CompletedTask; - }; - - await MatterControlUtilities.RunTest(testToRun); + }); } } } \ No newline at end of file