flush dispatcher after node manipulation fixture (#15769)

mjkkirschner · web-flow · commit 7a293ed3c7ad · 2025-01-27T21:30:02.000-05:00
diff --git a/test/DynamoCoreWpfTests/DynamoTestUIBase.cs b/test/DynamoCoreWpfTests/DynamoTestUIBase.cs
@@ -90,10 +90,8 @@ public virtual void Start()
 
             SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext());
 
-            if (!SkipDispatcherFlush)
-            {
-                Dispatcher.CurrentDispatcher.Hooks.OperationPosted += Hooks_OperationPosted;
-            }
+            Dispatcher.CurrentDispatcher.Hooks.OperationPosted += Hooks_OperationPosted;
+            
         }
 
         protected static void RaiseLoadedEvent(FrameworkElement element)
@@ -132,10 +130,10 @@ protected virtual DynamoModel.IStartConfiguration CreateStartConfiguration(IPath
         [TearDown]
         public void Exit()
         {
+          
+            Dispatcher.CurrentDispatcher.Hooks.OperationPosted -= Hooks_OperationPosted;
             if (!SkipDispatcherFlush)
             {
-                Dispatcher.CurrentDispatcher.Hooks.OperationPosted -= Hooks_OperationPosted;
-
                 DispatcherUtil.DoEventsLoop(() => DispatcherOpsCounter == 0);
             }
 
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/NodeManipulatorExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/NodeManipulatorExtensionTests.cs
@@ -2,6 +2,7 @@
 using Dynamo.Graph.Nodes.ZeroTouch;
 using Dynamo.Manipulation;
 using Dynamo.Models;
+using DynamoCoreWpfTests.Utility;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
@@ -28,14 +29,20 @@ protected override IEnumerable<IGizmo> GetGizmos(bool createOrUpdate)
     public class NodeManipulatorExtensionTests : DynamoTestUIBase
     {
         [SetUp]
-        public virtual void Start()
+        public override void Start()
         {
             // Forcing the dispatcher to execute all of its tasks within these tests causes crashes in Helix.
             // For now just skip it.
             SkipDispatcherFlush = true;
             base.Start();
         }
 
+        [OneTimeTearDown]
+        public void TearDown()
+        {
+            DispatcherUtil.DoEventsLoop(() => DispatcherOpsCounter == 0);
+        }
+
         protected override void GetLibrariesToPreload(List<string> libraries)
         {
             libraries.Add("ProtoGeometry.dll");

Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,8 @@ public virtual void Start()`
`90`	`90`
`91`	`91`	`SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext());`
`92`	`92`
`93`		`- if (!SkipDispatcherFlush)`
`94`		`- {`
`95`		`- Dispatcher.CurrentDispatcher.Hooks.OperationPosted += Hooks_OperationPosted;`
`96`		`- }`
	`93`	`+ Dispatcher.CurrentDispatcher.Hooks.OperationPosted += Hooks_OperationPosted;`
	`94`	`+`
`97`	`95`	`}`
`98`	`96`
`99`	`97`	`protected static void RaiseLoadedEvent(FrameworkElement element)`
`@@ -132,10 +130,10 @@ protected virtual DynamoModel.IStartConfiguration CreateStartConfiguration(IPath`
`132`	`130`	`[TearDown]`
`133`	`131`	`public void Exit()`
`134`	`132`	`{`
	`133`	`+`
	`134`	`+ Dispatcher.CurrentDispatcher.Hooks.OperationPosted -= Hooks_OperationPosted;`
`135`	`135`	`if (!SkipDispatcherFlush)`
`136`	`136`	`{`
`137`		`- Dispatcher.CurrentDispatcher.Hooks.OperationPosted -= Hooks_OperationPosted;`
`138`		`-`
`139`	`137`	`DispatcherUtil.DoEventsLoop(() => DispatcherOpsCounter == 0);`
`140`	`138`	`}`
`141`	`139`