Update GraphNodeManagerViewExtensionTests.cs (#15190)

DynamoDS · May 6, 2024 · 9257a46 · 9257a46
1 parent b352d49
commit 9257a46
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/GraphNodeManagerViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/GraphNodeManagerViewExtensionTests.cs
@@ -205,19 +205,24 @@ public void ContainsEmptyListOrNullTest()
 
             OpenAndRun(@"pkgs\Dynamo Samples\extra\GraphNodeManagerTestGraph_NullsEmptyLists.dyn");
 
-            Utility.DispatcherUtil.DoEvents();
+            var hwm = this.ViewModel.CurrentSpace;
 
-            var view = viewExt.ManagerView;
+            int nullNodesCount = hwm.Nodes.Count(ContainsAnyNulls);
+            int emptyListNodesCount = hwm.Nodes.Count(ContainsAnyEmptyLists);
 
+            var view = viewExt.ManagerView;
             var images = WpfUtilities.ChildrenOfType<Image>(view.NodesInfoDataGrid);
 
-            int nullNodesImageCount = GetImageCount(images, "Null");
-            int emptyListNodesImageCount = GetImageCount(images, "EmptyList");
+            Utility.DispatcherUtil.DoEventsLoop(() =>
+            {
+                int nullNodesImageCount = GetImageCount(images, "Null");
+                int emptyListNodesImageCount = GetImageCount(images, "EmptyList");
 
-            var hwm = this.ViewModel.CurrentSpace;
+                return (nullNodesImageCount == nullNodesCount) && (emptyListNodesImageCount == emptyListNodesCount);
+            });
 
-            int nullNodesCount = hwm.Nodes.Count(ContainsAnyNulls);
-            int emptyListNodesCount = hwm.Nodes.Count(ContainsAnyEmptyLists);
+            int nullNodesImageCount = GetImageCount(images, "Null");
+            int emptyListNodesImageCount = GetImageCount(images, "EmptyList");
 
             // Assert
             Assert.AreEqual(emptyListNodesCount, emptyListNodesImageCount);