nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove fixed wait values, wait for known conditions

Browse source 
- Add WaitForReload function
- Remove invalid WaitFor("Connection Wizard...") -2 seconds per call
- Remove fixed 2 second wait, waitfor known condition
This commit is contained in:
John Lewin 2016-11-05 10:56:52 -07:00
parent 28509792bc
commit 38b07d1799
1 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -33,6 +33,7 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
@ -54,6 +55,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
private static bool saveImagesForDebug = true;
private static event EventHandler unregisterEvents;
private static int testID = 0;
private static string runName = DateTime.Now.ToString("yyyy-MM-ddTHH-mm-ss");
@ -88,8 +91,27 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Sign Out Menu Item", 2);
testRunner.Wait(.5);
testRunner.ClickByName("Yes Button");
testRunner.Wait(5);
// Rather than waiting a fixed amount of time, we wait for the ReloadAll to complete before returning
testRunner.WaitForReloadAll(() => testRunner.ClickByName("Yes Button"));
}
public static void WaitForReloadAll(this AutomationRunner testRunner, Action reloadAllAction)
{
// Wire up a block and release mechanism to wait until the sign in process has completed
AutoResetEvent resetEvent = new AutoResetEvent(false);
ApplicationController.Instance.DoneReloadingAll.RegisterEvent((s, e) => resetEvent.Set(), ref unregisterEvents);
// Start the procedure that begins a ReloadAll event in MatterControl
reloadAllAction();
// Wait until DoneReloadingAll completes
resetEvent.WaitOne();
// Remove our DoneReloadingAll listener
unregisterEvents(null, null);
// Wait for any post DoneReloadingAll code to finish up and return
testRunner.Wait(.2);
}
public static string PathToExportGcodeFolder
@ -218,8 +240,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Add New Printer... Menu Item", 2);
testRunner.Wait(.2);
/* This prompt is no longer shown and causes a 2 second delay. Remove this block once confirmed
testRunner.ClickByName("Connection Wizard Skip Sign In Button", 2);
testRunner.Wait(.2);
testRunner.Wait(.2); */
testRunner.ClickByName("Select Make", 2);
testRunner.Wait(.2);
@ -234,8 +257,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Wait(.2);
testRunner.ClickByName("Save & Continue Button", 2);
testRunner.Wait(2);
testRunner.WaitForName("Cancel Wizard Button", 3);
testRunner.ClickByName("Cancel Wizard Button", 2);
testRunner.Wait(1);
}