appium-webdriveragent 4.7.0 → 4.8.0

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m

@@ -14,6 +14,7 @@
 #import "FBElementTypeTransformer.h"
 #import "FBLogger.h"
 #import "FBMacros.h"
+#import "FBXCElementSnapshotWrapper.h"
 #import "XCUIElement+FBAccessibility.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBUID.h"
@@ -26,7 +27,7 @@
 
 @implementation XCUIElement (WebDriverAttributesForwarding)
 
-- (XCElementSnapshot *)fb_snapshotForAttributeName:(NSString *)name
+- (id<FBXCElementSnapshot>)fb_snapshotForAttributeName:(NSString *)name
 {
   // These attrbiutes are special, because we can only retrieve them from
   // the snapshot if we explicitly ask XCTest to include them into the query while taking it.
@@ -51,8 +52,8 @@
 - (id)fb_valueForWDAttributeName:(NSString *)name
 {
   NSString *wdAttributeName = [FBElementUtils wdAttributeNameForAttributeName:name];
-  XCElementSnapshot *snapshot = [self fb_snapshotForAttributeName:wdAttributeName];
-  return [snapshot fb_valueForWDAttributeName:name];
+  id<FBXCElementSnapshot> snapshot = [self fb_snapshotForAttributeName:wdAttributeName];
+  return [[FBXCElementSnapshotWrapper ensureWrapped:snapshot] fb_valueForWDAttributeName:name];
 }
 
 - (id)forwardingTargetForSelector:(SEL)aSelector
@@ -61,13 +62,13 @@
   SEL webDriverAttributesSelector = descr.name;
   return nil == webDriverAttributesSelector
     ? nil
-    : [self fb_snapshotForAttributeName:NSStringFromSelector(webDriverAttributesSelector)];
+    : [FBXCElementSnapshotWrapper ensureWrapped:[self fb_snapshotForAttributeName:NSStringFromSelector(webDriverAttributesSelector)]];
 }
 
 @end
 
 
