From 563b3713953caa1b124e4763c6ae4f5026dbc33e Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 2 Jun 2017 19:39:29 -0700 Subject: [PATCH] Make SwitchToAdvancedSliceSettings helper an extension method - Rename for clarity - numerous Settings contexts in application --- .../HardwareLevelingUITests.cs | 4 ++-- .../PrinterDropDownTests.cs | 2 +- .../PrintingTests.cs | 8 +++----- .../SliceSettingsTests.cs | 15 +++++++-------- .../MatterControl/MatterControlUtilities.cs | 6 +++++- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs index b4dac201e..d9efb59db 100644 --- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs +++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs @@ -21,7 +21,7 @@ namespace MatterHackers.MatterControl.Tests.Automation //Add printer that has hardware leveling MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("Printer Tab", 1); testRunner.Delay(1); @@ -80,7 +80,7 @@ namespace MatterHackers.MatterControl.Tests.Automation Assert.IsTrue(!testRunner.WaitForName("Finish Setup Button", 1), "Finish Setup hidden"); // reset to defaults and make sure print leveling is cleared - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("Slice Settings Options Menu", 1); testRunner.ClickByName("Reset to Defaults Menu Item", 1); diff --git a/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs b/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs index dbed2150b..31a08fa16 100644 --- a/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs +++ b/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs @@ -21,7 +21,7 @@ namespace MatterHackers.MatterControl.Tests.Automation MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("Printer Tab", 1); diff --git a/Tests/MatterControl.AutomationTests/PrintingTests.cs b/Tests/MatterControl.AutomationTests/PrintingTests.cs index 3dcde4088..c3b56a997 100644 --- a/Tests/MatterControl.AutomationTests/PrintingTests.cs +++ b/Tests/MatterControl.AutomationTests/PrintingTests.cs @@ -27,9 +27,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { Assert.IsTrue(ProfileManager.Instance.ActiveProfile != null); - testRunner.ClickByName("Slice Settings Tab"); - - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("Printer Tab", 1); testRunner.ClickByName("Custom G-Code Tab", 1); @@ -80,7 +78,7 @@ namespace MatterHackers.MatterControl.Tests.Automation // close the finish setup window testRunner.ClickByName("Cancel Button"); - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("General Tab", 1); testRunner.ClickByName("Single Print Tab", 1); @@ -233,7 +231,7 @@ namespace MatterHackers.MatterControl.Tests.Automation var emulator = emulatorDisposable as Emulator; Assert.IsTrue(ProfileManager.Instance.ActiveProfile != null); - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("General Tab", 1); testRunner.ClickByName("Single Print Tab", 1); diff --git a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs index d8a4d2d40..e2bd7f18d 100644 --- a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs +++ b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs @@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.ClickByName("Bread Crumb Button Home", 1); testRunner.Delay(.2); - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.Delay(.2); testRunner.ClickByName("Raft / Priming Tab", 1); @@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { Assert.IsTrue(ProfileManager.Instance.ActiveProfile != null); - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("General Tab", 1); testRunner.ClickByName("Single Print Tab", 1); @@ -119,7 +119,7 @@ namespace MatterHackers.MatterControl.Tests.Automation Assert.IsTrue(ProfileManager.Instance.ActiveProfile != null); - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("General Tab", 1); testRunner.ClickByName("Single Print Tab", 1); @@ -191,7 +191,7 @@ namespace MatterHackers.MatterControl.Tests.Automation MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); //Navigate to Local Library - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("Printer Tab", 1); testRunner.ClickByName("Features Tab", 1); @@ -230,7 +230,7 @@ namespace MatterHackers.MatterControl.Tests.Automation MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); //Navigate to Local Library - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("General Tab", 1); testRunner.ClickByName("Layers / Surface Tab", 1); @@ -308,7 +308,7 @@ namespace MatterHackers.MatterControl.Tests.Automation MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); //Navigate to Settings Tab and make sure Bed Temp Text box is visible - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("Filament Tab", 1); testRunner.ClickByName("Temperatures Tab", 1); @@ -351,8 +351,7 @@ namespace MatterHackers.MatterControl.Tests.Automation // Add Guest printers MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); - MatterControlUtilities.SwitchToAdvancedSettings(testRunner); - + testRunner.SwitchToAdvancedSliceSettings(); testRunner.ClickByName("Layer Height Textbox", 2); testRunner.Type(".5\n"); diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 154fe7d8a..ba1115e40 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -473,8 +473,12 @@ namespace MatterHackers.MatterControl.Tests.Automation Environment.CurrentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); } - public static void SwitchToAdvancedSettings(AutomationRunner testRunner) + public static void SwitchToAdvancedSliceSettings(this AutomationRunner testRunner) { + // Switch to Slice Settings Tab + testRunner.ClickByName("Slice Settings Tab"); + + // Change to Advanced view testRunner.ClickByName("User Level Dropdown"); testRunner.ClickByName("Advanced Menu Item"); testRunner.Delay(.5);