From 95bed9d201aa5aee65644478766dbc4bde9aab05 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 17 Sep 2015 18:26:05 -0700 Subject: [PATCH 1/2] Fixed the test. --- .../AutomationTests/CheckBoxInLibraryIsClickable.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Tests/MatterControl.Tests/MatterControl/AutomationTests/CheckBoxInLibraryIsClickable.cs b/Tests/MatterControl.Tests/MatterControl/AutomationTests/CheckBoxInLibraryIsClickable.cs index 937bad568..03241dad9 100644 --- a/Tests/MatterControl.Tests/MatterControl/AutomationTests/CheckBoxInLibraryIsClickable.cs +++ b/Tests/MatterControl.Tests/MatterControl/AutomationTests/CheckBoxInLibraryIsClickable.cs @@ -54,12 +54,17 @@ namespace MatterHackers.MatterControl.UI // Now do the actions specific to this test. (replace this for new tests) { testRunner.ClickByName("Library Tab", 3); - SystemWindow systemWindow; - GuiWidget rowItem = testRunner.GetWidgetByName("Local Library Row Item Collection", out systemWindow, 3); + MatterControlUtilities.NavigateToFolder(testRunner, "Local Library Row Item Collection"); - SearchRegion rowItemRegion = testRunner.GetRegionByName("Local Library Row Item Collection", 3); + SystemWindow systemWindow; + string itemName = "Row Item " + "Calibration - Box"; + + GuiWidget rowItem = testRunner.GetWidgetByName(itemName, out systemWindow, 3); + + SearchRegion rowItemRegion = testRunner.GetRegionByName(itemName, 3); testRunner.ClickByName("Library Edit Button", 3); + testRunner.Wait(.5); SystemWindow containingWindow; GuiWidget foundWidget = testRunner.GetWidgetByName("Row Item Select Checkbox", out containingWindow, 3, searchRegion: rowItemRegion); @@ -71,7 +76,7 @@ namespace MatterHackers.MatterControl.UI testRunner.ClickByName("Library Tab"); resultsHarness.AddTestResult(checkBoxWidget.Checked == true, "currently checked"); - testRunner.ClickByName("Local Library Row Item Collection", 3); + testRunner.ClickByName(itemName, 3); testRunner.ClickByName("Library Tab"); resultsHarness.AddTestResult(checkBoxWidget.Checked == false, "currently not checked"); From 657c0a810f97ca43b23f14d2c2ccae4ba17486e1 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 17 Sep 2015 18:46:26 -0700 Subject: [PATCH 2/2] Remove unused widget --- ApplicationView/MenuRow/ApplicationMenuRow.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ApplicationView/MenuRow/ApplicationMenuRow.cs b/ApplicationView/MenuRow/ApplicationMenuRow.cs index 4ba979490..ac4611745 100644 --- a/ApplicationView/MenuRow/ApplicationMenuRow.cs +++ b/ApplicationView/MenuRow/ApplicationMenuRow.cs @@ -58,12 +58,6 @@ namespace MatterHackers.MatterControl linkButtonFactory.textColor = ActiveTheme.Instance.PrimaryTextColor; linkButtonFactory.fontSize = 8; - Button signOutLink = linkButtonFactory.Generate("(Sign Out)"); - signOutLink.Name = "Authentication Sign Out"; - signOutLink.ToolTipText = "Sign out of your MatterControl account".Localize(); - signOutLink.VAnchor = Agg.UI.VAnchor.ParentCenter; - signOutLink.Margin = new BorderDouble(top: 0); - this.HAnchor = HAnchor.ParentLeftRight; this.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor; @@ -90,7 +84,7 @@ namespace MatterHackers.MatterControl popUpAboutPage.AddChild(updateStatusMessage); updateStatusMessage.Click += (sender, e) => { - UiThread.RunOnIdle(CheckForUpdateWindow.Show); + UiThread.RunOnIdle(CheckForUpdateWindow.Show); }; this.AddChild(popUpAboutPage); SetUpdateNotification(this, null);