From 20f54e28cc1537333a6f6fa418de845d436eb52b Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 24 Jan 2018 16:31:10 -0800 Subject: [PATCH] Fixing tests Added scroll into view Made popup widget get the right scroll Made automation runner able to find widgets that aren't visible --- PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs | 2 ++ Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- .../MatterControl.AutomationTests/SliceSettingsTests.cs | 9 +++------ .../MatterControl/MatterControlUtilities.cs | 3 +++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs b/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs index ffdb568b6..0b7c7b43b 100644 --- a/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs +++ b/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs @@ -63,6 +63,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { Padding = 10, }; + column.AddChild(new TextWidget("Options".Localize()) { HAnchor = HAnchor.Left @@ -111,6 +112,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var sectionWidget = new SectionWidget("Advanced", subPanel, theme, expanded: anySettingOverridden) { + Name = "Advanced Section", HAnchor = HAnchor.Stretch, VAnchor = VAnchor.Fit, Margin = 0 diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 9d5af195e..ccc0ce556 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 9d5af195e1e98f14f0f63f9b3b0949c19417e506 +Subproject commit ccc0ce556c6b08e1de3d3bbad16e2e8b9d05173e diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index c5ae31ce2..b1a1664c7 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit c5ae31ce23f1f0fa1efde99102da2a80b7a4cefa +Subproject commit b1a1664c7a1c8593345cb5e2690998ad2a34eb66 diff --git a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs index 5b5a83fc2..6b5a36ea5 100644 --- a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs +++ b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs @@ -146,17 +146,12 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.ClickByName("Features Tab"); - // Find any sibling toggle switch and scroll the parent to the bottom - var widget = testRunner.GetWidgetByName("has_fan Row", out _); - var scrollable = widget.Parents().First(); - scrollable.ScrollPosition = new Vector2(0, -100); - CheckAndUncheckSetting(testRunner, SettingsKey.heat_extruder_before_homing, false); CheckAndUncheckSetting(testRunner, SettingsKey.has_fan, true); return Task.CompletedTask; - }, overrideWidth: 1224, overrideHeight: 900); + }, overrideWidth: 1224, overrideHeight: 900, maxTimeToRun: 600); } [Test] @@ -372,6 +367,8 @@ namespace MatterHackers.MatterControl.Tests.Automation Assert.IsTrue(ActiveSliceSettings.Instance.GetValue(settingToChange) != valueToSet); + testRunner.ScrollIntoView(checkBoxName); + testRunner.ClickByName(checkBoxName); // give some time for the ui to update if necessary testRunner.Delay(2); diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 23a102189..0749ae97b 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -688,6 +688,8 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.WaitFor(() => printerPopup.Enabled); testRunner.ClickByName("PrintPopupMenu"); + + testRunner.ClickByName("Advanced Section"); } /// @@ -697,6 +699,7 @@ namespace MatterHackers.MatterControl.Tests.Automation public static void StartPrint(this AutomationRunner testRunner) { testRunner.OpenPrintPopupMenu(); + testRunner.ScrollIntoView("Start Print Button"); testRunner.ClickByName("Start Print Button"); }