From 28ffed09082462a7fc1413a2844866723e2a12df Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 5 Apr 2018 16:16:43 -0700 Subject: [PATCH] Fixing tests related to leveling --- StaticData/SliceSettings/Properties.json | 16 ++++++++-------- Submodules/agg-sharp | 2 +- .../HardwareLevelingUITests.cs | 5 ++++- .../MatterControl/MatterControlUtilities.cs | 7 +++++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 43bd94bea..bdbc4efdc 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -78,14 +78,6 @@ "ShowIfSet": "!sla_printer", "DefaultValue": "100%" }, - { - "SlicerConfigName": "clean_nozzle_image", - "PresentationName": "Clean Nozzle Image", - "HelpText": "The image to show when explaining leveling and calibration.", - "DataEditType": "WIDE_STRING", - "ShowIfSet": "!sla_printer", - "DefaultValue": "clean_nozzle.png" - }, { "SlicerConfigName": "trim_image", "PresentationName": "Trim Image", @@ -777,6 +769,14 @@ "DefaultValue": "3 Point Plane", "RebuildGCodeOnChange": false }, + { + "SlicerConfigName": "clean_nozzle_image", + "PresentationName": "Clean Nozzle Image", + "HelpText": "The image to show when explaining leveling and calibration.", + "DataEditType": "WIDE_STRING", + "ShowIfSet": "!has_hardware_leveling", + "DefaultValue": "clean_nozzle.png" + }, { "SlicerConfigName": "print_leveling_required_to_print", "PresentationName": "Require Leveling To Print", diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 285336bfd..ebb914d6b 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 285336bfd56a2d3fd6d8d05d4547177e752b5c98 +Subproject commit ebb914d6bdc045cbb3f5a09ddc0c714d995c85e1 diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs index 0661681f0..a2af2cc4f 100644 --- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs +++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs @@ -21,7 +21,8 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.SwitchToPrinterSettings(); testRunner.ClickByName("Features Tab"); - testRunner.NavigateToSliceSettingsField("Printer", SettingsKey.sla_printer); + testRunner.ClickByName("Slice Settings Overflow Menu"); + testRunner.ClickByName("Expand All Menu Item"); Assert.IsFalse(testRunner.WaitForName("print_leveling_solution Row", .5), "Print leveling should not exist for an Airwolf HD"); // Add printer that does not have hardware leveling @@ -29,6 +30,8 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.SwitchToPrinterSettings(); testRunner.ClickByName("Features Tab"); + testRunner.ClickByName("Slice Settings Overflow Menu"); + testRunner.ClickByName("Expand All Menu Item"); Assert.IsTrue(testRunner.WaitForName("print_leveling_solution Row"), "Print leveling should exist for a 3D Factory MendelMax"); return Task.CompletedTask; diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 09c30c14e..e322c78b2 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -763,8 +763,11 @@ namespace MatterHackers.MatterControl.Tests.Automation { testRunner.SwitchToSliceSettings(); - testRunner.ClickByName("Printer Overflow Menu"); - testRunner.ClickByName("Configure Printer Menu Item"); + if (!testRunner.NameExists("Printer Tab")) + { + testRunner.ClickByName("Printer Overflow Menu"); + testRunner.ClickByName("Configure Printer Menu Item"); + } testRunner.ClickByName("Printer Tab"); }