appium-webdriveragent 4.7.0 → 4.8.2

package/WebDriverAgentLib/Categories/{XCElementSnapshot+FBHelpers.h → FBXCElementSnapshotWrapper+Helpers.h}

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) 2018-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
@@ -7,11 +7,11 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <WebDriverAgentLib/XCElementSnapshot.h>
+#import "FBXCElementSnapshotWrapper.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface XCElementSnapshot (FBHelpers)
+@interface FBXCElementSnapshotWrapper (Helpers)
 
 /**
  Returns an array of descendants matching given type
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param type requested descendant type
  @return an array of descendants matching given type
  */
-- (NSArray<XCElementSnapshot *> *)fb_descendantsMatchingType:(XCUIElementType)type;
+- (NSArray<id<FBXCElementSnapshot>> *)fb_descendantsMatchingType:(XCUIElementType)type;
 
 /**
  Returns first (going up element tree) parent that matches given type. If non found returns nil.
@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param type requested parent type
  @return parent element matching given type
  */
-- (nullable XCElementSnapshot *)fb_parentMatchingType:(XCUIElementType)type;
+- (nullable id<FBXCElementSnapshot>)fb_parentMatchingType:(XCUIElementType)type;
 
 /**
  Returns first (going up element tree) parent that matches one of given types. If non found returns nil.
@@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param types possible parent types
  @return parent element matching one of given types
  */
-- (nullable XCElementSnapshot *)fb_parentMatchingOneOfTypes:(NSArray<NSNumber *> *)types;
+- (nullable id<FBXCElementSnapshot>)fb_parentMatchingOneOfTypes:(NSArray<NSNumber *> *)types;
 
 /**
  Returns first (going up element tree) visible parent that matches one of given types and has more than one child. If non found returns nil.
@@ -44,14 +44,14 @@ NS_ASSUME_NONNULL_BEGIN
  @param filter will filter results even further after matching one of given types
  @return parent element matching one of given types and satisfying filter condition
  */
-- (nullable XCElementSnapshot *)fb_parentMatchingOneOfTypes:(NSArray<NSNumber *> *)types filter:(BOOL(^)(XCElementSnapshot *snapshot))filter;
+- (nullable id<FBXCElementSnapshot>)fb_parentMatchingOneOfTypes:(NSArray<NSNumber *> *)types filter:(BOOL(^)(id<FBXCElementSnapshot> snapshot))filter;
 
 /**
  Retrieves the list of all element ancestors in the snapshot hierarchy.
  
  @return the list of element ancestors or an empty list if the snapshot has no parent.
  */
-- (NSArray<XCElementSnapshot *> *)fb_ancestors;
+- (NSArray<id<FBXCElementSnapshot>> *)fb_ancestors;
 
 /**
  Returns value for given accessibility property identifier.
@@ -68,21 +68,21 @@ NS_ASSUME_NONNULL_BEGIN
  @param snapshot element's snapshot to compare against
  @return YES, if they match otherwise NO
  */
-- (BOOL)fb_framelessFuzzyMatchesElement:(XCElementSnapshot *)snapshot;
+- (BOOL)fb_framelessFuzzyMatchesElement:(id<FBXCElementSnapshot>)snapshot;
 
 /**
  Returns an array of descendants cell snapshots
  
  @return an array of descendants cell snapshots
  */
-- (NSArray<XCElementSnapshot *> *)fb_descendantsCellSnapshots;
+- (NSArray<id<FBXCElementSnapshot>> *)fb_descendantsCellSnapshots;
 
 /**
  Returns itself if it is either XCUIElementTypeIcon or XCUIElementTypeCell. Otherwise, returns first (going up element tree) parent that matches cell (XCUIElementTypeCell or  XCUIElementTypeIcon). If non found returns nil.
  
  @return parent element matching either XCUIElementTypeIcon or XCUIElementTypeCell.
  */
-- (nullable XCElementSnapshot *)fb_parentCellSnapshot;
+- (nullable id<FBXCElementSnapshot>)fb_parentCellSnapshot;
 
 /**! Human-readable snapshot description */
 - (NSString *)fb_description;
