[DYN-2206] Reset engine on scheduler thread upon creation of new workspace (#10687)

aparajit-pratap · web-flow · commit af9cb10efdff · 2020-05-21T21:54:58.000-04:00
* reset engine on scheduler thread upon creation of new workspace

* add unit test
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -23,6 +23,7 @@
 using Dynamo.Interfaces;
 using Dynamo.Models;
 using Dynamo.PackageManager;
+using Dynamo.Scheduler;
 using Dynamo.Selection;
 using Dynamo.Services;
 using Dynamo.UI;
@@ -1883,7 +1884,12 @@ internal bool CanSelectAll(object parameter)
         public void MakeNewHomeWorkspace(object parameter)
         {
             if (ClearHomeWorkspaceInternal())
-                this.ShowStartPage = false; // Hide start page if there's one.
+            {
+                var t = new DelegateBasedAsyncTask(model.Scheduler, () => model.ResetEngine());
+                model.Scheduler.ScheduleForExecution(t);
+
+                ShowStartPage = false; // Hide start page if there's one.
+            }
         }
 
         internal bool CanMakeNewHomeWorkspace(object parameter)
diff --git a/test/DynamoCoreWpfTests/NodeExecutionUITest.cs b/test/DynamoCoreWpfTests/NodeExecutionUITest.cs
@@ -1,5 +1,7 @@
-﻿using System.Linq;
+﻿using System;
+using System.Linq;
 using CoreNodeModels.Input;
+using DesignScript.Builtin;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Nodes.ZeroTouch;
 using Dynamo.Models;
@@ -11,8 +13,21 @@ namespace DynamoCoreWpfTests
     [TestFixture]
     public class NodeExecutionUITest : DynamoViewModelUnitTest
     {
+        private CodeBlockNodeModel CreateCodeBlockNode()
+        {
+            var model = GetModel();
+            var cbn = new CodeBlockNodeModel(model.LibraryServices);
+            var command1 = new DynamoModel.CreateNodeCommand(cbn, 0, 0, true, false);
+            model.ExecuteCommand(command1);
+            return cbn;
+        }
 
-        #region NodeExecution
+        private void UpdateCodeBlockNodeContent(string code, Guid guid)
+        {
+            var model = GetModel();
+            var command = new DynamoModel.UpdateModelValueCommand(Guid.Empty, guid, "Code", code);
+            model.ExecuteCommand(command);
+        }
 
         //case 1 : Node in Freeze and Not execute state. True for all parent nodes.
         [Test]
@@ -225,6 +240,29 @@ public void Undo_Freeze_Test()
 
         }
 
-        #endregion
+        [Test]
+        [Category("DynamoUI")]
+        public void NewWorkspaceFunctionDefinitionTest()
+        {
+            // Create code block node and define DS function "test"
+            var cbn = CreateCodeBlockNode();
+
+            var code = "def test(x:int = 1){return = x;}test();";
+            UpdateCodeBlockNodeContent(code, cbn.GUID);
+            AssertPreviewValue(cbn.GUID.ToString(), 1);
+
+            // Create empty new workspace 
+            ViewModel.NewHomeWorkspaceCommand.Execute(null);
+
+            // Create code block node and invoke test function
+            cbn = CreateCodeBlockNode();
+
+            code = "test();";
+            UpdateCodeBlockNodeContent(code, cbn.GUID);
+
+            // Assert that function "test" is not defined any longer
+            // by asserting null for code block node invoking it.
+            AssertPreviewValue(cbn.GUID.ToString(), null);
+        }
     }
 }
