From ec42206b248ff41364a5861cc4b6ebef3505178b Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sun, 21 Aug 2022 18:04:06 -0700 Subject: [PATCH 1/2] =?UTF-8?q?=EF=BB=BFmaking=20more=20tests=20pass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- .../MatterControl/MatterControlUtilities.cs | 16 +++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 54748bc6d..d58665f5c 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 54748bc6d030bb65593e17b76d320884a7747eb2 +Subproject commit d58665f5c5a25ed2fae2a9418c6c56fe70a59fe8 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 3be867c69..f52f803dc 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 3be867c69f3fedc3dbee0874466743e75bc2062d +Subproject commit f52f803dc37a2eb3fe4ebe1b2507418d5d2db4ba diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 661ea5a25..ae584d098 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -329,14 +329,14 @@ namespace MatterHackers.MatterControl.Tests.Automation { SystemWindow systemWindow; testRunner.GetWidgetByName("Hardware Tab", out systemWindow, 10); - testRunner.WaitforDraw(systemWindow) + testRunner.WaitFor(() => testRunner.NameExists("Start New Design"), 5) // close the welcome message .ClickByName("Start New Design") - .Delay(.5) + .Delay(1.5) // and close the product tour offer .ClickByName("Cancel Wizard Button"); - //testRunner.Delay(1); + testRunner.Delay(1); // If testing is to be reliable, that dialog really shouldn't be showing now. // NOTE: This may fail rarely still. Happened once with OrthographicZoomToSelectionWide. Assert.IsFalse(testRunner.NamedWidgetExists("Cancel Wizard Button")); @@ -822,8 +822,14 @@ namespace MatterHackers.MatterControl.Tests.Automation public static AutomationRunner NavigateToLibraryHome(this AutomationRunner testRunner) { - return testRunner.EnsureContentMenuOpen() - .ClickByName("Bread Crumb Button Home") + testRunner.EnsureContentMenuOpen(); + while (!testRunner.NameExists("Bread Crumb Button Home", .2)) + { + testRunner.ClickByName("Library Up Button") + .Delay(); + } + + return testRunner.ClickByName("Bread Crumb Button Home") .Delay(.5); } From 6289ae63a4b41d4eabb8247367f729620ba48e93 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 23 Aug 2022 17:57:33 -0700 Subject: [PATCH 2/2] =?UTF-8?q?=EF=BB=BFplaying=20with=20adding=20openTK?= =?UTF-8?q?=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Launcher/Launcher.csproj | 2 +- MatterControl.Winforms/MatterControl.Winforms.csproj | 2 +- MatterControl.csproj | 7 +++---- MatterControlLib/MatterControlLib.csproj | 6 +++--- PrinterDriverInstaller/InfInstaller.csproj | 2 +- .../MatterControl.AutomationTests.csproj | 4 ++-- Tests/MatterControl.Tests/MatterControl.Tests.csproj | 4 ++-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj index f427c4485..e5152ddfc 100644 --- a/Launcher/Launcher.csproj +++ b/Launcher/Launcher.csproj @@ -8,7 +8,7 @@ True - + all diff --git a/MatterControl.Winforms/MatterControl.Winforms.csproj b/MatterControl.Winforms/MatterControl.Winforms.csproj index 5826623fd..aa40578a6 100644 --- a/MatterControl.Winforms/MatterControl.Winforms.csproj +++ b/MatterControl.Winforms/MatterControl.Winforms.csproj @@ -28,7 +28,7 @@ - + all diff --git a/MatterControl.csproj b/MatterControl.csproj index 87ab59970..10bdd363e 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -72,7 +72,6 @@ - @@ -93,17 +92,17 @@ - 27.2.1 + 28.0.1 - + 1.0.2-beta1 - + all diff --git a/MatterControlLib/MatterControlLib.csproj b/MatterControlLib/MatterControlLib.csproj index 70ab59732..eecd364f3 100644 --- a/MatterControlLib/MatterControlLib.csproj +++ b/MatterControlLib/MatterControlLib.csproj @@ -90,12 +90,12 @@ - + - - + + diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj index ea786e9f7..fbe5dcf5c 100644 --- a/PrinterDriverInstaller/InfInstaller.csproj +++ b/PrinterDriverInstaller/InfInstaller.csproj @@ -8,7 +8,7 @@ - + all diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj index 7eebd7754..33225255d 100644 --- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj +++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj @@ -14,11 +14,11 @@ $(AssemblyName) - + - + all diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj index 4011d3964..ce82feb3e 100644 --- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj +++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj @@ -39,11 +39,11 @@ - + - + all