@@ -94,6 +94,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (CGRect)fb_visibleFrameWithFallback;
 
+/**
+ Wrapper for Apple's hitpoint, thats resolves few known issues
+
+ @return Element's hitpoint if exists nil otherwise
+ */
+- (nullable NSValue *)fb_hitPoint;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/{XCElementSnapshot+FBHelpers.m → FBXCElementSnapshotWrapper+Helpers.m}

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) 2018-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
@@ -7,20 +7,23 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "XCElementSnapshot+FBHelpers.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 
 #import "FBFindElementCommands.h"
 #import "FBRunLoopSpinner.h"
 #import "FBLogger.h"
+#import "FBXCElementSnapshot.h"
 #import "FBXCAXClientProxy.h"
 #import "XCTestDriver.h"
 #import "XCTestPrivateSymbols.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
+#import "XCUIHitPointResult.h"
 
-inline static BOOL isSnapshotTypeAmongstGivenTypes(XCElementSnapshot* snapshot, NSArray<NSNumber *> *types);
+inline static BOOL isSnapshotTypeAmongstGivenTypes(id<FBXCElementSnapshot> snapshot,
+                                                   NSArray<NSNumber *> *types);
 
-@implementation XCElementSnapshot (FBHelpers)
+@implementation FBXCElementSnapshotWrapper (Helpers)
 
 - (NSString *)fb_description
 {
@@ -31,29 +34,30 @@ inline static BOOL isSnapshotTypeAmongstGivenTypes(XCElementSnapshot* snapshot,
   return result;
 }
 
-- (NSArray<XCElementSnapshot *> *)fb_descendantsMatchingType:(XCUIElementType)type
+- (NSArray<id<FBXCElementSnapshot>> *)fb_descendantsMatchingType:(XCUIElementType)type
 {
-  return [self descendantsByFilteringWithBlock:^BOOL(XCElementSnapshot *snapshot) {
+  return [self descendantsByFilteringWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot) {
     return snapshot.elementType == type;
   }];
 }
 
-- (XCElementSnapshot *)fb_parentMatchingType:(XCUIElementType)type
+- (id<FBXCElementSnapshot>)fb_parentMatchingType:(XCUIElementType)type
 {
   NSArray *acceptedParents = @[@(type)];
   return [self fb_parentMatchingOneOfTypes:acceptedParents];
 }
 
-- (XCElementSnapshot *)fb_parentMatchingOneOfTypes:(NSArray<NSNumber *> *)types
+- (id<FBXCElementSnapshot>)fb_parentMatchingOneOfTypes:(NSArray<NSNumber *> *)types
 {
-  return [self fb_parentMatchingOneOfTypes:types filter:^(XCElementSnapshot *snapshot) {
+  return [self fb_parentMatchingOneOfTypes:types filter:^(id<FBXCElementSnapshot> snapshot) {
     return YES;
   }];
 }
 
-- (XCElementSnapshot *)fb_parentMatchingOneOfTypes:(NSArray<NSNumber *> *)types filter:(BOOL(^)(XCElementSnapshot *snapshot))filter
+- (id<FBXCElementSnapshot>)fb_parentMatchingOneOfTypes:(NSArray<NSNumber *> *)types
+                                              filter:(BOOL(^)(id<FBXCElementSnapshot> snapshot))filter
 {
-  XCElementSnapshot *snapshot = self.parent;
+  id<FBXCElementSnapshot> snapshot = self.parent;
   while (snapshot && !(isSnapshotTypeAmongstGivenTypes(snapshot, types) && filter(snapshot))) {
     snapshot = snapshot.parent;
   }
@@ -73,12 +77,15 @@ inline static BOOL areValuesEqualOrBlank(id value1, id value2);
 
 inline static BOOL isNilOrEmpty(id value);
 
-- (BOOL)fb_framelessFuzzyMatchesElement:(XCElementSnapshot *)snapshot
+- (BOOL)fb_framelessFuzzyMatchesElement:(id<FBXCElementSnapshot>)snapshot
 {
     // Pure payload-based comparison sometimes yield false negatives, therefore relying on it only if all of the identifying properties are blank
-  if (isNilOrEmpty(self.identifier) && isNilOrEmpty(self.title) && isNilOrEmpty(self.label) &&
-      isNilOrEmpty(self.value) && isNilOrEmpty(self.placeholderValue)) {
-    return [self.wdUID isEqualToString:(snapshot.wdUID ?: @"")];
+  if (isNilOrEmpty(self.identifier)
+      && isNilOrEmpty(self.title)
+      && isNilOrEmpty(self.label)
+      && isNilOrEmpty(self.value)
+      && isNilOrEmpty(self.placeholderValue)) {
+    return [self.wdUID isEqualToString:([FBXCElementSnapshotWrapper ensureWrapped:snapshot].wdUID ?: @"")];
   }
   
   // Sometimes value and placeholderValue of a correct match from different snapshots are not the same (one is nil and one is a blank string)
@@ -91,27 +98,27 @@ inline static BOOL isNilOrEmpty(id value);
     areValuesEqualOrBlank(self.placeholderValue, snapshot.placeholderValue);
 }
 
-- (NSArray<XCElementSnapshot *> *)fb_descendantsCellSnapshots
+- (NSArray<id<FBXCElementSnapshot>> *)fb_descendantsCellSnapshots
 {
-  NSArray<XCElementSnapshot *> *cellSnapshots = [self fb_descendantsMatchingType:XCUIElementTypeCell];
-    
+  NSArray<id<FBXCElementSnapshot>> *cellSnapshots = [self fb_descendantsMatchingType:XCUIElementTypeCell];
+  
   if (cellSnapshots.count == 0) {
-      // For the home screen, cells are actually of type XCUIElementTypeIcon
-      cellSnapshots = [self fb_descendantsMatchingType:XCUIElementTypeIcon];
+    // For the home screen, cells are actually of type XCUIElementTypeIcon
+    cellSnapshots = [self fb_descendantsMatchingType:XCUIElementTypeIcon];
   }
-   
+  
   if (cellSnapshots.count == 0) {
-      // In some cases XCTest will not report Cell Views. In that case grab all descendants and try to figure out scroll directon from them.
-      cellSnapshots = self._allDescendants;
+    // In some cases XCTest will not report Cell Views. In that case grab all descendants and try to figure out scroll directon from them.
+    cellSnapshots = self._allDescendants;
   }
   
-    return cellSnapshots;
+  return cellSnapshots;
 }
 
-- (NSArray<XCElementSnapshot *> *)fb_ancestors
+- (NSArray<id<FBXCElementSnapshot>> *)fb_ancestors
 {
-  NSMutableArray<XCElementSnapshot *> *ancestors = [NSMutableArray array];
-  XCElementSnapshot *parent = self.parent;
+  NSMutableArray<id<FBXCElementSnapshot>> *ancestors = [NSMutableArray array];
+  id<FBXCElementSnapshot> parent = self.parent;
   while (parent) {
     [ancestors addObject:parent];
     parent = parent.parent;
@@ -119,18 +126,18 @@ inline static BOOL isNilOrEmpty(id value);
   return ancestors.copy;
 }
 
-- (XCElementSnapshot *)fb_parentCellSnapshot
+- (id<FBXCElementSnapshot>)fb_parentCellSnapshot
 {
-    XCElementSnapshot *targetCellSnapshot = self;
-    // XCUIElementTypeIcon is the cell type for homescreen icons
-    NSArray<NSNumber *> *acceptableElementTypes = @[
-                                                    @(XCUIElementTypeCell),
-                                                    @(XCUIElementTypeIcon),
-                                                    ];
-    if (self.elementType != XCUIElementTypeCell && self.elementType != XCUIElementTypeIcon) {
-        targetCellSnapshot = [self fb_parentMatchingOneOfTypes:acceptableElementTypes];
-    }
-    return targetCellSnapshot;
+  id<FBXCElementSnapshot> targetCellSnapshot = self.snapshot;
+  // XCUIElementTypeIcon is the cell type for homescreen icons
+  NSArray<NSNumber *> *acceptableElementTypes = @[
+                                                  @(XCUIElementTypeCell),
+                                                  @(XCUIElementTypeIcon),
+                                                  ];
+  if (self.elementType != XCUIElementTypeCell && self.elementType != XCUIElementTypeIcon) {
+      targetCellSnapshot = [self fb_parentMatchingOneOfTypes:acceptableElementTypes];
+  }
+  return targetCellSnapshot;
 }
 
 - (CGRect)fb_visibleFrameWithFallback
@@ -156,9 +163,20 @@ inline static BOOL isNilOrEmpty(id value);
   return thisVisibleFrame;
 }
 
+- (NSValue *)fb_hitPoint
+{
+  NSError *error;
+  XCUIHitPointResult *result = [self hitPoint:&error];
+  if (nil != error) {
+    [FBLogger logFmt:@"Failed to fetch hit point for %@ - %@", self.fb_description, error.localizedDescription];
+    return nil;
+  }
+  return [NSValue valueWithCGPoint:result.hitPoint];
+}
+
 @end
 
-inline static BOOL isSnapshotTypeAmongstGivenTypes(XCElementSnapshot* snapshot, NSArray<NSNumber *> *types)
+inline static BOOL isSnapshotTypeAmongstGivenTypes(id<FBXCElementSnapshot> snapshot, NSArray<NSNumber *> *types)
 {
   for (NSUInteger i = 0; i < types.count; i++) {
    if([@(snapshot.elementType) isEqual: types[i]] || [types[i] isEqual: @(XCUIElementTypeAny)]){

package/WebDriverAgentLib/Categories/NSExpression+FBFormat.m

@@ -8,6 +8,7 @@
  */
 
 #import "NSExpression+FBFormat.h"
+
 #import "FBElementUtils.h"
 
 @implementation NSExpression (FBFormat)
@@ -17,14 +18,18 @@
   if ([input expressionType] != NSKeyPathExpressionType) {
     return input;
   }
+  
   NSString *propName = [input keyPath];
   NSUInteger dotPos = [propName rangeOfString:@"."].location;
-  if (NSNotFound != dotPos) {
+  NSString *wdPropName;
+  if (NSNotFound == dotPos) {
+    wdPropName = [FBElementUtils wdAttributeNameForAttributeName:propName];
+  } else {
     NSString *actualPropName = [propName substringToIndex:dotPos];
     NSString *suffix = [propName substringFromIndex:(dotPos + 1)];
-    return [NSExpression expressionForKeyPath:[NSString stringWithFormat:@"%@.%@", [FBElementUtils wdAttributeNameForAttributeName:actualPropName], suffix]];
+    wdPropName = [NSString stringWithFormat:@"%@.%@", [FBElementUtils wdAttributeNameForAttributeName:actualPropName], suffix];
   }
-  return [NSExpression expressionForKeyPath:[FBElementUtils wdAttributeNameForAttributeName:propName]];
+  return [NSExpression expressionForKeyPath:wdPropName];
 }
 
 @end

package/WebDriverAgentLib/Categories/XCUIApplication+FBAlert.m

@@ -10,6 +10,7 @@
 #import "XCUIApplication+FBAlert.h"
 
 #import "FBMacros.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIElement+FBUtilities.h"
 
@@ -21,10 +22,10 @@ NSString *const FB_SAFARI_APP_NAME = @"Safari";
 @implementation XCUIApplication (FBAlert)
 
 - (nullable XCUIElement *)fb_alertElementFromSafariWithScrollView:(XCUIElement *)scrollView
-                                                     viewSnapshot:(XCElementSnapshot *)viewSnapshot
+                                                     viewSnapshot:(id<FBXCElementSnapshot>)viewSnapshot
 {
   CGRect appFrame = viewSnapshot.frame;
-  NSPredicate *dstViewMatchPredicate = [NSPredicate predicateWithBlock:^BOOL(XCElementSnapshot *snapshot, NSDictionary *bindings) {
+  NSPredicate *dstViewMatchPredicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot, NSDictionary *bindings) {
     CGRect curFrame = snapshot.frame;
     if (!CGRectEqualToRect(appFrame, curFrame)
         && curFrame.origin.x > 0 && curFrame.size.width < appFrame.size.width) {
@@ -62,8 +63,8 @@ NSString *const FB_SAFARI_APP_NAME = @"Safari";
   // and conatins at least one text view
   __block NSUInteger buttonsCount = 0;
   __block NSUInteger textViewsCount = 0;
-  XCElementSnapshot *snapshot = candidate.fb_cachedSnapshot ?: candidate.fb_takeSnapshot;
-  [snapshot enumerateDescendantsUsingBlock:^(XCElementSnapshot *descendant) {
+  id<FBXCElementSnapshot> snapshot = candidate.fb_cachedSnapshot ?: candidate.fb_takeSnapshot;
+  [snapshot enumerateDescendantsUsingBlock:^(id<FBXCElementSnapshot> descendant) {
     XCUIElementType curType = descendant.elementType;
     if (curType == XCUIElementTypeButton) {
       buttonsCount++;
@@ -83,7 +84,7 @@ NSString *const FB_SAFARI_APP_NAME = @"Safari";
   if (nil == alert) {
     return nil;
   }
-  XCElementSnapshot *alertSnapshot = alert.fb_cachedSnapshot ?: alert.fb_takeSnapshot;
+  id<FBXCElementSnapshot> alertSnapshot = alert.fb_cachedSnapshot ?: alert.fb_takeSnapshot;
 
   if (alertSnapshot.elementType == XCUIElementTypeAlert) {
     return alert;
@@ -96,7 +97,7 @@ NSString *const FB_SAFARI_APP_NAME = @"Safari";
 
     // In case of iPad we want to check if sheet isn't contained by popover.
     // In that case we ignore it.
-    XCElementSnapshot *ancestor = alertSnapshot.parent;
+    id<FBXCElementSnapshot> ancestor = alertSnapshot.parent;
     while (nil != ancestor) {
       if (nil != ancestor.identifier && [ancestor.identifier isEqualToString:@"PopoverDismissRegion"]) {
         return nil;
@@ -107,7 +108,7 @@ NSString *const FB_SAFARI_APP_NAME = @"Safari";
   }
 
   if (alertSnapshot.elementType == XCUIElementTypeScrollView) {
-    XCElementSnapshot *app = [alertSnapshot fb_parentMatchingType:XCUIElementTypeApplication];
+    id<FBXCElementSnapshot> app = [[FBXCElementSnapshotWrapper ensureWrapped:alertSnapshot] fb_parentMatchingType:XCUIElementTypeApplication];
     if (nil != app && [app.label isEqualToString:FB_SAFARI_APP_NAME]) {
       // Check alert presence in Safari web view
       return [self fb_alertElementFromSafariWithScrollView:alert viewSnapshot:alertSnapshot];

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.h

@@ -10,7 +10,7 @@
 #import <XCTest/XCTest.h>
 
 @class XCElementSnapshot;
-@class XCAccessibilityElement;
+@protocol FBXCAccessibilityElement;
 @class FBXMLGenerationOptions;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -83,7 +83,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param axElements the list of accessibility elements
  @returns The list of dictionaries. Each dictionary contains `bundleId` and `pid` items
  */
-+ (NSArray<NSDictionary<NSString *, id> *> *)fb_appsInfoWithAxElements:(NSArray<XCAccessibilityElement *> *)axElements;
++ (NSArray<NSDictionary<NSString *, id> *> *)fb_appsInfoWithAxElements:(NSArray<id<FBXCAccessibilityElement>> *)axElements;
 
 /**
  Retrieves the information about the currently active apps

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -9,7 +9,6 @@
 
 #import "XCUIApplication+FBHelpers.h"
 
-#import "XCElementSnapshot.h"
 #import "FBElementTypeTransformer.h"
 #import "FBKeyboard.h"
 #import "FBLogger.h"
@@ -18,11 +17,11 @@
 #import "FBActiveAppDetectionPoint.h"
 #import "FBXCodeCompatibility.h"
 #import "FBXPath.h"
+#import "FBXCAccessibilityElement.h"
 #import "FBXCTestDaemonsProxy.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCAXClientProxy.h"
 #import "FBXMLGenerationOptions.h"
-#import "XCAccessibilityElement.h"
-#import "XCElementSnapshot+FBHelpers.h"
 #import "XCUIDevice+FBHelpers.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIElement+FBIsVisible.h"
@@ -41,11 +40,11 @@ static NSString* const FBUnknownBundleId = @"unknown";
 - (BOOL)fb_waitForAppElement:(NSTimeInterval)timeout
 {
   __block BOOL canDetectAxElement = YES;
-  int currentProcessIdentifier = self.accessibilityElement.processIdentifier;
+  int currentProcessIdentifier = [self.accessibilityElement processIdentifier];
   BOOL result = [[[FBRunLoopSpinner new]
            timeout:timeout]
           spinUntilTrue:^BOOL{
-    XCAccessibilityElement *currentAppElement = FBActiveAppDetectionPoint.sharedInstance.axElement;
+    id<FBXCAccessibilityElement> currentAppElement = FBActiveAppDetectionPoint.sharedInstance.axElement;
     canDetectAxElement = nil != currentAppElement;
     if (!canDetectAxElement) {
       return YES;
@@ -57,11 +56,11 @@ static NSString* const FBUnknownBundleId = @"unknown";
     : [self waitForExistenceWithTimeout:timeout];
 }
 
-+ (NSArray<NSDictionary<NSString *, id> *> *)fb_appsInfoWithAxElements:(NSArray<XCAccessibilityElement *> *)axElements
++ (NSArray<NSDictionary<NSString *, id> *> *)fb_appsInfoWithAxElements:(NSArray<id<FBXCAccessibilityElement>> *)axElements
 {
   NSMutableArray<NSDictionary<NSString *, id> *> *result = [NSMutableArray array];
   id<XCTestManager_ManagerInterface> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
-  for (XCAccessibilityElement *axElement in axElements) {
+  for (id<FBXCAccessibilityElement> axElement in axElements) {
     NSMutableDictionary<NSString *, id> *appInfo = [NSMutableDictionary dictionary];
     pid_t pid = axElement.processIdentifier;
     appInfo[@"pid"] = @(pid);
@@ -100,7 +99,7 @@ static NSString* const FBUnknownBundleId = @"unknown";
 
 - (NSDictionary *)fb_tree
 {
-  XCElementSnapshot *snapshot = self.fb_isResolvedFromCache.boolValue
+  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
     ? self.lastSnapshot
     : [self fb_snapshotWithAllAttributesAndMaxDepth:nil];
   return [self.class dictionaryForElement:snapshot recursive:YES];
@@ -108,27 +107,28 @@ static NSString* const FBUnknownBundleId = @"unknown";
 
 - (NSDictionary *)fb_accessibilityTree
 {
-  XCElementSnapshot *snapshot = self.fb_isResolvedFromCache.boolValue
+  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
     ? self.lastSnapshot
     : [self fb_snapshotWithAllAttributesAndMaxDepth:nil];
   return [self.class accessibilityInfoForElement:snapshot];
 }
 
-+ (NSDictionary *)dictionaryForElement:(XCElementSnapshot *)snapshot recursive:(BOOL)recursive
++ (NSDictionary *)dictionaryForElement:(id<FBXCElementSnapshot>)snapshot recursive:(BOOL)recursive
 {
   NSMutableDictionary *info = [[NSMutableDictionary alloc] init];
   info[@"type"] = [FBElementTypeTransformer shortStringWithElementType:snapshot.elementType];
   info[@"rawIdentifier"] = FBValueOrNull([snapshot.identifier isEqual:@""] ? nil : snapshot.identifier);
-  info[@"name"] = FBValueOrNull(snapshot.wdName);
-  info[@"value"] = FBValueOrNull(snapshot.wdValue);
-  info[@"label"] = FBValueOrNull(snapshot.wdLabel);
-  info[@"rect"] = snapshot.wdRect;
-  info[@"frame"] = NSStringFromCGRect(snapshot.wdFrame);
-  info[@"isEnabled"] = [@([snapshot isWDEnabled]) stringValue];
-  info[@"isVisible"] = [@([snapshot isWDVisible]) stringValue];
-  info[@"isAccessible"] = [@([snapshot isWDAccessible]) stringValue];
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+  info[@"name"] = FBValueOrNull(wrappedSnapshot.wdName);
+  info[@"value"] = FBValueOrNull(wrappedSnapshot.wdValue);
+  info[@"label"] = FBValueOrNull(wrappedSnapshot.wdLabel);
+  info[@"rect"] = wrappedSnapshot.wdRect;
+  info[@"frame"] = NSStringFromCGRect(wrappedSnapshot.wdFrame);
+  info[@"isEnabled"] = [@([wrappedSnapshot isWDEnabled]) stringValue];
+  info[@"isVisible"] = [@([wrappedSnapshot isWDVisible]) stringValue];
+  info[@"isAccessible"] = [@([wrappedSnapshot isWDAccessible]) stringValue];
 #if TARGET_OS_TV
-  info[@"isFocused"] = [@([snapshot isWDFocused]) stringValue];
+  info[@"isFocused"] = [@([wrappedSnapshot isWDFocused]) stringValue];
 #endif
 
   if (!recursive) {
@@ -138,28 +138,29 @@ static NSString* const FBUnknownBundleId = @"unknown";
   NSArray *childElements = snapshot.children;
   if ([childElements count]) {
     info[@"children"] = [[NSMutableArray alloc] init];
-    for (XCElementSnapshot *childSnapshot in childElements) {
+    for (id<FBXCElementSnapshot> childSnapshot in childElements) {
       [info[@"children"] addObject:[self dictionaryForElement:childSnapshot recursive:YES]];
     }
   }
   return info;
 }
 
-+ (NSDictionary *)accessibilityInfoForElement:(XCElementSnapshot *)snapshot
++ (NSDictionary *)accessibilityInfoForElement:(id<FBXCElementSnapshot>)snapshot
 {
-  BOOL isAccessible = [snapshot isWDAccessible];
-  BOOL isVisible = [snapshot isWDVisible];
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+  BOOL isAccessible = [wrappedSnapshot isWDAccessible];
+  BOOL isVisible = [wrappedSnapshot isWDVisible];
 
   NSMutableDictionary *info = [[NSMutableDictionary alloc] init];
 
   if (isAccessible) {
     if (isVisible) {
-      info[@"value"] = FBValueOrNull(snapshot.wdValue);
-      info[@"label"] = FBValueOrNull(snapshot.wdLabel);
+      info[@"value"] = FBValueOrNull(wrappedSnapshot.wdValue);
+      info[@"label"] = FBValueOrNull(wrappedSnapshot.wdLabel);
     }
   } else {
     NSMutableArray *children = [[NSMutableArray alloc] init];
-    for (XCElementSnapshot *childSnapshot in snapshot.children) {
+    for (id<FBXCElementSnapshot> childSnapshot in snapshot.children) {
       NSDictionary *childInfo = [self accessibilityInfoForElement:childSnapshot];
       if ([childInfo count]) {
         [children addObject: childInfo];
@@ -172,7 +173,7 @@ static NSString* const FBUnknownBundleId = @"unknown";
   if ([info count]) {
     info[@"type"] = [FBElementTypeTransformer shortStringWithElementType:snapshot.elementType];
     info[@"rawIdentifier"] = FBValueOrNull([snapshot.identifier isEqual:@""] ? nil : snapshot.identifier);
-    info[@"name"] = FBValueOrNull(snapshot.wdName);
+    info[@"name"] = FBValueOrNull(wrappedSnapshot.wdName);
   } else {
     return nil;
   }
@@ -243,7 +244,7 @@ static NSString* const FBUnknownBundleId = @"unknown";
   };
 
   if (nil != keyNames && keyNames.count > 0) {
-    NSPredicate *searchPredicate = [NSPredicate predicateWithBlock:^BOOL(XCElementSnapshot *snapshot, NSDictionary *bindings) {
+    NSPredicate *searchPredicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot, NSDictionary *bindings) {
       if (snapshot.elementType != XCUIElementTypeKey && snapshot.elementType != XCUIElementTypeButton) {
         return NO;
       }

package/WebDriverAgentLib/Categories/XCUIApplicationProcess+FBQuiescence.m

@@ -40,6 +40,9 @@ static void swizzledWaitForQuiescenceIncludingAnimationsIdle(id self, SEL _cmd,
 
 @implementation XCUIApplicationProcess (FBQuiescence)
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-load-method"
+
 + (void)load
 {
   Method waitForQuiescenceIncludingAnimationsIdleMethod = class_getInstanceMethod(self.class, @selector(waitForQuiescenceIncludingAnimationsIdle:));
@@ -51,6 +54,8 @@ static void swizzledWaitForQuiescenceIncludingAnimationsIdle(id self, SEL _cmd,
   }
 }
 
+#pragma clang diagnostic pop
+
 static char XCUIAPPLICATIONPROCESS_SHOULD_WAIT_FOR_QUIESCENCE;
 
 @dynamic fb_shouldWaitForQuiescence;

package/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.m

@@ -11,7 +11,6 @@
 
 #import "XCUICoordinate.h"
 #import "XCUIElement+FBUtilities.h"
-#import "XCElementSnapshot+FBHitPoint.h"
 
 # if !TARGET_OS_TV
 @implementation XCUICoordinate (FBFix)

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -19,9 +19,9 @@
 #import "FBMacros.h"
 #import "FBMathUtils.h"
 #import "FBScreenshot.h"
+#import "FBXCDeviceEvent.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIDevice.h"
-#import "XCDeviceEvent.h"
 
 static const NSTimeInterval FBHomeButtonCoolOffTime = 1.;
 static const NSTimeInterval FBScreenLockTimeout = 5.;
@@ -30,11 +30,16 @@ static const NSTimeInterval FBScreenLockTimeout = 5.;
 
 static bool fb_isLocked;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-load-method"
+
 + (void)load
 {
   [self fb_registerAppforDetectLockState];
 }
 
+#pragma clang diagnostic pop
+
 + (void)fb_registerAppforDetectLockState
 {
   int notify_token;
@@ -303,10 +308,8 @@ static bool fb_isLocked;
                             duration:(NSTimeInterval)duration
                                error:(NSError **)error
 {
-  XCDeviceEvent *event = [XCDeviceEvent deviceEventWithPage:page
-                                                      usage:usage
-                                                   duration:duration];
-  return [self performDeviceEvent:event error:error];
+  id<FBXCDeviceEvent> event = FBCreateXCDeviceEvent(page, usage, duration, error);
+  return nil == event ? NO : [self performDeviceEvent:event error:error];
 }
 
 - (BOOL)fb_setAppearance:(FBUIInterfaceAppearance)appearance error:(NSError **)error

package/WebDriverAgentLib/Categories/XCUIElement+FBAccessibility.h

@@ -7,8 +7,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <WebDriverAgentLib/XCElementSnapshot.h>
 #import <WebDriverAgentLib/XCUIElement.h>
+#import "FBXCElementSnapshotWrapper.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 
-@interface XCElementSnapshot (FBAccessibility)
+@interface FBXCElementSnapshotWrapper (FBAccessibility)
 
 /*! Whether or not the element in snapshot is accessible */
 @property (atomic, readonly) BOOL fb_isAccessibilityElement;

package/WebDriverAgentLib/Categories/XCUIElement+FBAccessibility.m

@@ -10,21 +10,22 @@
 #import "XCUIElement+FBAccessibility.h"
 
 #import "FBConfiguration.h"
-#import "XCElementSnapshot+FBHelpers.h"
 #import "XCTestPrivateSymbols.h"
 #import "XCUIElement+FBUtilities.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 
 @implementation XCUIElement (FBAccessibility)
 
 - (BOOL)fb_isAccessibilityElement
 {
-  return [self fb_snapshotWithAttributes:@[FB_XCAXAIsElementAttributeName]
-                                maxDepth:@1].fb_isAccessibilityElement;
+  id<FBXCElementSnapshot> snapshot = [self fb_snapshotWithAttributes:@[FB_XCAXAIsElementAttributeName]
+                                                            maxDepth:@1];
+  return [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_isAccessibilityElement;
 }
 
 @end
 
-@implementation XCElementSnapshot (FBAccessibility)
+@implementation FBXCElementSnapshotWrapper (FBAccessibility)
 
 - (BOOL)fb_isAccessibilityElement
 {