DYN-7716 Fixing Flaky Tests (#15680)

RobertGlobant20 · web-flow · commit 9fcf24a26853 · 2024-11-22T14:18:20.000-05:00
diff --git a/test/DynamoCoreWpfTests/NodeAutoCompleteSearchTests.cs b/test/DynamoCoreWpfTests/NodeAutoCompleteSearchTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Dynamo;
+using Dynamo.Configuration;
 using Dynamo.Controls;
 using Dynamo.Graph.Nodes;
 using Dynamo.Models;
@@ -18,7 +19,7 @@ namespace DynamoCoreWpfTests
     class NodeAutoCompleteSearchTests : DynamoTestUIBase
     {
 
-        private readonly List<string> expectedNodes = new List<string> { "ByFillet", "ByFilletTangentToCurve", "ByGeometry", "ByMinimumVolume", "ByBlendBetweenCurves", "ByTangency", "ByLineAndPoint", "ByJoinedCurves", "ByThickeningCurveNormal", "ByLoft", "ByLoft", "ByLoftGuides", "BySweep", "ByLoft", "ByLoft", "ByRevolve", "BySweep", "BySweep2Rails", "ByLoft", "ByLoft", "ByPatch", "ByRevolve", "ByRuledLoft", "BySweep", "BySweep2Rails", "BuildFromLines", "BuildPipes", "ByExtrude", "ByPlaneLineAndPoint", "ByRevolve", "BySweep", "DoesIntersect", "IsAlmostEqualTo", "DistanceTo", "Intersect", "IntersectAll", "Project", "Project", "ProjectInputOnto", "ProjectInputOnto", "Split", "Trim", "SerializeAsSAB", "ClosestPointTo", "Join", "ByGroupedCurves", "SweepAsSolid", "ExportToSAT", "SweepAsSurface", "LocateSurfacesByLine", "BridgeEdgesToEdges", "BridgeEdgesToFaces", "BridgeFacesToEdges", "BridgeFacesToFaces", "CreateMatch", "ExtrudeEdgesAlongCurve", "ExtrudeFacesAlongCurve", "PullVertices" };
+        private readonly List<string> expectedNodes = new List<string> { "ProtoGeometry.Autodesk.DesignScript.Geometry.Arc.ByFillet", "ProtoGeometry.Autodesk.DesignScript.Geometry.Arc.ByFilletTangentToCurve", "ProtoGeometry.Autodesk.DesignScript.Geometry.BoundingBox.ByGeometry", "ProtoGeometry.Autodesk.DesignScript.Geometry.BoundingBox.ByMinimumVolume", "ProtoGeometry.Autodesk.DesignScript.Geometry.Curve.ByBlendBetweenCurves", "ProtoGeometry.Autodesk.DesignScript.Geometry.Line.ByTangency", "ProtoGeometry.Autodesk.DesignScript.Geometry.Mesh.ByGeometry", "ProtoGeometry.Autodesk.DesignScript.Geometry.Plane.ByLineAndPoint", "ProtoGeometry.Autodesk.DesignScript.Geometry.PolyCurve.ByJoinedCurves", "ProtoGeometry.Autodesk.DesignScript.Geometry.PolyCurve.ByThickeningCurveNormal", "ProtoGeometry.Autodesk.DesignScript.Geometry.PolySurface.ByLoft", "ProtoGeometry.Autodesk.DesignScript.Geometry.PolySurface.ByLoft", "ProtoGeometry.Autodesk.DesignScript.Geometry.PolySurface.ByLoftGuides", "ProtoGeometry.Autodesk.DesignScript.Geometry.PolySurface.BySweep", "ProtoGeometry.Autodesk.DesignScript.Geometry.Solid.ByLoft", "ProtoGeometry.Autodesk.DesignScript.Geometry.Solid.ByLoft", "ProtoGeometry.Autodesk.DesignScript.Geometry.Solid.ByRevolve", "ProtoGeometry.Autodesk.DesignScript.Geometry.Solid.BySweep", "ProtoGeometry.Autodesk.DesignScript.Geometry.Solid.BySweep2Rails", "ProtoGeometry.Autodesk.DesignScript.Geometry.Surface.ByLoft", "ProtoGeometry.Autodesk.DesignScript.Geometry.Surface.ByLoft", "ProtoGeometry.Autodesk.DesignScript.Geometry.Surface.ByPatch", "ProtoGeometry.Autodesk.DesignScript.Geometry.Surface.ByRevolve", "ProtoGeometry.Autodesk.DesignScript.Geometry.Surface.ByRuledLoft", "ProtoGeometry.Autodesk.DesignScript.Geometry.Surface.BySweep", "ProtoGeometry.Autodesk.DesignScript.Geometry.Surface.BySweep2Rails", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.BuildFromLines", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.BuildPipes", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.ByExtrude", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.ByPlaneLineAndPoint", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.ByRevolve", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.BySweep", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.DoesIntersect", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.IsAlmostEqualTo", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.DistanceTo", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.Intersect", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.IntersectAll", "ProtoGeometry.Autodesk.DesignScript.Geometry.Curve.Project", "ProtoGeometry.Autodesk.DesignScript.Geometry.Point.Project", "ProtoGeometry.Autodesk.DesignScript.Geometry.Solid.ProjectInputOnto", "ProtoGeometry.Autodesk.DesignScript.Geometry.Surface.ProjectInputOnto", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.Split", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.Trim", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.SerializeAsSAB", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.ClosestPointTo", "ProtoGeometry.Autodesk.DesignScript.Geometry.Curve.Join", "ProtoGeometry.Autodesk.DesignScript.Geometry.PolyCurve.ByGroupedCurves", "ProtoGeometry.Autodesk.DesignScript.Geometry.Curve.SweepAsSolid", "ProtoGeometry.Autodesk.DesignScript.Geometry.Geometry.ExportToSAT", "ProtoGeometry.Autodesk.DesignScript.Geometry.Curve.SweepAsSurface", "ProtoGeometry.Autodesk.DesignScript.Geometry.PolySurface.LocateSurfacesByLine", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.BridgeEdgesToEdges", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.BridgeEdgesToFaces", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.BridgeFacesToEdges", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.BridgeFacesToFaces", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.CreateMatch", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.ExtrudeEdgesAlongCurve", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.ExtrudeFacesAlongCurve", "ProtoGeometry.Autodesk.DesignScript.Geometry.TSpline.TSplineSurface.PullVertices" };
 
         [NodeDescription("This is test node with multiple output ports and types specified.")]
         [NodeName("node with multi type outputs")]
@@ -65,6 +66,28 @@ public override void Start()
             Model.AddZeroTouchNodesToSearch(Model.LibraryServices.GetAllFunctionGroups());
         }
 
+        private void ValidateMissingAddedNodes(List<string> nodeNamesResultList, PreferenceSettings prefSettings)
+        {
+            var namespacesToExcludeFromLibraryStr = "\"" + string.Join("\",", prefSettings.NamespacesToExcludeFromLibrary);
+            var missingNodes = new List<string>();
+
+            string nodesMatchingFailText = "Missing nodes";
+            if (expectedNodes.Count() > nodeNamesResultList.Count())
+            {
+                missingNodes = expectedNodes.Except(nodeNamesResultList).ToList();
+            }
+            else if (expectedNodes.Count() < nodeNamesResultList.Count())
+            {
+                nodesMatchingFailText = "New Added nodes";
+                missingNodes = nodeNamesResultList.Except(expectedNodes).ToList();
+            }
+            Assert.AreEqual(expectedNodes.Count(), nodeNamesResultList.Count(), string.Format("{0}: {1}\nNamespacesToExcludeFromLibrarySpecified: {2}\n NamespacesToExcludeFromLibrary: {3}",
+                                                                                                nodesMatchingFailText,
+                                                                                                string.Join(", ", missingNodes),
+                                                                                                namespacesToExcludeFromLibraryStr,
+                                                                                                prefSettings.NamespacesToExcludeFromLibrarySpecified.ToString()));
+        }
+
         [Test]
         public void NodeSuggestions_CanAutoCompleteInCustomNodeWorkspace()
         {
@@ -151,7 +174,6 @@ public void NodeSuggestions_CanAutoCompleteOnCustomNodesOutPort()
         }
 
         [Test]
-        [Category("Failure")]
         public void NodeSuggestions_CanAutoCompleteOnCustomNodesOutPort_WithSpaceInPortName()
         {
             var outputNode = new Dynamo.Graph.Nodes.CustomNodes.Output();
@@ -169,12 +191,11 @@ public void NodeSuggestions_CanAutoCompleteOnCustomNodesOutPort_WithSpaceInPortN
 
             // Results will be nodes that accept Line as parameter.
             searchViewModel.PopulateAutoCompleteCandidates();
-            var nodeNamesResultList = searchViewModel.FilteredResults.Select(x => x.Name).ToList();
+            var nodeNamesResultList = searchViewModel.FilteredResults.Select(x => x.FullName).ToList();
 
-            Assert.AreEqual(expectedNodes.Count(), nodeNamesResultList.Count(),string.Format("Missing nodes: {0} ", string.Join(", ",expectedNodes.Except(nodeNamesResultList))));
+            ValidateMissingAddedNodes(nodeNamesResultList, searchViewModel.dynamoViewModel.PreferenceSettings);
         }
         [Test]
-        [Category("Failure")]
         public void NodeSuggestions_CanAutoCompleteOnCustomNodesOutPort_WithWhiteSpaceStartingPortName()
         {
             var outputNode = new Dynamo.Graph.Nodes.CustomNodes.Output();
@@ -192,9 +213,9 @@ public void NodeSuggestions_CanAutoCompleteOnCustomNodesOutPort_WithWhiteSpaceSt
 
             // Results will be nodes that accept Line as parameter.
             searchViewModel.PopulateAutoCompleteCandidates();
-            var nodeNamesResultList = searchViewModel.FilteredResults.Select(x => x.Name).ToList();
+            var nodeNamesResultList = searchViewModel.FilteredResults.Select(x => x.FullName).ToList();
 
-            Assert.AreEqual(expectedNodes.Count(), nodeNamesResultList.Count(), string.Format("Missing nodes: {0} ", string.Join(", ", expectedNodes.Except(nodeNamesResultList))));
+            ValidateMissingAddedNodes(nodeNamesResultList, searchViewModel.dynamoViewModel.PreferenceSettings);
         }
 
         [Test]
@@ -315,7 +336,6 @@ public void NodeSuggestions_InputPortBuiltInNode_AreCorrect()
         }
 
         [Test]