-@implementation XCElementSnapshot (WebDriverAttributes)
+@implementation FBXCElementSnapshotWrapper (WebDriverAttributes)
 
 - (id)fb_valueForWDAttributeName:(NSString *)name
 {
@@ -161,8 +162,8 @@
   // Text fields: actual accessible element isn't text field itself, but nested element
   if (elementType == XCUIElementTypeCell) {
     if (!self.fb_isAccessibilityElement) {
-      XCElementSnapshot *containerView = [[self children] firstObject];
-      if (!containerView.fb_isAccessibilityElement) {
+      id<FBXCElementSnapshot> containerView = [[self children] firstObject];
+      if (![FBXCElementSnapshotWrapper ensureWrapped:containerView].fb_isAccessibilityElement) {
         return NO;
       }
     }
@@ -171,12 +172,13 @@
       return NO;
     }
   }
-  XCElementSnapshot *parentSnapshot = self.parent;
+  id<FBXCElementSnapshot> parentSnapshot = self.parent;
   while (parentSnapshot) {
     // In the scenario when table provides Search results controller, table could be marked as accessible element, even though it isn't
     // As it is highly unlikely that table view should ever be an accessibility element itself,
     // for now we work around that by skipping Table View in container checks
-    if (parentSnapshot.fb_isAccessibilityElement && parentSnapshot.elementType != XCUIElementTypeTable) {
+    if ([FBXCElementSnapshotWrapper ensureWrapped:parentSnapshot].fb_isAccessibilityElement
+        && parentSnapshot.elementType != XCUIElementTypeTable) {
       return NO;
     }
     parentSnapshot = parentSnapshot.parent;
@@ -186,9 +188,10 @@
 
 - (BOOL)isWDAccessibilityContainer
 {
-  NSArray<XCElementSnapshot *> *children = self.children;
-  for (XCElementSnapshot *child in children) {
-    if (child.isWDAccessibilityContainer || child.fb_isAccessibilityElement) {
+  NSArray<id<FBXCElementSnapshot>> *children = self.children;
+  for (id<FBXCElementSnapshot> child in children) {
+    FBXCElementSnapshotWrapper *wrappedChild = [FBXCElementSnapshotWrapper ensureWrapped:child];
+    if (wrappedChild.isWDAccessibilityContainer || wrappedChild.fb_isAccessibilityElement) {
       return YES;
     }
   }
@@ -209,7 +212,7 @@
 {
   if (nil != self.parent) {
     for (NSUInteger index = 0; index < self.parent.children.count; ++index) {
-      if ([self.parent.children objectAtIndex:index] == self) {
+      if ([self.parent.children objectAtIndex:index] == self.snapshot) {
         return index;
       }
     }

package/WebDriverAgentLib/Categories/XCUIElementQuery+FBHelpers.h

@@ -8,8 +8,7 @@
  */
 
 #import <XCTest/XCTest.h>
-
-@class XCElementSnapshot;
+#import "FBXCElementSnapshot.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -23,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @return Either the cached snapshot or nil
  */
-- (nullable XCElementSnapshot *)fb_cachedSnapshot;
+- (nullable id<FBXCElementSnapshot>)fb_cachedSnapshot;
 
 @end
 

package/WebDriverAgentLib/Categories/XCUIElementQuery+FBHelpers.m

@@ -11,13 +11,13 @@
 
 #import "FBXCodeCompatibility.h"
 #import "XCUIElementQuery.h"
-
+#import "FBXCElementSnapshot.h"
 
 @implementation XCUIElementQuery (FBHelpers)
 
-- (nullable XCElementSnapshot *)fb_cachedSnapshot
+- (nullable id<FBXCElementSnapshot>)fb_cachedSnapshot
 {
-  XCElementSnapshot *rootElementSnapshot = self.rootElementSnapshot;
+  id<FBXCElementSnapshot> rootElementSnapshot = self.rootElementSnapshot;
   if (nil == rootElementSnapshot) {
     return nil;
   }

package/WebDriverAgentLib/Commands/FBElementCommands.m

@@ -12,7 +12,6 @@
 #import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBKeyboard.h"
-#import "FBPredicate.h"
 #import "FBRoute.h"
 #import "FBRouteRequest.h"
 #import "FBRunLoopSpinner.h"
@@ -105,7 +104,7 @@
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  BOOL isEnabled = element.lastSnapshot.isWDEnabled;
+  BOOL isEnabled = [FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDEnabled;
   return FBResponseWithObject(isEnabled ? @YES : @NO);
 }
 
@@ -113,7 +112,7 @@
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  return FBResponseWithObject(element.lastSnapshot.wdRect);
+  return FBResponseWithObject([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdRect);
 }
 
 + (id<FBResponsePayload>)handleGetAttribute:(FBRouteRequest *)request
@@ -143,7 +142,8 @@
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  id text = FBFirstNonEmptyValue(element.lastSnapshot.wdValue, element.lastSnapshot.wdLabel);
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot];
+  id text = FBFirstNonEmptyValue(wrappedSnapshot.wdValue, wrappedSnapshot.wdLabel);
   return FBResponseWithObject(text ?: @"");
 }
 
@@ -153,7 +153,7 @@
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:@[FB_XCAXAIsVisibleAttributeName]
                                           andMaxDepth:@1];
-  return FBResponseWithObject(@(element.lastSnapshot.isWDVisible));
+  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDVisible));
 }
 
 + (id<FBResponsePayload>)handleGetAccessible:(FBRouteRequest *)request
@@ -162,7 +162,7 @@
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:@[FB_XCAXAIsElementAttributeName]
                                           andMaxDepth:@1];
-  return FBResponseWithObject(@(element.lastSnapshot.isWDAccessible));
+  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDAccessible));
 }
 
 + (id<FBResponsePayload>)handleGetIsAccessibilityContainer:(FBRouteRequest *)request
