nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make SwitchToAdvancedSliceSettings helper an extension method

Browse source 
- Rename for clarity - numerous Settings contexts in application
This commit is contained in:
John Lewin 2017-06-02 19:39:29 -07:00
parent c6def81f76
commit 563b371395
5 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
View file

@ -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);

2
Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
View file

@ -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);

8
Tests/MatterControl.AutomationTests/PrintingTests.cs
View file

@ -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);

15
Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
View file

@ -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");

6
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -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);