DynamoDS
diff --git a/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/DynamoCore/Scheduler/AsyncTaskExtensions.cs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎src/DynamoCore/Scheduler/AsyncTaskExtensions.cs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎src/DynamoUtilities/DynamoFeatureFlagsManager.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoUtilities/DynamoFeatureFlagsManager.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎test/DynamoCoreTests/UnitsOfMeasureTests.cs
Copy file name to clipboard
+1-6Lines changed: 1 addition & 6 deletions b/‎test/DynamoCoreTests/UnitsOfMeasureTests.cs
Copy file name to clipboard
+1-6Lines changed: 1 addition & 6 deletions
diff --git a/‎test/DynamoCoreWpfTests/DynamoTestUIBase.cs
Copy file name to clipboard
+26-1Lines changed: 26 additions & 1 deletion b/‎test/DynamoCoreWpfTests/DynamoTestUIBase.cs
Copy file name to clipboard
+26-1Lines changed: 26 additions & 1 deletion
diff --git a/‎test/DynamoCoreWpfTests/DynamoViewModelUnitTest.cs
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎test/DynamoCoreWpfTests/DynamoViewModelUnitTest.cs
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎test/DynamoCoreWpfTests/PreviewBubbleTests.cs
Copy file name to clipboard
+9-17Lines changed: 9 additions & 17 deletions b/‎test/DynamoCoreWpfTests/PreviewBubbleTests.cs
Copy file name to clipboard
+9-17Lines changed: 9 additions & 17 deletions
@@ -723,7 +723,7 @@ protected DynamoModel(IStartConfiguration config)
                 //run process startup/reading on another thread so we don't block dynamo startup.
                 //if we end up needing to control aspects of dynamo model or view startup that we can't make
                 //event based/async then just run this on main thread - ie get rid of the Task.Run()
