diff --git a/Tests/MatterControl.AutomationTests/ExportItemWindowTests.cs b/Tests/MatterControl.AutomationTests/ExportItemWindowTests.cs index f7e17e02e..030298dfe 100644 --- a/Tests/MatterControl.AutomationTests/ExportItemWindowTests.cs +++ b/Tests/MatterControl.AutomationTests/ExportItemWindowTests.cs @@ -21,7 +21,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { MatterControlUtilities.PrepForTestRun(testRunner); - MatterControlUtilities.SelectAndAddPrinter(testRunner, "Airwolf 3D", "HD"); + MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); string firstItemName = "Row Item Batman"; //Navigate to Downloads Library Provider diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs index 5b5464feb..5331bc329 100644 --- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs +++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs @@ -18,7 +18,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { MatterControlUtilities.PrepForTestRun(testRunner); //Add printer that has hardware leveling - MatterControlUtilities.SelectAndAddPrinter(testRunner, "Airwolf 3D", "HD"); + MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); testRunner.Wait(1); testRunner.ClickByName("SettingsAndControls", 1); @@ -35,7 +35,7 @@ namespace MatterHackers.MatterControl.Tests.Automation resultsHarness.AddTestResult(testPrintLeveling == false); //Add printer that does not have hardware leveling - MatterControlUtilities.SelectAndAddPrinter(testRunner, "3D Factory", "MendelMax 1.5"); + MatterControlUtilities.AddAndSelectPrinter(testRunner, "3D Factory", "MendelMax 1.5"); testRunner.Wait(.2); testRunner.ClickByName("Slice Settings Tab",1); testRunner.ClickByName("Printer Tab",1); diff --git a/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs index 7ba3837ed..9ae1a3020 100644 --- a/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs +++ b/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs @@ -20,7 +20,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { MatterControlUtilities.PrepForTestRun(testRunner); - MatterControlUtilities.SelectAndAddPrinter(testRunner, "Airwolf 3D", "HD"); + MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); //Navigate to Local Library testRunner.ClickByName("Library Tab"); @@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { MatterControlUtilities.PrepForTestRun(testRunner); - MatterControlUtilities.SelectAndAddPrinter(testRunner, "Airwolf 3D", "HD"); + MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); //Navigate to Local Library resultsHarness.AddTestResult(testRunner.ClickByName("SettingsAndControls", 1)); @@ -106,18 +106,12 @@ namespace MatterHackers.MatterControl.Tests.Automation // assert no profiles resultsHarness.AddTestResult(ProfileManager.Instance.ActiveProfiles.Count() == 0); - MatterControlUtilities.SelectAndAddPrinter(testRunner, "Airwolf 3D", "HD"); + MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); // assert one profile resultsHarness.AddTestResult(ProfileManager.Instance.ActiveProfiles.Count() == 1); - // delete printer - testRunner.ClickByName("Edit Printer Button", 5); - testRunner.Wait(.5); - testRunner.ClickByName("Delete Printer Button", 5); - testRunner.Wait(.5); - testRunner.ClickByName("Yes Button", 5); - testRunner.Wait(2); + MatterControlUtilities.DeleteSelectedPrinter(testRunner); // assert no profiles resultsHarness.AddTestResult(ProfileManager.Instance.ActiveProfiles.Count() == 0); @@ -166,7 +160,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { MatterControlUtilities.PrepForTestRun(testRunner); - MatterControlUtilities.SelectAndAddPrinter(testRunner, "Airwolf 3D", "HD"); + MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); //Navigate to Local Library testRunner.ClickByName("SettingsAndControls"); @@ -207,7 +201,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { MatterControlUtilities.PrepForTestRun(testRunner); - MatterControlUtilities.SelectAndAddPrinter(testRunner, "Airwolf 3D", "HD"); + MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); //Navigate to Settings Tab and make sure Bed Temp Text box is visible testRunner.ClickByName("SettingsAndControls"); diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 93599e9bd..c87740498 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -167,7 +167,18 @@ namespace MatterHackers.MatterControl.Tests.Automation return false; } - public static void SelectAndAddPrinter(AutomationRunner testRunner, string make, string model) + public static void DeleteSelectedPrinter(AutomationRunner testRunner) + { + // delete printer + testRunner.ClickByName("Edit Printer Button", 5); + testRunner.Wait(.5); + testRunner.ClickByName("Delete Printer Button", 5); + testRunner.Wait(.5); + testRunner.ClickByName("Yes Button", 5); + testRunner.Wait(2); + } + + public static void AddAndSelectPrinter(AutomationRunner testRunner, string make, string model) { string manufacturer = make + " Menu Item"; string printer = model + " Menu Item";