#258 Throw more detailed exceptions in ControlListScopeLocator

atata-framework · Apr 25, 2019 · c165aaf · c165aaf
1 parent 43410f6
commit c165aaf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/Atata/Components/ControlList`2.cs b/src/Atata/Components/ControlList`2.cs
@@ -235,6 +235,10 @@ private void InitItemFindAttribute(FindAttribute findAttribute)
         protected TItem CreateItem(IScopeLocator scopeLocator, string name)
         {
             TItem item = CreateItem(name);
+
+            if (scopeLocator is ControlListScopeLocator controlListScopeLocator)
+                controlListScopeLocator.ElementName = item.ComponentFullName;
+
             item.ScopeLocator = scopeLocator;
 
             return item;

diff --git a/src/Atata/ScopeSearch/ControlListScopeLocator.cs b/src/Atata/ScopeSearch/ControlListScopeLocator.cs
@@ -14,6 +14,8 @@ public ControlListScopeLocator(Func<SearchOptions, IEnumerable<IWebElement>> pre
             this.predicate = predicate;
         }
 
+        public string ElementName { get; set; }
+
         public IWebElement GetElement(SearchOptions searchOptions = null, string xPathCondition = null)
         {
             searchOptions = searchOptions ?? new SearchOptions();
@@ -24,9 +26,18 @@ public IWebElement GetElement(SearchOptions searchOptions = null, string xPathCo
             });
 
             if (element == null && !searchOptions.IsSafely)
-                throw ExceptionFactory.CreateForNoSuchElement();
+            {
+                throw ExceptionFactory.CreateForNoSuchElement(
+                    new SearchFailureData
+                    {
+                        ElementName = ElementName,
+                        SearchOptions = searchOptions
+                    });
+            }
             else
-                return element;
+            {
+                return element;
+            }
         }
 
         public IWebElement[] GetElements(SearchOptions searchOptions = null, string xPathCondition = null)
@@ -49,9 +60,18 @@ public bool IsMissing(SearchOptions searchOptions = null, string xPathCondition
             });
 
             if (!isMissing && !searchOptions.IsSafely)
-                throw ExceptionFactory.CreateForNotMissingElement();
+            {
+                throw ExceptionFactory.CreateForNotMissingElement(
+                    new SearchFailureData
+                    {
+                        ElementName = ElementName,
+                        SearchOptions = searchOptions
+                    });
+            }
             else
-                return isMissing;
+            {
+                return isMissing;
+            }
         }
     }
 }