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

Only block if needed

Browse source
This commit is contained in:
John Lewin 2017-12-08 11:32:05 -08:00
parent 3a4973bea5
commit 61d40b00e5
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -391,26 +391,30 @@ namespace MatterHackers.MatterControl.Tests.Automation
public static void EnsureFoldersVisible(this AutomationRunner testRunner)
{
var listView = testRunner.GetWidgetByName("LibraryView", out _) as ListView;
var resetEvent = new AutoResetEvent(false);
EventHandler contentReloaded = (s, e) =>
{
resetEvent.Set();
};
listView.ContentReloaded += contentReloaded;
var checkBox = (ExpandCheckboxButton)testRunner.GetWidgetByName("Show Folders Toggle", out _);
if (!checkBox.Checked)
{
var resetEvent = new AutoResetEvent(false);
// Wire up event listener
var listView = testRunner.GetWidgetByName("LibraryView", out _) as ListView;
EventHandler contentReloaded = (s, e) =>
{
resetEvent.Set();
};
listView.ContentReloaded += contentReloaded;
// Start reload
testRunner.ClickByName("Show Folders Toggle");
// Wait for reload
resetEvent.WaitOne();
// Release event listener
listView.ContentReloaded -= contentReloaded;
}
// Wait for reload
resetEvent.WaitOne();
listView.ContentReloaded -= contentReloaded;
}
public static void NavigateToLibraryHome(this AutomationRunner testRunner)
@ -556,6 +560,13 @@ namespace MatterHackers.MatterControl.Tests.Automation
//GL.HardwareAvailable = false;
MatterControlApplication matterControlWindow = MatterControlApplication.CreateInstance(overrideWidth, overrideHeight);
EventHandler<ClosedEventArgs> unexpectedClose = (s, e) =>
{
throw new Exception("MatterControl closed unexpectedly");
};
matterControlWindow.Closed += unexpectedClose;
var config = TestAutomationConfig.Load();
if (config.UseAutomationDialogs)
@ -575,6 +586,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
config.UseAutomationMouse ? AutomationRunner.InputType.SimulatedDrawMouse : AutomationRunner.InputType.Native,
closeWindow: () =>
{
matterControlWindow.Closed -= unexpectedClose;
if (ApplicationController.Instance.ActivePrinter.Connection.CommunicationState == CommunicationStates.Printing)
{
ApplicationController.Instance.ActivePrinter.Connection.Disable();