Add partial xpath support to ignore identifiers in the axpath

AppiumForMac/Server/Controller/AfMSessionController.h

@@ -155,6 +155,8 @@ extern NSString * const kCookieDiagnosticsDirectory;
 -(GDataXMLDocument*)xmlPageSourceFromRootUIElement:(PFUIElement*)rootUIElement pathMap:(NSMutableDictionary*)pathMap xPath:(NSString*)xPath;
 - (NSArray *)findAllUsingAbsoluteAXPath:(NSString *)path;
 
+-(PFUIElement*) findElementRecursively:(PFUIElement *)rootUIElement calls:(int)calls;
+
 - (AppiumMacHTTPJSONResponse *)executeWebDriverCommandWithPath:(NSString*)path data:(NSData*)postData onMainThread:(BOOL)onMainThread commandBlock:(AppiumMacHTTPJSONResponse *(^)(AfMSessionController *session, NSDictionary *commandParams, int *statusCode))commandBlock;
 
 - (void)setDesiredCapabilities:(NSDictionary *)desiredCapabilities;

AppiumForMac/Server/Controller/AfMSessionController.m

@@ -54,6 +54,10 @@ @interface AfMSessionController()
 @property BOOL isAltKeyDown;
 @property BOOL isCommandKeyDown;
 
+// Properties for partial AXPath fix
+@property NSString* elementRole;
+@property NSMutableDictionary* predicateDict;
+
 // Properties for handling timed events such as mouse moves.
 @property NSMutableArray *timedEvents;
 @property NSUInteger timedEventIndex;
@@ -1114,6 +1118,13 @@ - (NSArray *)findAllUsingAbsoluteAXPath:(NSString *)axPath
         }
     }
 
+    // See if there is any partially matching XPath
+    if ([matchedNodes count] == 0)
+    {
+        matchedNodes = [self findAllUsingPartialAXPath:axPathComponents rootUIElement:self.currentApplication];
+    }
+    [self clearCurrentElementCache];
+
     return matchedNodes;
 }
 
@@ -1190,6 +1201,107 @@ - (NSArray *)findAllUsingAXPathComponents:(NSArray *)axPathComponents rootUIElem
     return @[];
 }
 
+-(PFUIElement*) findElementRecursively:(PFUIElement *)rootUIElement calls:(int)calls
+{
+    if ([self checkIfElementFound:rootUIElement])
+    {
+        return rootUIElement;
+    }
+    calls++;
+
+    NSArray* children = rootUIElement.AXChildren;
+
+    PFUIElement* result = nil;
+
+    if (children)
+    {
+        for (PFUIElement* node in children)
+        {
+            result = [self findElementRecursively:node calls:calls];
+            if (result)
+            {
+                return result;
+            }
+        }
+    }
+
+    calls--;
+    return nil;
+}
+
+-(NSArray*) findAllUsingPartialAXPath:(NSArray *)axPathComponents rootUIElement:(PFUIElement *)rootUIElement
+{
+    NSArray* childUIElements = rootUIElement.AXChildren;
+
+    if (!childUIElements || [childUIElements count] == 0)
+    {
+        return @[];
+    }
+
+    [self setRoleAndPredicatesOfElement:[axPathComponents lastObject]];
+    NSMutableArray *matchedChildren = [NSMutableArray array];
+    PFUIElement* foundElement = [self findElementRecursively:rootUIElement calls:0];
+
+    if ([foundElement isNotEqualTo:nil])
+    {
+        [matchedChildren addObject:foundElement];
+    }
+
+    return matchedChildren;
+}
+
+-(void) setRoleAndPredicatesOfElement:(NSString*) elementToFind
+{
+    if (self.elementRole && self.predicateDict) {
+        return;
+    }
+
+    NSDictionary *parseElement = [self parseRoleAndPredicateString:elementToFind];
+
+    self.elementRole = parseElement[kNodeRole];
+    self.predicateDict = [[NSMutableDictionary alloc] init];
+
+    NSArray* predicateArray = parseElement[kNodePredicate][kPredicateOperations];
+
+    for (int i=0; i < [predicateArray count]; i++)
+    {
+        id object = [predicateArray objectAtIndex:i];
+        NSString* attributeName = object[kPredicateAttributeName];
+        NSString* attributeValue = object[kPredicateAttributeValue];
+        if (![attributeName isEqualToString:@"AXIdentifier"])
+        {
+            self.predicateDict[attributeName] = attributeValue;
+        }
+    }
+}
+
+
+-(void) clearCurrentElementCache
+{
+    self.elementRole = nil;
+    self.predicateDict = nil;
+}
+
+-(BOOL) checkIfElementFound:(PFUIElement*) currentElement
+{
+
+    if ([currentElement.AXRole isNotEqualTo:self.elementRole])
+    {
+        return NO;
+    }
+
+    for( NSString* key in self.predicateDict )
+    {
+        if ( ![currentElement existsAttribute:key] || [self.predicateDict[key] isNotEqualTo:[currentElement valueForAttribute:key]])
+        {
+            return NO;
+        }
+    }
+
+    return YES;
+
+}
+
 - (BOOL)element:(PFUIElement *)uiElement doesMatchPredicate:(NSDictionary *)predicate atIndex:(NSUInteger)elementIndex
 {
     BOOL doesMatch = NO;