From f342460a8485e141e02f503c3512e448d646c6d6 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Sun, 4 Jun 2017 08:57:17 -0700 Subject: [PATCH] Revise RaftEnabledPassedToSliceEngine test --- .../SliceSettingsTests.cs | 33 ++++--------------- .../MatterControl/MatterControlUtilities.cs | 5 +++ 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs index b72948c97..0913ff1b5 100644 --- a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs +++ b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs @@ -23,36 +23,17 @@ namespace MatterHackers.MatterControl.Tests.Automation { MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); - // Navigate to Local Library - testRunner.ClickByName("Library Tab"); - testRunner.NavigateToFolder("Local Library Row Item Collection"); - testRunner.Delay(1); + testRunner.AddTestAssetsToLibrary("Rook.amf"); - testRunner.ClickByName("Row Item Calibration - Box"); - testRunner.Delay(.2); - - // Add the Calibration box to the queue and selects it - testRunner.ClickByName("Row Item Calibration - Box Print Button"); - testRunner.Delay(1); - - testRunner.ClickByName("Layer View Tab"); - testRunner.Delay(.2); - - testRunner.ClickByName("Bread Crumb Button Home", 1); - testRunner.Delay(.2); + testRunner.ClickByName("Row Item Rook"); + testRunner.AddSelectedItemToBedplate(); testRunner.SwitchToAdvancedSliceSettings(); - testRunner.Delay(.2); - - testRunner.ClickByName("Raft / Priming Tab", 1); - testRunner.Delay(.2); - - testRunner.ClickByName("Create Raft Checkbox", 1); - testRunner.Delay(1.5); - - testRunner.ClickByName("Generate Gcode Button", 1); - testRunner.Delay(2); + testRunner.ClickByName("Raft / Priming Tab"); + testRunner.ClickByName("Create Raft Checkbox"); + testRunner.ClickByName("Toggle Layer View Button"); + testRunner.ClickByName("Generate Gcode Button"); testRunner.Delay(() => MatterControlUtilities.CompareExpectedSliceSettingValueWithActualVaue("enableRaft", "True"), 10); // Call compare slice settings method here diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 1d4217cff..9b768c9e0 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -377,6 +377,11 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.NavigateToFolder(containerName); testRunner.ClickByName(partName); + testRunner.AddSelectedItemToBedplate(); + } + + public static void AddSelectedItemToBedplate(this AutomationRunner testRunner) + { testRunner.ClickByName("Print Library Overflow Menu"); testRunner.ClickByName("Add to Plate Menu Item");