update

DynamoDS · Jan 10, 2024 · 9ebd4b0 · 9ebd4b0
1 parent e4dcf57
commit 9ebd4b0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/DynamoCoreWpf/Utilities/WebView2Utilities.cs b/src/DynamoCoreWpf/Utilities/WebView2Utilities.cs
@@ -12,19 +12,19 @@ namespace Dynamo.Wpf.Utilities
     public class DynamoWebView2 : WebView2
     {
         #region API/Data used for debugging/testing
-        private string stamp;
+        private string tag;
         #endregion
 
         public DynamoWebView2() : base()
         {
-            stamp = TestUtilities.WebView2Stamp;
+            tag = TestUtilities.WebView2Tag;
         }
 
         protected override void Dispose(bool disposing)
         {
             if (System.Environment.CurrentManagedThreadId != Dispatcher.Thread.ManagedThreadId)
             {
-                System.Console.WriteLine($"WebView2 instance with stamp {stamp} is being disposed of on non-UI thread");
+                System.Console.WriteLine($"WebView2 instance with stamp {tag} is being disposed of on non-UI thread");
             }
             // We should dispose of webview2 only in the UI thread.
             // Dispose can be called from the Finalizer (which can run on a non UI thread)
@@ -37,7 +37,7 @@ protected override void Dispose(bool disposing)
             }
             else
             {
-                System.Console.WriteLine($"WebView2 instance with stamp {stamp} is being disposed of but has no valid Dispatcher");
+                System.Console.WriteLine($"WebView2 instance with stamp {tag} is being disposed of but has no valid Dispatcher");
                 // Should we still try to dispose ? (might crash if not on UI thread)
                 base.Dispose(disposing);
             }

diff --git a/src/DynamoUtilities/TestUtilities.cs b/src/DynamoUtilities/TestUtilities.cs
@@ -10,6 +10,6 @@ namespace DynamoUtilities
     internal static class TestUtilities
     {
         // Simple string that we can store in DynamoWebView2 instances so that we can track them down more easily
-        internal static string WebView2Stamp;
+        internal static string WebView2Tag;
     }
 }
diff --git a/test/DynamoCoreTests/UnitTestBase.cs b/test/DynamoCoreTests/UnitTestBase.cs
@@ -69,7 +69,7 @@ public virtual void Setup()
         {
 
             System.Console.WriteLine($"PID {Process.GetCurrentProcess().Id} Start test: {TestContext.CurrentContext.Test.Name}");
-            TestUtilities.WebView2Stamp = TestContext.CurrentContext.Test.Name;
+            TestUtilities.WebView2Tag = TestContext.CurrentContext.Test.Name;
 
             SetupDirectories();
 
@@ -104,7 +104,7 @@ public virtual void Cleanup()
             {
                 AppDomain.CurrentDomain.AssemblyResolve -= assemblyHelper.ResolveAssembly;
             }
-            TestUtilities.WebView2Stamp = string.Empty;
+            TestUtilities.WebView2Tag = string.Empty;
             System.Console.WriteLine($"PID {Process.GetCurrentProcess().Id} Finished test: {TestContext.CurrentContext.Test.Name}");
         }
 

diff --git a/test/DynamoCoreWpfTests/DynamoTestUIBase.cs b/test/DynamoCoreWpfTests/DynamoTestUIBase.cs
@@ -43,7 +43,7 @@ protected string ExecutingDirectory
         public virtual void Start()
         {
             System.Console.WriteLine($"PID {Process.GetCurrentProcess().Id} Start test: {TestContext.CurrentContext.Test.Name}");
-            TestUtilities.WebView2Stamp = TestContext.CurrentContext.Test.Name;
+            TestUtilities.WebView2Tag = TestContext.CurrentContext.Test.Name;
 
             var assemblyPath = Assembly.GetExecutingAssembly().Location;
             preloader = new Preloader(Path.GetDirectoryName(assemblyPath));
@@ -144,7 +144,7 @@ public void Exit()
                 Console.WriteLine(ex.StackTrace);
             }
 
-            TestUtilities.WebView2Stamp = string.Empty;
+            TestUtilities.WebView2Tag = string.Empty;
             System.Console.WriteLine($"PID {Process.GetCurrentProcess().Id} Finished test: {TestContext.CurrentContext.Test.Name}");
         }
 

diff --git a/test/DynamoCoreWpfTests/SplashScreenTests.cs b/test/DynamoCoreWpfTests/SplashScreenTests.cs
@@ -11,13 +11,13 @@ internal class SplashScreenTests
         [SetUp]
         public void SetUp()
         {
-            TestUtilities.WebView2Stamp = TestContext.CurrentContext.Test.Name;
+            TestUtilities.WebView2Tag = TestContext.CurrentContext.Test.Name;
         }
 
         [TearDown]
         public void CleanUp()
         {
-            TestUtilities.WebView2Stamp = string.Empty;
+            TestUtilities.WebView2Tag = string.Empty;
         }
 
         [Test]

diff --git a/test/Libraries/SystemTestServices/SystemTestBase.cs b/test/Libraries/SystemTestServices/SystemTestBase.cs
@@ -61,7 +61,7 @@ protected string ExecutingDirectory
         public virtual void Setup()
         {
             System.Console.WriteLine($"PID {Process.GetCurrentProcess().Id} Start test: {TestContext.CurrentContext.Test.Name}");
-            TestUtilities.WebView2Stamp = TestContext.CurrentContext.Test.Name;
+            TestUtilities.WebView2Tag = TestContext.CurrentContext.Test.Name;
 
             var testConfig = GetTestSessionConfiguration();
 
@@ -141,7 +141,7 @@ public virtual void TearDown()
                 Console.WriteLine(ex.StackTrace);
             }
 
-            TestUtilities.WebView2Stamp = string.Empty;
+            TestUtilities.WebView2Tag = string.Empty;
             System.Console.WriteLine($"PID {Process.GetCurrentProcess().Id} Finished test: {TestContext.CurrentContext.Test.Name} ");
         }