@@ -171,21 +171,21 @@
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:@[FB_XCAXAIsElementAttributeName]
                                           andMaxDepth:nil];
-  return FBResponseWithObject(@(element.lastSnapshot.isWDAccessibilityContainer));
+  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDAccessibilityContainer));
 }
 
 + (id<FBResponsePayload>)handleGetName:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  return FBResponseWithObject(element.lastSnapshot.wdType);
+  return FBResponseWithObject([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdType);
 }
 
 + (id<FBResponsePayload>)handleGetSelected:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  return FBResponseWithObject(@(element.lastSnapshot.wdSelected));
+  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdSelected));
 }
 
 + (id<FBResponsePayload>)handleSetValue:(FBRouteRequest *)request
@@ -199,7 +199,7 @@
   NSString *textToType = [value isKindOfClass:NSArray.class]
     ? [value componentsJoinedByString:@""]
     : value;
-  XCUIElementType elementType = element.lastSnapshot.elementType;
+  XCUIElementType elementType = [(id<FBXCElementSnapshot>)element.lastSnapshot elementType];
 #if !TARGET_OS_TV
   if (elementType == XCUIElementTypePickerWheel) {
     [element adjustToPickerWheelValue:textToType];
@@ -370,7 +370,8 @@
 
   NSString *const predicateString = request.arguments[@"predicateString"];
   if (predicateString) {
-    NSPredicate *formattedPredicate = [NSPredicate fb_formatSearchPredicate:[FBPredicate predicateWithFormat:predicateString]];
+    NSPredicate *formattedPredicate = [NSPredicate fb_snapshotBlockPredicateWithPredicate:[NSPredicate
+                                                                                           predicateWithFormat:predicateString]];
     XCUIElement *childElement = [[[[element.fb_query descendantsMatchingType:XCUIElementTypeAny] matchingPredicate:formattedPredicate] allElementsBoundByAccessibilityElement] lastObject];
     if (!childElement) {
       return FBResponseWithStatus([FBCommandStatus noSuchElementErrorWithMessage:[NSString stringWithFormat:@"'%@' predicate didn't match any elements", predicateString] traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
@@ -414,7 +415,7 @@
   FBSession *session = request.session;
   FBElementCache *elementCache = session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  CGRect frame = element.lastSnapshot.frame;
+  CGRect frame = [(id<FBXCElementSnapshot>)element.lastSnapshot frame];
   CGPoint startPoint = CGPointMake((CGFloat)(frame.origin.x + [request.arguments[@"fromX"] doubleValue]), (CGFloat)(frame.origin.y + [request.arguments[@"fromY"] doubleValue]));
   CGPoint endPoint = CGPointMake((CGFloat)(frame.origin.x + [request.arguments[@"toX"] doubleValue]), (CGFloat)(frame.origin.y + [request.arguments[@"toY"] doubleValue]));
   NSTimeInterval duration = [request.arguments[@"duration"] doubleValue];
@@ -564,7 +565,7 @@ static const CGFloat DEFAULT_OFFSET = (CGFloat)0.2;
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  if (element.lastSnapshot.elementType != XCUIElementTypePickerWheel) {
+  if ([element.lastSnapshot elementType] != XCUIElementTypePickerWheel) {
     return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:[NSString stringWithFormat:@"The element is expected to be a valid Picker Wheel control. '%@' was given instead", element.wdType] traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
   }
   NSString* order = [request.arguments[@"order"] lowercaseString];
@@ -634,7 +635,7 @@ static const CGFloat DEFAULT_OFFSET = (CGFloat)0.2;
     XCUIElement *window = application.windows.fb_firstMatch;
     if (window) {
       element = window;
-      XCElementSnapshot *snapshot = element.fb_cachedSnapshot ?: element.fb_takeSnapshot;
+      id<FBXCElementSnapshot> snapshot = element.fb_cachedSnapshot ?: element.fb_takeSnapshot;
       point.x -= snapshot.frame.origin.x;
       point.y -= snapshot.frame.origin.y;
     }

package/WebDriverAgentLib/Commands/FBFindElementCommands.m

@@ -15,7 +15,6 @@
 #import "FBElementCache.h"
 #import "FBExceptions.h"
 #import "FBMacros.h"
-#import "FBPredicate.h"
 #import "FBRouteRequest.h"
 #import "FBSession.h"
 #import "XCTestPrivateSymbols.h"
@@ -84,11 +83,12 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:@[FB_XCAXAIsVisibleAttributeName]
                                           andMaxDepth:nil];
-  NSArray<XCElementSnapshot *> *visibleCellSnapshots = [element.lastSnapshot descendantsByFilteringWithBlock:^BOOL(XCElementSnapshot *snapshot) {
-    return snapshot.elementType == XCUIElementTypeCell && snapshot.wdVisible;
+  NSArray<id<FBXCElementSnapshot>> *visibleCellSnapshots = [element.lastSnapshot descendantsByFilteringWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot) {
+    return snapshot.elementType == XCUIElementTypeCell
+      && [FBXCElementSnapshotWrapper ensureWrapped:snapshot].wdVisible;
   }];
   NSArray *cells = [element fb_filterDescendantsWithSnapshots:visibleCellSnapshots
-                                                      selfUID:element.lastSnapshot.wdUID
+                                                      selfUID:[FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdUID
                                                  onlyChildren:NO];
   return FBResponseWithCachedElements(cells, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
 }
@@ -169,8 +169,7 @@ shouldReturnAfterFirstMatch:(BOOL)shouldReturnAfterFirstMatch
     return [element fb_descendantsMatchingXPathQuery:value
                          shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch];
   } else if ([usingText isEqualToString:@"predicate string"]) {
-    NSPredicate *predicate = [FBPredicate predicateWithFormat:value];
-    return [element fb_descendantsMatchingPredicate:predicate
+    return [element fb_descendantsMatchingPredicate:[NSPredicate predicateWithFormat:value]
                         shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch];
   } else if ([usingText isEqualToString:@"name"]
              || [usingText isEqualToString:@"id"]

package/WebDriverAgentLib/FBAlert.m

@@ -13,8 +13,8 @@
 #import "FBConfiguration.h"
 #import "FBErrorBuilder.h"
 #import "FBLogger.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCodeCompatibility.h"
-#import "XCElementSnapshot+FBHelpers.h"
 #import "XCUIApplication+FBAlert.h"
 #import "XCUIElement+FBClassChain.h"
 #import "XCUIElement+FBTap.h"
@@ -65,13 +65,14 @@
           buildError:error];
 }
 
-+ (BOOL)isSafariWebAlertWithSnapshot:(XCElementSnapshot *)snapshot
++ (BOOL)isSafariWebAlertWithSnapshot:(id<FBXCElementSnapshot>)snapshot
 {
   if (snapshot.elementType != XCUIElementTypeOther) {
     return NO;
   }
 
-  XCElementSnapshot *application = [snapshot fb_parentMatchingType:XCUIElementTypeApplication];
+  FBXCElementSnapshotWrapper *snapshotWrapper = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+  id<FBXCElementSnapshot> application = [snapshotWrapper fb_parentMatchingType:XCUIElementTypeApplication];
   return nil != application && [application.label isEqualToString:FB_SAFARI_APP_NAME];
 }
 
@@ -82,22 +83,24 @@
   }
 
   NSMutableArray<NSString *> *resultText = [NSMutableArray array];
-  XCElementSnapshot *snapshot = self.alertElement.lastSnapshot;
+  id<FBXCElementSnapshot> snapshot = self.alertElement.lastSnapshot;
   BOOL isSafariAlert = [self.class isSafariWebAlertWithSnapshot:snapshot];
-  [snapshot enumerateDescendantsUsingBlock:^(XCElementSnapshot *descendant) {
+  [snapshot enumerateDescendantsUsingBlock:^(id<FBXCElementSnapshot> descendant) {
     XCUIElementType elementType = descendant.elementType;
     if (!(elementType == XCUIElementTypeTextView || elementType == XCUIElementTypeStaticText)) {
       return;
     }
-
+    
+    FBXCElementSnapshotWrapper *descendantWrapper = [FBXCElementSnapshotWrapper ensureWrapped:descendant];
     if (elementType == XCUIElementTypeStaticText
-        && nil != [descendant fb_parentMatchingType:XCUIElementTypeButton]) {
+        && nil != [descendantWrapper fb_parentMatchingType:XCUIElementTypeButton]) {
       return;
     }
 
-    NSString *text = descendant.wdLabel ?: descendant.wdValue;
+    NSString *text = descendantWrapper.wdLabel ?: descendantWrapper.wdValue;
     if (isSafariAlert && nil != descendant.parent) {
-      NSString *parentText = descendant.parent.wdLabel ?: descendant.parent.wdValue;
+      FBXCElementSnapshotWrapper *descendantParentWrapper = [FBXCElementSnapshotWrapper ensureWrapped:descendant.parent];
+      NSString *parentText = descendantParentWrapper.wdLabel ?: descendantParentWrapper.wdValue;
       if ([parentText isEqualToString:text]) {
         // Avoid duplicated texts on Safari alerts
         return;
@@ -143,11 +146,11 @@
   }
 
   NSMutableArray<NSString *> *labels = [NSMutableArray array];
-  [self.alertElement.lastSnapshot enumerateDescendantsUsingBlock:^(XCElementSnapshot *descendant) {
+  [self.alertElement.lastSnapshot enumerateDescendantsUsingBlock:^(id<FBXCElementSnapshot> descendant) {
     if (descendant.elementType != XCUIElementTypeButton) {
       return;
     }
-    NSString *label = descendant.wdLabel;
+    NSString *label = [FBXCElementSnapshotWrapper ensureWrapped:descendant].wdLabel;
     if (nil != label) {
       [labels addObject:[NSString stringWithFormat:@"%@", label]];
     }
@@ -161,7 +164,7 @@
     return [self notPresentWithError:error];
   }
 
-  XCElementSnapshot *alertSnapshot = self.alertElement.lastSnapshot;
+  id<FBXCElementSnapshot> alertSnapshot = self.alertElement.lastSnapshot;
   XCUIElement *acceptButton = nil;
   if (FBConfiguration.acceptAlertButtonSelector.length) {
     NSString *errorReason = nil;
@@ -200,7 +203,7 @@
     return [self notPresentWithError:error];
   }
 
-  XCElementSnapshot *alertSnapshot = self.alertElement.lastSnapshot;
+  id<FBXCElementSnapshot> alertSnapshot = self.alertElement.lastSnapshot;
   XCUIElement *dismissButton = nil;
   if (FBConfiguration.dismissAlertButtonSelector.length) {
     NSString *errorReason = nil;

package/WebDriverAgentLib/FBApplication.m

@@ -9,13 +9,13 @@
 
 #import "FBApplication.h"
 
+#import "FBXCAccessibilityElement.h"
 #import "FBLogger.h"
 #import "FBRunLoopSpinner.h"
 #import "FBMacros.h"
 #import "FBActiveAppDetectionPoint.h"
 #import "FBXCodeCompatibility.h"
 #import "FBXCTestDaemonsProxy.h"
-#import "XCAccessibilityElement.h"
 #import "XCUIApplication.h"
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIApplicationImpl.h"
@@ -39,10 +39,10 @@ static const NSTimeInterval APP_STATE_CHANGE_TIMEOUT = 5.0;
 
 + (NSArray<FBApplication *> *)fb_activeApplications
 {
-  NSArray<XCAccessibilityElement *> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
+  NSArray<id<FBXCAccessibilityElement>> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
   NSMutableArray<FBApplication *> *result = [NSMutableArray array];
   if (activeApplicationElements.count > 0) {
-    for (XCAccessibilityElement *applicationElement in activeApplicationElements) {
+    for (id<FBXCAccessibilityElement> applicationElement in activeApplicationElements) {
       FBApplication *app = [FBApplication fb_applicationWithPID:applicationElement.processIdentifier];
       if (nil != app) {
         [result addObject:app];
@@ -54,9 +54,9 @@ static const NSTimeInterval APP_STATE_CHANGE_TIMEOUT = 5.0;
 
 + (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bundleId
 {
-  NSArray<XCAccessibilityElement *> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
-  XCAccessibilityElement *activeApplicationElement = nil;
-  XCAccessibilityElement *currentElement = nil;
+  NSArray<id<FBXCAccessibilityElement>> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
+  id<FBXCAccessibilityElement> activeApplicationElement = nil;
+  id<FBXCAccessibilityElement> currentElement = nil;
   if (nil != bundleId) {
     currentElement = FBActiveAppDetectionPoint.sharedInstance.axElement;
     if (nil != currentElement) {
@@ -95,7 +95,7 @@ static const NSTimeInterval APP_STATE_CHANGE_TIMEOUT = 5.0;
           [FBLogger log:@"Consider changing the 'defaultActiveApplication' setting to the bundle identifier of the desired application under test"];
         }
       } else {
-        for (XCAccessibilityElement *appElement in activeApplicationElements) {
+        for (id<FBXCAccessibilityElement> appElement in activeApplicationElements) {
           if (appElement.processIdentifier == currentElement.processIdentifier) {
             activeApplicationElement = appElement;
             break;
@@ -115,7 +115,7 @@ static const NSTimeInterval APP_STATE_CHANGE_TIMEOUT = 5.0;
 
   if (activeApplicationElements.count > 0) {
     [FBLogger logFmt:@"Getting the most recent active application (out of %@ total items)", @(activeApplicationElements.count)];
-    for (XCAccessibilityElement *appElement in activeApplicationElements) {
+    for (id<FBXCAccessibilityElement> appElement in activeApplicationElements) {
       FBApplication *application = [FBApplication fb_applicationWithPID:appElement.processIdentifier];
       if (nil != application) {
         return application;

package/WebDriverAgentLib/Routing/FBElementUtils.h

@@ -9,7 +9,8 @@
 
 #import <Foundation/Foundation.h>
 #import <WebDriverAgentLib/FBElement.h>
-#import "XCAccessibilityElement.h"
+
+@protocol FBXCAccessibilityElement;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -47,13 +48,21 @@ extern NSString *const FBUnknownAttributeException;
  */
 + (NSDictionary<NSString *, NSString *> *)wdAttributeNamesMapping;
 
+/**
+ Gets the unique identifier of the particular XCAccessibilityElement instance in form of UUIDv4.
+ 
+ @param element accessiblity element instance
+ @return the unique element identifier or nil if it cannot be retrieved
+ */
++ (nullable NSString *)uidWithAccessibilityElement:(id<FBXCAccessibilityElement>)element;
+
 /**
  Gets the unique identifier of the particular XCAccessibilityElement instance.
  
  @param element accessiblity element instance
  @return the unique element identifier or nil if it cannot be retrieved
  */
-+ (nullable NSString *)uidWithAccessibilityElement:(XCAccessibilityElement *)element;
++ (unsigned long long)idWithAccessibilityElement:(id<FBXCAccessibilityElement>)element;
 
 @end
 

package/WebDriverAgentLib/Routing/FBElementUtils.m

@@ -9,6 +9,7 @@
 
 #import <objc/runtime.h>
 
+#import "FBXCAccessibilityElement.h"
 #import "FBElementUtils.h"
 #import "FBElementTypeTransformer.h"
 
@@ -109,19 +110,9 @@ static NSString *const OBJC_PROP_ATTRIBS_SEPARATOR = @",";
   return attributeNamesMapping.copy;
 }
 
-static BOOL FBShouldUsePayloadForUIDExtraction = YES;
-static dispatch_once_t oncePayloadToken;
-+ (NSString *)uidWithAccessibilityElement:(XCAccessibilityElement *)element
++ (NSString *)uidWithAccessibilityElement:(id<FBXCAccessibilityElement>)element
 {
-  dispatch_once(&oncePayloadToken, ^{
-    FBShouldUsePayloadForUIDExtraction = [element respondsToSelector:@selector(payload)];
-  });
-  unsigned long long elementId;
-  if (FBShouldUsePayloadForUIDExtraction) {
-    elementId = [[element.payload objectForKey:@"uid.elementID"] longLongValue];
-  } else {
-    elementId = [[element valueForKey:@"_elementID"] longLongValue];
-  }
+  unsigned long long elementId = [self.class idWithAccessibilityElement:element];
   int processId = element.processIdentifier;
   if (elementId < 1 || processId < 1) {
     return nil;
@@ -133,4 +124,16 @@ static dispatch_once_t oncePayloadToken;
   return uuidValue.UUIDString;
 }
 
+static BOOL FBShouldUsePayloadForUIDExtraction = YES;
+static dispatch_once_t oncePayloadToken;
++ (unsigned long long)idWithAccessibilityElement:(id<FBXCAccessibilityElement>)element
+{
+  dispatch_once(&oncePayloadToken, ^{
+    FBShouldUsePayloadForUIDExtraction = [(NSObject *)element respondsToSelector:@selector(payload)];
+  });
+  return FBShouldUsePayloadForUIDExtraction
+    ? [[element.payload objectForKey:@"uid.elementID"] longLongValue]
+    : [[(NSObject *)element valueForKey:@"_elementID"] longLongValue];
+}
+
 @end

package/WebDriverAgentLib/Routing/FBResponsePayload.m

@@ -90,35 +90,36 @@ id<FBResponsePayload> FBResponseWithStatus(FBCommandStatus *status)
 
 inline NSDictionary *FBDictionaryResponseWithElement(XCUIElement *element, BOOL compact)
 {
-  XCElementSnapshot *snapshot = nil;
+  id<FBXCElementSnapshot> snapshot = nil;
   if (nil != element.query.rootElementSnapshot) {
     snapshot = element.fb_cachedSnapshot;
   }
   if (nil == snapshot) {
     snapshot = element.lastSnapshot ?: element.fb_takeSnapshot;
   }
-  NSMutableDictionary *dictionary = FBInsertElement(@{}, (NSString *)snapshot.wdUID).mutableCopy;
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+  NSMutableDictionary *dictionary = FBInsertElement(@{}, (NSString *)wrappedSnapshot.wdUID).mutableCopy;
   if (!compact) {
     NSArray *fields = [FBConfiguration.elementResponseAttributes componentsSeparatedByString:@","];
     for (NSString *field in fields) {
       // 'name' here is the w3c-approved identifier for what we mean by 'type'
       if ([field isEqualToString:@"name"] || [field isEqualToString:@"type"]) {
-        dictionary[field] = snapshot.wdType;
+        dictionary[field] = wrappedSnapshot.wdType;
       } else if ([field isEqualToString:@"text"]) {
-        dictionary[field] = FBFirstNonEmptyValue(snapshot.wdValue, snapshot.wdLabel) ?: [NSNull null];
+        dictionary[field] = FBFirstNonEmptyValue(wrappedSnapshot.wdValue, wrappedSnapshot.wdLabel) ?: [NSNull null];
       } else if ([field isEqualToString:@"rect"]) {
-        dictionary[field] = snapshot.wdRect;
+        dictionary[field] = wrappedSnapshot.wdRect;
       } else if ([field isEqualToString:@"enabled"]) {
-        dictionary[field] = @(snapshot.wdEnabled);
+        dictionary[field] = @(wrappedSnapshot.wdEnabled);
       } else if ([field isEqualToString:@"displayed"]) {
-        dictionary[field] = @(snapshot.wdVisible);
+        dictionary[field] = @(wrappedSnapshot.wdVisible);
       } else if ([field isEqualToString:@"selected"]) {
-        dictionary[field] = @(snapshot.wdSelected);
+        dictionary[field] = @(wrappedSnapshot.wdSelected);
       } else if ([field isEqualToString:@"label"]) {
-        dictionary[field] = snapshot.wdLabel ?: [NSNull null];
+        dictionary[field] = wrappedSnapshot.wdLabel ?: [NSNull null];
       } else if ([field hasPrefix:arbitraryAttrPrefix]) {
         NSString *attributeName = [field substringFromIndex:[arbitraryAttrPrefix length]];
-        dictionary[field] = [snapshot fb_valueForWDAttributeName:attributeName] ?: [NSNull null];
+        dictionary[field] = [wrappedSnapshot fb_valueForWDAttributeName:attributeName] ?: [NSNull null];
       }
     }
   }

package/WebDriverAgentLib/Routing/FBSession.m

@@ -12,6 +12,7 @@
 
 #import <objc/runtime.h>
 
+#import "FBXCAccessibilityElement.h"
 #import "FBAlertsMonitor.h"
 #import "FBApplication.h"
 #import "FBConfiguration.h"
@@ -19,7 +20,6 @@
 #import "FBExceptions.h"
 #import "FBMacros.h"
 #import "FBXCodeCompatibility.h"
-#import "XCAccessibilityElement.h"
 #import "XCUIApplication+FBQuiescence.h"
 #import "XCUIElement.h"
 

package/{PrivateHeaders/XCTest/XCAccessibilityElement.h → WebDriverAgentLib/Routing/FBXCAccessibilityElement.h}

@@ -1,21 +1,18 @@
-//
-//     Generated by class-dump 3.5 (64 bit).
-//
-//     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
-//
-
-// FIXME: Probably we can remove here. instead, probably we should follow only XCElementSnapshot
-
-@class NSString;
-
-@interface XCAccessibilityElement : NSObject <NSCopying, NSSecureCoding>
-{
-    NSString *_context;
-    id _payload;
-    int _processIdentifier;
-    struct __AXUIElement *_axElement;
-    unsigned long long _elementType;
-}
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <XCTest/XCTest.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol FBXCAccessibilityElement <NSObject>
+
 @property(readonly) id payload; // @synthesize payload=_payload;
 @property(readonly) int processIdentifier; // @synthesize processIdentifier=_processIdentifier;
 @property(readonly) const struct __AXUIElement *AXUIElement; // @synthesize AXUIElement=_axElement;
@@ -32,3 +29,7 @@
 - (id)init;
 
 @end
+
+BOOL FBIsAXElementEqualToOther(id<FBXCAccessibilityElement> first, id<FBXCAccessibilityElement> second);
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/{Categories/XCAccessibilityElement+FBComparison.m → Routing/FBXCAccessibilityElement.m}

@@ -7,18 +7,12 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "XCAccessibilityElement+FBComparison.h"
-#import "FBElementUtils.h"
+#import "FBXCAccessibilityElement.h"
 
-@implementation XCAccessibilityElement (FBComparison)
+#import "FBElementUtils.h"
 
-- (BOOL)fb_isEqualToElement:(XCAccessibilityElement *)other
+BOOL FBIsAXElementEqualToOther(id<FBXCAccessibilityElement> first, id<FBXCAccessibilityElement> second)
 {
-  if (nil == other) {
-    return NO;
-  }
-  return [[FBElementUtils uidWithAccessibilityElement:self]
-          isEqualToString:([FBElementUtils uidWithAccessibilityElement:other] ?: @"")];
+  return nil != second && [[FBElementUtils uidWithAccessibilityElement:first]
+          isEqualToString:([FBElementUtils uidWithAccessibilityElement:second] ?: @"")];
 }
-
-@end