Merge pull request TestStack#135 from ivan-danilov/master

Added untyped native search criteria (e.g. for searching by RuntimeId property value)
Orm · Aug 1, 2013 · 43e10fc · 43e10fc
2 parents 2718564 + 11b35d1
commit 43e10fc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/TestStack.White/UIItems/Finders/SearchConditionFactory.cs b/src/TestStack.White/UIItems/Finders/SearchConditionFactory.cs
@@ -63,5 +63,11 @@ public static SearchCondition CreateForNativeProperty(AutomationProperty automat
             var automationElementProperty = new AutomationElementProperty(value, automationProperty.ProgrammaticName, automationProperty);
             return new SimpleSearchCondition(automationElement => automationElement.GetCurrentPropertyValue(automationProperty), automationElementProperty);
         }
+
+        public static SearchCondition CreateForNativeProperty(AutomationProperty automationProperty, object value)
+        {
+            var automationElementProperty = new AutomationElementProperty(value, automationProperty.ProgrammaticName, automationProperty);
+            return new SimpleSearchCondition(automationElement => automationElement.GetCurrentPropertyValue(automationProperty), automationElementProperty);
+        }
     }
 }
diff --git a/src/TestStack.White/UIItems/Finders/SearchCriteria.cs b/src/TestStack.White/UIItems/Finders/SearchCriteria.cs
@@ -92,6 +92,11 @@ public static SearchCriteria ByNativeProperty(AutomationProperty automationPrope
             return new SearchCriteria(SearchConditionFactory.CreateForNativeProperty(automationProperty, value));
         }
 
+        public static SearchCriteria ByNativeProperty(AutomationProperty automationProperty, object value)
+        {
+            return new SearchCriteria(SearchConditionFactory.CreateForNativeProperty(automationProperty, value));
+        }
+
         public static SearchCriteria ByControlType(Type testControlType, WindowsFramework framework)
         {
             var searchCriteria = new SearchCriteria(SearchConditionFactory.CreateForControlType(testControlType, framework));
@@ -201,6 +206,12 @@ public virtual SearchCriteria AndNativeProperty(AutomationProperty automationPro
             return this;
         }
 
+        public virtual SearchCriteria AndNativeProperty(AutomationProperty automationProperty, object value)
+        {
+            conditions.Insert(0, SearchConditionFactory.CreateForNativeProperty(automationProperty, value));
+            return this;
+        }
+
         public virtual List<AutomationElement> Filter(List<AutomationElement> automationElements)
         {
             return conditions.Filter(automationElements);