From 2b0614bbefe0a618ef2c3785e1d3f9913effac80 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Fri, 3 Jul 2020 16:32:44 -0700 Subject: [PATCH] fixing tests --- .../Providers/MatterControl/SqliteLibraryContainer.cs | 3 ++- MatterControlLib/Library/Providers/WritableContainer.cs | 2 +- Submodules/agg-sharp | 2 +- Tests/MatterControl.AutomationTests/LibraryActionTests.cs | 1 + .../MatterControl/MatterControlUtilities.cs | 5 +++++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/MatterControlLib/Library/Providers/MatterControl/SqliteLibraryContainer.cs b/MatterControlLib/Library/Providers/MatterControl/SqliteLibraryContainer.cs index d6ff8e7a1..d40619df5 100644 --- a/MatterControlLib/Library/Providers/MatterControl/SqliteLibraryContainer.cs +++ b/MatterControlLib/Library/Providers/MatterControl/SqliteLibraryContainer.cs @@ -32,6 +32,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; +using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.DataStorage; using MatterHackers.MatterControl.PrintQueue; @@ -144,7 +145,7 @@ namespace MatterHackers.MatterControl.Library } } - this.ReloadContent(); + UiThread.RunOnIdle(this.ReloadContent); }); } diff --git a/MatterControlLib/Library/Providers/WritableContainer.cs b/MatterControlLib/Library/Providers/WritableContainer.cs index 1e25b9825..4d9b31cb6 100644 --- a/MatterControlLib/Library/Providers/WritableContainer.cs +++ b/MatterControlLib/Library/Providers/WritableContainer.cs @@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.Library public virtual void Move(IEnumerable items, ILibraryWritableContainer sourceContainer) { - foreach(var item in items.OfType().ToList()) + foreach( var item in items.OfType().ToList()) { var enumerable = new[] { item }; diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index b1710fc08..35d558c01 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit b1710fc08dbd485a24f94536df3b19718d20b697 +Subproject commit 35d558c017c97b7740dbc45e47bcd77aee6f3246 diff --git a/Tests/MatterControl.AutomationTests/LibraryActionTests.cs b/Tests/MatterControl.AutomationTests/LibraryActionTests.cs index 24aaf1d26..1c486624d 100644 --- a/Tests/MatterControl.AutomationTests/LibraryActionTests.cs +++ b/Tests/MatterControl.AutomationTests/LibraryActionTests.cs @@ -51,6 +51,7 @@ namespace MatterHackers.MatterControl.Tests.Automation bool exportWindowExists1 = testRunner.WaitForName("Export Item Window", 0); Assert.IsTrue(exportWindowExists1 == false, "Export window does not exist"); + testRunner.NavigateToFolder("Print Queue Row Item Collection"); testRunner.ClickByName("Queue Export Button"); SystemWindow containingWindow; GuiWidget exportWindow = testRunner.GetWidgetByName("Export Item Window", out containingWindow, 5); diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 41e4e3bea..1ec541845 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -352,6 +352,11 @@ namespace MatterHackers.MatterControl.Tests.Automation // close the welcome message testRunner.EnsureWelcomePageClosed(); + testRunner.Delay(); + if (testRunner.NamedWidgetExists("Cancel Wizard Button")) + { + testRunner.ClickByName("Cancel Wizard Button"); + } // Click 'Add Printer' if not on screen if (!testRunner.NameExists("AddPrinterWidget", 0.2))