-        [Category("Failure")]
         public void NodeSuggestions_OutputPortBuiltInNode_AreCorrect()
         {
             Open(@"UI\builtin_outputport_suggestion.dyn");
@@ -335,7 +355,10 @@ public void NodeSuggestions_OutputPortBuiltInNode_AreCorrect()
             var searchViewModel = ViewModel.CurrentSpaceViewModel.NodeAutoCompleteSearchViewModel;
             searchViewModel.PortViewModel = outPorts[0];
             var suggestions = searchViewModel.GetMatchingSearchElements();
-            Assert.AreEqual(58, suggestions.Count());
+
+            var nodeNamesResultList = suggestions.Select(x => x.FullName).ToList();
+
+            ValidateMissingAddedNodes(nodeNamesResultList, searchViewModel.dynamoViewModel.PreferenceSettings);
         }
 
         [Test]
diff --git a/test/DynamoCoreWpfTests/SearchSideEffects.cs b/test/DynamoCoreWpfTests/SearchSideEffects.cs
@@ -219,7 +219,6 @@ public void LuceneSearchNodesOrderingValidation()
 
         //This test will validate that resulting nodes have a specific order when having T-Spline nodes in the nodes list.
         [Test]
-        [Category("Failure")]
         public void LuceneSearchTSplineNodesOrderingValidation()
         {
             Assert.IsAssignableFrom(typeof(HomeWorkspaceModel), ViewModel.Model.CurrentWorkspace);
@@ -248,11 +247,11 @@ public void LuceneSearchTSplineNodesOrderingValidation()
             //Take the first 5 elements, get the ones that belong to the expected category and finally get the index in the list
             firstCatExpectedNode = nodesResult.Take(5).ToList().FindIndex(x => x.Class.ToLower().Contains(searchTerms[1]));
 
-            //Validate that T-Spline nodes are not found in the results
+            //Validate that T-Spline nodes are not found in the top 5 results
             Assert.That(firstTSpline == -1);
 
-            //Validate that the normal node (category Cone) will be at index 0 (first place)
-            Assert.That(firstCatExpectedNode == 0);
+            //Validate that the normal node (category Cone) will be at the first top 5 positions
+            Assert.That(firstCatExpectedNode >= 0 && firstCatExpectedNode < 5); ;
 
         }
 