-                var mainThreadSyncContext = new SynchronizationContext();
+                var mainThreadSyncContext = SynchronizationContext.Current ?? new SynchronizationContext();
                 Task.Run(() =>
                 {
                     try
 
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -27,7 +27,7 @@ public static IDisposable Then(this AsyncTask task, AsyncTaskCompletedHandler ac
         /// <returns>An IDisposable representing the event subscription</returns>
         public static IDisposable ThenPost(this AsyncTask task, AsyncTaskCompletedHandler action, SynchronizationContext context = null)
         {
-            if (context == null) context = new SynchronizationContext(); // uses the default
+            if (context == null) context = SynchronizationContext.Current ?? new SynchronizationContext(); // uses the current or a default
             return task.Then((t) => context.Post((_) => action(task), null));
         }
 
@@ -38,7 +38,7 @@ public static IDisposable ThenPost(this AsyncTask task, AsyncTaskCompletedHandle
         /// <returns>An IDisposable representing the event subscription</returns>
         public static IDisposable ThenSend(this AsyncTask task, AsyncTaskCompletedHandler action, SynchronizationContext context = null)
         {
-            if (context == null) context = new SynchronizationContext(); // uses the default
+            if (context == null) context = SynchronizationContext.Current ?? new SynchronizationContext(); // uses the current or a default
             return task.Then((t) => context.Send((_) => action(task), null));
         }
 
 
@@ -1115,7 +1115,9 @@ private void UnsubscribeDispatcherEvents()
         }
         #endregion
 
-        private void InitializeAutomationSettings(string commandFilePath)
+        // InitializeAutomationSettings initializes the Dynamo automationSettings object.
+        // This method is meant to be accessed only within this class and within tests.
+        internal void InitializeAutomationSettings(string commandFilePath)
         {
             if (String.IsNullOrEmpty(commandFilePath) || !File.Exists(commandFilePath))
                 commandFilePath = null;
 
@@ -69,7 +69,7 @@ internal void CacheAllFlags()
             try
             {
                 AllFlagsCache = JsonConvert.DeserializeObject<Dictionary<string, object>>(dataFromCLI);
-                //invoke the flags retrieved event on the sync context which should be the main ui thread.
+                // Invoke the flags retrieved event on the sync context which should be the main ui thread (if in Dynamo with UI) or the default SyncContext (if in headless mode).
                 syncContext?.Send((_) =>
                 {
                     FlagsRetrieved?.Invoke();
 
@@ -11,6 +11,7 @@ internal class UnitsOfMeasureTests : UnitTestBase
         [SetUp]
         public override void Setup()
         {
+            base.Setup();
             Display.PrecisionFormat = "f4";
         }
 
@@ -758,12 +759,6 @@ public void CanMapOverUnits()
     }
     internal class ForgeUnitsTests : UnitTestBase
     {
-        [SetUp]
-        public override void Setup()
-        {
-
-        }
-
         const string milimeters = "autodesk.unit.unit:millimeters";
         const string meters = "autodesk.unit.unit:meters";
 
 
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
 using Dynamo.Configuration;
@@ -15,7 +16,6 @@
 using Dynamo.Nodes;
 using Dynamo.Scheduler;
 using Dynamo.ViewModels;
-using Dynamo.Wpf.Utilities;
 using DynamoCoreWpfTests.Utility;
 using DynamoShapeManager;
 using DynamoUtilities;
@@ -32,6 +32,11 @@ public class DynamoTestUIBase
         protected DynamoView View { get; set; }
         protected DynamoModel Model { get; set; }
 
+        // Use this flag to skip trying to execute all the dispatched operations during the test lifetime.
+        // This flag should only be used very sparingly
+        protected bool SkipDispatcherFlush = false;
+        protected int DispatcherOpsCounter = 0;
+
         protected string ExecutingDirectory
         {
             get { return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); }
@@ -84,6 +89,11 @@ public virtual void Start()
             View.Show();
 
             SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext());
+
+            if (!SkipDispatcherFlush)
+            {
+                Dispatcher.CurrentDispatcher.Hooks.OperationPosted += Hooks_OperationPosted;
+            }
         }
 
         protected static void RaiseLoadedEvent(FrameworkElement element)
@@ -96,6 +106,14 @@ protected static void RaiseLoadedEvent(FrameworkElement element)
             eventMethod.Invoke(element, new object[] { args });
         }
 
+        private void Hooks_OperationPosted(object sender, DispatcherHookEventArgs e)
+        {
+            e.Operation.Task.ContinueWith((t) => {
+                Interlocked.Decrement(ref DispatcherOpsCounter);
+            }, TaskScheduler.Default);
+            Interlocked.Increment(ref DispatcherOpsCounter);
+        }
+
         /// <summary>
         /// Derived test classes can override this method to provide different configurations.
         /// </summary>
@@ -114,6 +132,13 @@ protected virtual DynamoModel.IStartConfiguration CreateStartConfiguration(IPath
         [TearDown]
         public void Exit()
         {
+            if (!SkipDispatcherFlush)
+            {
+                Dispatcher.CurrentDispatcher.Hooks.OperationPosted -= Hooks_OperationPosted;
+
+                DispatcherUtil.DoEventsLoop(() => DispatcherOpsCounter == 0);
+            }
+
             //Ensure that we leave the workspace marked as
             //not having changes.
             ViewModel.HomeSpace.HasUnsavedChanges = false;
 
@@ -30,6 +30,7 @@ public class DynamoViewModelUnitTest : DSEvaluationUnitTestBase
     {
         protected DynamoViewModel ViewModel;
         protected Preloader preloader;
+        protected string CommandFilePath;
 
         protected override DynamoModel GetModel()
         {
@@ -131,6 +132,7 @@ protected void StartDynamo()
                 new DynamoViewModel.StartConfiguration()
                 {
                     DynamoModel = model,
+                    CommandFilePath = CommandFilePath,
                     Watch3DViewModel = new DefaultWatch3DViewModel(null, watch3DViewParams)
                 });
 
 
@@ -102,12 +102,9 @@ public void PreviewBubble_ListMargin()
             nodeView.PreviewControl.RaiseEvent(new RoutedEventArgs(FrameworkElement.LoadedEvent));
 
             // Fire transition on dynamo main ui thread.
-            View.Dispatcher.Invoke(() =>
-            {
-                nodeView.PreviewControl.BindToDataSource();
-                nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Condensed);
-                nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Expanded);
-            });
+            nodeView.PreviewControl.BindToDataSource();
+            nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Condensed);
+            nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Expanded);
 
             DispatcherUtil.DoEvents();
             var watchTree = nodeView.PreviewControl.ChildOfType<WatchTree>();
@@ -124,12 +121,9 @@ public void PreviewBubble_NumberMargin()
             nodeView.PreviewControl.RaiseEvent(new RoutedEventArgs(FrameworkElement.LoadedEvent));
 
             // Fire transition on dynamo main ui thread.
-            View.Dispatcher.Invoke(() =>
-            {
-                nodeView.PreviewControl.BindToDataSource();
-                nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Condensed);
-                nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Expanded);
-            });
+            nodeView.PreviewControl.BindToDataSource();
+            nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Condensed);
+            nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Expanded);
 
             DispatcherUtil.DoEvents();
             var watchTree = nodeView.PreviewControl.ChildOfType<WatchTree>();
@@ -145,11 +139,9 @@ public void PreviewBubble_CloseWhenFocusInCodeBlock()
             var nodeView = NodeViewWithGuid("1382aaf9-9432-4cf0-86ae-c586d311767e");
             nodeView.PreviewControl.RaiseEvent(new RoutedEventArgs(FrameworkElement.LoadedEvent));
 
-            View.Dispatcher.Invoke(() =>
-            {
-                nodeView.PreviewControl.BindToDataSource();
-                nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Condensed);
-            });
+            nodeView.PreviewControl.BindToDataSource();
+            nodeView.PreviewControl.TransitionToState(Dynamo.UI.Controls.PreviewControl.State.Condensed);
+
             DispatcherUtil.DoEvents();
             nodeView.ChildOfType<ICSharpCode.AvalonEdit.Editing.TextArea>().Focus();
Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,7 @@ protected DynamoModel(IStartConfiguration config)`
`723`	`723`	`//run process startup/reading on another thread so we don't block dynamo startup.`
`724`	`724`	`//if we end up needing to control aspects of dynamo model or view startup that we can't make`
`725`	`725`	`//event based/async then just run this on main thread - ie get rid of the Task.Run()`
`726`		`- var mainThreadSyncContext = new SynchronizationContext();`
	`726`	`+ var mainThreadSyncContext = SynchronizationContext.Current ?? new SynchronizationContext();`
