From 04b7f6da02962cf9619729f70a2a818cb77d4dc8 Mon Sep 17 00:00:00 2001 From: fortsnek9348 Date: Wed, 20 Apr 2022 21:18:58 +0100 Subject: [PATCH] Fix slice settings tests. --- .gitignore | 1 + MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs | 2 +- .../HardwareLevelingUITests.cs | 4 ++-- Tests/MatterControl.AutomationTests/SliceSettingsTests.cs | 6 +++--- .../MatterControl/MatterControlUtilities.cs | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f4531ab50..d29c2f4e1 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ MatterControl.userprefs # JetBrains Rider user configuration directory /.idea/ +/MainOutputDirectory.cs diff --git a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs index 2d7117635..080bbb20c 100644 --- a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs +++ b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs @@ -335,7 +335,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration hasClose: false, pointSize: theme.DefaultFontSize) { - Name = category.Name + " Tab", + Name = category.Name + " SliceSettingsTab", InactiveTabColor = Color.Transparent, ActiveTabColor = theme.BackgroundColor }); diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs index b48932686..ea1a1ca28 100644 --- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs +++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs @@ -18,7 +18,7 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.AddAndSelectPrinter("Airwolf 3D", "HD"); testRunner.SwitchToPrinterSettings(); - testRunner.ClickByName("Features Tab"); + testRunner.ClickByName("Features SliceSettingsTab"); testRunner.ClickByName("Slice Settings Overflow Menu"); testRunner.ClickByName("Advanced Menu Item"); Assert.IsFalse(testRunner.WaitForName("print_leveling_solution Row", .5), "Print leveling should not exist for an Airwolf HD"); @@ -27,7 +27,7 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.AddAndSelectPrinter("3D Factory", "MendelMax 1.5"); testRunner.SwitchToPrinterSettings(); - testRunner.ClickByName("Features Tab"); + testRunner.ClickByName("Features SliceSettingsTab"); testRunner.ClickByName("Slice Settings Overflow Menu"); testRunner.ClickByName("Advanced Menu Item"); Assert.IsTrue(testRunner.WaitForName("print_leveling_solution Row"), "Print leveling should exist for a 3D Factory MendelMax"); diff --git a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs index 82aecee14..d92a5f152 100644 --- a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs +++ b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs @@ -243,7 +243,7 @@ namespace MatterHackers.MatterControl.Tests.Automation .AddAndSelectPrinter("Airwolf 3D", "HD") // Navigate to Local Library .SwitchToPrinterSettings() - .ClickByName("Features Tab"); + .ClickByName("Features SliceSettingsTab"); var printer = testRunner.FirstPrinter(); @@ -262,7 +262,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { using (var emulator = testRunner.LaunchAndConnectToPrinterEmulator()) { - testRunner.ClickByName("Features Tab"); + testRunner.ClickByName("Features SliceSettingsTab"); // only 1 hotend and 1 extruder Assert.IsTrue(testRunner.NameExists("Hotend 0")); @@ -399,7 +399,7 @@ namespace MatterHackers.MatterControl.Tests.Automation Assert.AreEqual(0, (int)emulator.CurrentExtruder.TargetTemperature); // Switch back to the general tab - testRunner.ClickByName("General Tab") + testRunner.ClickByName("General SliceSettingsTab") .SelectSliceSettingsField(SettingsKey.extruder_count) .Type("2") .Type("{Enter}"); diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 080e3b553..3cce49fca 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -1326,7 +1326,7 @@ namespace MatterHackers.MatterControl.Tests.Automation var category = group.Category; // Click tab - testRunner.ClickByName(category.Name + " Tab"); + testRunner.ClickByName(category.Name + " SliceSettingsTab"); // Open the subGroup if required var foundWidget = testRunner.GetWidgetByName(group.Name + " Panel", out _, .1);