From 85b6dc1ac3fcc9b0cc740e0740dfca7731fed836 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Sat, 3 Jun 2017 19:33:53 -0700 Subject: [PATCH] Revise SwitchingMaterialsCausesSettingsChangedEvents test --- .../SliceSettingsTests.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs index 150acbdad..af0d4033c 100644 --- a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs +++ b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs @@ -202,13 +202,14 @@ namespace MatterHackers.MatterControl.Tests.Automation [Test /* Test will fail if screen size is and "HeatBeforeHoming" falls below the fold */] public async Task SwitchingMaterialsCausesSettingsChangedEvents() { - AutomationTest testToRun = (testRunner) => + await MatterControlUtilities.RunTest((testRunner) => { EventHandler unregisterEvents = null; int layerHeightChangedCount = 0; + ActiveSliceSettings.SettingChanged.RegisterEvent((s, e) => { - StringEventArgs stringEvent = e as StringEventArgs; + var stringEvent = e as StringEventArgs; if (stringEvent != null) { if (stringEvent.Data == SettingsKey.layer_height) @@ -218,8 +219,6 @@ namespace MatterHackers.MatterControl.Tests.Automation } }, ref unregisterEvents); - testRunner.CloseSignInAndPrinterSelect(); - MatterControlUtilities.AddAndSelectPrinter(testRunner, "Airwolf 3D", "HD"); //Navigate to Local Library @@ -237,9 +236,7 @@ namespace MatterHackers.MatterControl.Tests.Automation Assert.AreEqual(2, layerHeightChangedCount, "Changed to standard."); return Task.FromResult(0); - }; - - await MatterControlUtilities.RunTest(testToRun, overrideWidth: 1224, overrideHeight: 900); + }, overrideWidth: 1224, overrideHeight: 900); } [Test]