Merge remote-tracking branch 'upstream/master' into definedata-hierarchy

DynamoDS · Apr 26, 2024 · ef49bf5 · ef49bf5
2 parents 914b793 + 03b6181
commit ef49bf5
Show file tree

Hide file tree

Showing 14 changed files with 120 additions and 143 deletions.
diff --git a/...lpFiles/Autodesk.DesignScript.Geometry.PanelSurface.ByDiagonallySplitSquares.md b/...lpFiles/Autodesk.DesignScript.Geometry.PanelSurface.ByDiagonallySplitSquares.md
@@ -3,4 +3,4 @@ Panels the input surface in a square grid, with each square split into two trian
 ___
 ## Example File
 
-![ByDiagonallySplitSquares](./Autodesk.DesignScript.Geometry.PanelSurface.ByDiagonallySplitSquares_img)
+![ByDiagonallySplitSquares](./Autodesk.DesignScript.Geometry.PanelSurface.ByDiagonallySplitSquares_img.jpg)
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -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

diff --git a/src/DynamoCore/Scheduler/AsyncTaskExtensions.cs b/src/DynamoCore/Scheduler/AsyncTaskExtensions.cs
@@ -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));
         }
 

diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -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;

diff --git a/src/DynamoUtilities/DynamoFeatureFlagsManager.cs b/src/DynamoUtilities/DynamoFeatureFlagsManager.cs
@@ -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();

diff --git a/test/DynamoCoreTests/UnitsOfMeasureTests.cs b/test/DynamoCoreTests/UnitsOfMeasureTests.cs
@@ -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";
 

diff --git a/test/DynamoCoreWpfTests/DynamoTestUIBase.cs b/test/DynamoCoreWpfTests/DynamoTestUIBase.cs
@@ -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;

diff --git a/test/DynamoCoreWpfTests/DynamoViewModelUnitTest.cs b/test/DynamoCoreWpfTests/DynamoViewModelUnitTest.cs
@@ -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)
                 });
 

diff --git a/test/DynamoCoreWpfTests/PreviewBubbleTests.cs b/test/DynamoCoreWpfTests/PreviewBubbleTests.cs
@@ -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();