`727`	`727`	`Task.Run(() =>`
`728`	`728`	`{`
`729`	`729`	`try`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Threading;`
`@@ -27,7 +27,7 @@ public static IDisposable Then(this AsyncTask task, AsyncTaskCompletedHandler ac`
`27`	`27`	`/// <returns>An IDisposable representing the event subscription</returns>`
`28`	`28`	`public static IDisposable ThenPost(this AsyncTask task, AsyncTaskCompletedHandler action, SynchronizationContext context = null)`
`29`	`29`	`{`
`30`		`- if (context == null) context = new SynchronizationContext(); // uses the default`
	`30`	`+ if (context == null) context = SynchronizationContext.Current ?? new SynchronizationContext(); // uses the current or a default`
`31`	`31`	`return task.Then((t) => context.Post((_) => action(task), null));`
`32`	`32`	`}`
`33`	`33`
`@@ -38,7 +38,7 @@ public static IDisposable ThenPost(this AsyncTask task, AsyncTaskCompletedHandle`
`38`	`38`	`/// <returns>An IDisposable representing the event subscription</returns>`
`39`	`39`	`public static IDisposable ThenSend(this AsyncTask task, AsyncTaskCompletedHandler action, SynchronizationContext context = null)`
`40`	`40`	`{`
`41`		`- if (context == null) context = new SynchronizationContext(); // uses the default`
	`41`	`+ if (context == null) context = SynchronizationContext.Current ?? new SynchronizationContext(); // uses the current or a default`
`42`	`42`	`return task.Then((t) => context.Send((_) => action(task), null));`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -1115,7 +1115,9 @@ private void UnsubscribeDispatcherEvents()`
`1115`	`1115`	`}`
`1116`	`1116`	`#endregion`
`1117`	`1117`
`1118`		`- private void InitializeAutomationSettings(string commandFilePath)`
	`1118`	`+ // InitializeAutomationSettings initializes the Dynamo automationSettings object.`
	`1119`	`+ // This method is meant to be accessed only within this class and within tests.`
	`1120`	`+ internal void InitializeAutomationSettings(string commandFilePath)`
`1119`	`1121`	`{`
`1120`	`1122`	`if (String.IsNullOrEmpty(commandFilePath) \|\| !File.Exists(commandFilePath))`
`1121`	`1123`	`commandFilePath = null;`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ internal void CacheAllFlags()`
`69`	`69`	`try`
`70`	`70`	`{`
`71`	`71`	`AllFlagsCache = JsonConvert.DeserializeObject<Dictionary<string, object>>(dataFromCLI);`
`72`		`- //invoke the flags retrieved event on the sync context which should be the main ui thread.`
	`72`	`+ // Invoke the flags retrieved event on the sync context which should be the main ui thread (if in Dynamo with UI) or the default SyncContext (if in headless mode).`
`73`	`73`	`syncContext?.Send((_) =>`
`74`	`74`	`{`
`75`	`75`	`FlagsRetrieved?.Invoke();`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ internal class UnitsOfMeasureTests : UnitTestBase`
`11`	`11`	`[SetUp]`
`12`	`12`	`public override void Setup()`
`13`	`13`	`{`
	`14`	`+ base.Setup();`
`14`	`15`	`Display.PrecisionFormat = "f4";`
`15`	`16`	`}`
`16`	`17`
`@@ -758,12 +759,6 @@ public void CanMapOverUnits()`
`758`	`759`	`}`
`759`	`760`	`internal class ForgeUnitsTests : UnitTestBase`
`760`	`761`	`{`
`761`		`- [SetUp]`
`762`		`- public override void Setup()`
`763`		`- {`
`764`		`-`
`765`		`- }`
`766`		`-`
`767`	`762`	`const string milimeters = "autodesk.unit.unit:millimeters";`
`768`	`763`	`const string meters = "autodesk.unit.unit:meters";`
`769`	`764`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public class DynamoViewModelUnitTest : DSEvaluationUnitTestBase`
`30`	`30`	`{`
`31`	`31`	`protected DynamoViewModel ViewModel;`
`32`	`32`	`protected Preloader preloader;`
	`33`	`+ protected string CommandFilePath;`
`33`	`34`
`34`	`35`	`protected override DynamoModel GetModel()`
`35`	`36`	`{`
`@@ -131,6 +132,7 @@ protected void StartDynamo()`
`131`	`132`	`new DynamoViewModel.StartConfiguration()`
`132`	`133`	`{`
`133`	`134`	`DynamoModel = model,`
	`135`	`+ CommandFilePath = CommandFilePath,`
`134`	`136`	`Watch3DViewModel = new DefaultWatch3DViewModel(null, watch3DViewParams)`
`135`	`137`	`});`
`136`	`138`