appium-webdriveragent 4.7.0 → 4.8.2

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

package/WebDriverAgentLib/Routing/FBXCDeviceEvent.h

@@ -0,0 +1,35 @@
+/**
+ * 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 FBXCDeviceEvent
+
+@property unsigned long long type; // @synthesize type=_type;
+@property double rotation; // @synthesize rotation=_rotation;
+@property double duration; // @synthesize duration=_duration;
+@property unsigned int usage; // @synthesize usage=_usage;
+@property unsigned int eventPage; // @synthesize eventPage=_eventPage;
+@property(readonly) BOOL isButtonHoldEvent;
+
++ (id)deviceEventForDigitalCrownRotation:(double)arg1 velocity:(double)arg2;
++ (id)deviceEventWithPage:(unsigned int)arg1 usage:(unsigned int)arg2 duration:(double)arg3;
+
+- (void)dispatch;
+
+@end
+
+_Nullable id<FBXCDeviceEvent> FBCreateXCDeviceEvent(unsigned int page,
+                                                    unsigned int usage,
+                                                    double duration,
+                                                    NSError **error);
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Routing/FBXCDeviceEvent.m

@@ -0,0 +1,43 @@
+/**
+ * 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 "FBXCDeviceEvent.h"
+
+#import "FBErrorBuilder.h"
+
+id<FBXCDeviceEvent> FBCreateXCDeviceEvent(unsigned int page,
+                                          unsigned int usage,
+                                          double duration,
+                                          NSError **error)
+{
+  Class xcDeviceEventClass = NSClassFromString(@"XCDeviceEvent");
+  if (nil == xcDeviceEventClass) {
+    [[[FBErrorBuilder builder]
+      withDescription:@"Cannot find XCDeviceEvent class"]
+     buildError:error];
+    return nil;
+  }
+  SEL deviceEventFactorySelector = NSSelectorFromString(@"deviceEventWithPage:usage:duration:");
+  if (![xcDeviceEventClass respondsToSelector:deviceEventFactorySelector]) {
+    [[[FBErrorBuilder builder]
+      withDescription:@"'deviceEventWithPage:usage:duration:' factory method is not found on XCDeviceEvent class"]
+     buildError:error];
+    return nil;
+  }
+  NSMethodSignature *deviceEventFactorySignature = [xcDeviceEventClass methodSignatureForSelector:deviceEventFactorySelector];
+  NSInvocation *deviceEventFactoryInvocation = [NSInvocation invocationWithMethodSignature:deviceEventFactorySignature];
+  [deviceEventFactoryInvocation setSelector:deviceEventFactorySelector];
+  [deviceEventFactoryInvocation setArgument:&page atIndex:2];
+  [deviceEventFactoryInvocation setArgument:&usage atIndex:3];
+  [deviceEventFactoryInvocation setArgument:&duration atIndex:4];
+  [deviceEventFactoryInvocation invokeWithTarget:xcDeviceEventClass];
+  id<FBXCDeviceEvent> __unsafe_unretained instance;
+  [deviceEventFactoryInvocation getReturnValue:&instance];
+  return instance;
+}

package/{PrivateHeaders/XCTest/XCElementSnapshot.h → WebDriverAgentLib/Routing/FBXCElementSnapshot.h}

@@ -1,41 +1,21 @@
-//
-//     Generated by class-dump 3.5 (64 bit).
-//
-//     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
-//
+/**
+ * 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>
 #import <WebDriverAgentLib/CDStructures.h>
 
-#import <XCTest/XCUIElementAttributes.h>
+@protocol FBXCAccessibilityElement;
 
-@class NSArray, NSDictionary, NSString, NSArray, XCAccessibilityElement, XCUIApplication;
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol FBXCElementSnapshot <NSObject, XCUIElementAttributes>
 
-@interface XCElementSnapshot : NSObject <XCUIElementAttributes, NSSecureCoding>
-{
-    NSString *_identifier;
-    id _value;
-    NSString *_placeholderValue;
-    BOOL _enabled;
-    BOOL _selected;
-    BOOL _isMainWindow;
-    BOOL _hasKeyboardFocus;
-    BOOL _hasFocus;
-    XCUIApplication *_application;
-    unsigned long long _generation;
-    NSString *_title;
-    NSString *_label;
-    unsigned long long _elementType;
-    long long _horizontalSizeClass;
-    long long _verticalSizeClass;
-    XCAccessibilityElement *_accessibilityElement;
-    XCAccessibilityElement *_parentAccessibilityElement;
-    XCElementSnapshot *_parent;
-    NSArray *_children;
-    unsigned long long _traits;
-    NSArray *_userTestingAttributes;
-    NSDictionary *_additionalAttributes;
-    struct CGRect _frame;
-}
 @property BOOL hasFocus; // @synthesize hasFocus=_hasFocus;
 @property BOOL hasKeyboardFocus; // @synthesize hasKeyboardFocus=_hasKeyboardFocus;
 @property(copy) NSDictionary *additionalAttributes; // @synthesize additionalAttributes=_additionalAttributes;
@@ -43,15 +23,15 @@
 @property unsigned long long traits; // @synthesize traits=_traits;
 @property BOOL isMainWindow; // @synthesize isMainWindow=_isMainWindow;
 @property(copy) NSArray *children; // @synthesize children=_children;
-@property XCElementSnapshot *parent; // @synthesize parent=_parent;
-@property(retain) XCAccessibilityElement *parentAccessibilityElement; // @synthesize parentAccessibilityElement=_parentAccessibilityElement;
-@property(retain) XCAccessibilityElement *accessibilityElement; // @synthesize accessibilityElement=_accessibilityElement;
+@property id<FBXCElementSnapshot> parent; // @synthesize parent=_parent;
+@property(retain) id<FBXCAccessibilityElement> parentAccessibilityElement; // @synthesize parentAccessibilityElement=_parentAccessibilityElement;
+@property(retain) id<FBXCAccessibilityElement> accessibilityElement; // @synthesize accessibilityElement=_accessibilityElement;
 @property(readonly) NSArray *suggestedHitpoints;
 @property(readonly) struct CGRect visibleFrame;
-@property(readonly) XCElementSnapshot *scrollView;
+@property(readonly) id<FBXCElementSnapshot> scrollView;
 @property(readonly, copy) NSString *truncatedValueString;
 @property(readonly) long long depth;
-@property(readonly, copy) XCElementSnapshot *pathFromRoot;
+@property(readonly, copy) id<FBXCElementSnapshot> pathFromRoot;
 @property(readonly) BOOL isTopLevelTouchBarElement;
 @property(readonly) BOOL isTouchBarElement;
 @property(readonly, copy) NSString *sparseTreeDescription;
@@ -78,11 +58,11 @@
 - (BOOL)matchesTreeWithRoot:(id)arg1;
 - (void)mergeTreeWithSnapshot:(id)arg1;
 - (id)_childMatchingElement:(id)arg1;
-- (NSArray<XCElementSnapshot *> *)_allDescendants;
+- (NSArray<id<FBXCElementSnapshot>> *)_allDescendants;
 - (BOOL)hasDescendantMatchingFilter:(CDUnknownBlockType)arg1;
-- (NSArray<XCElementSnapshot *> *)descendantsByFilteringWithBlock:(BOOL(^)(XCElementSnapshot *snapshot))block;
+- (NSArray<id<FBXCElementSnapshot>> *)descendantsByFilteringWithBlock:(BOOL(^)(id<FBXCElementSnapshot> snapshot))block;
 - (id)elementSnapshotMatchingAccessibilityElement:(id)arg1;
-- (void)enumerateDescendantsUsingBlock:(void(^)(XCElementSnapshot *snapshot))block;
+- (void)enumerateDescendantsUsingBlock:(void(^)(id<FBXCElementSnapshot> snapshot))block;
 - (id)recursiveDescriptionWithIndent:(id)arg1 includeAccessibilityElement:(BOOL)arg2;
 - (id)init;
 - (struct CGPoint)hostingAndOrientationTransformedPoint:(struct CGPoint)arg1;
@@ -92,11 +72,12 @@
 // Available since Xcode 10
 - (id)hitPoint:(NSError **)error;
 
-// Available since Xcode 10.0-beta4 on
-+ (id)axAttributesForElementSnapshotKeyPaths:(id)arg1;
 // Since Xcode 10.2
 + (id)axAttributesForElementSnapshotKeyPaths:(id)arg1 isMacOS:(_Bool)arg2;
 // Since Xcode 10.0
-+ (NSArray<NSString *> *)sanitizedElementSnapshotHierarchyAttributesForAttributes:(NSArray<NSString *> *)arg1 isMacOS:(_Bool)arg2;
++ (NSArray<NSString *> *)sanitizedElementSnapshotHierarchyAttributesForAttributes:(nullable NSArray<NSString *> *)arg1
+                                                                          isMacOS:(_Bool)arg2;
 
 @end
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Routing/FBXCElementSnapshot.m

@@ -0,0 +1,10 @@
+/**
+ * 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 "FBXCElementSnapshot.h"

package/WebDriverAgentLib/Routing/FBXCElementSnapshotWrapper.h

@@ -0,0 +1,30 @@
+/**
+ * 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 "FBXCElementSnapshot.h"
+#import "FBElement.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FBXCElementSnapshotWrapper : NSObject<FBXCElementSnapshot>
+
+/*!Wrapped snapshot instance */
+@property (nonatomic, readonly) id<FBXCElementSnapshot> snapshot;
+
+/**
+ Wraps the given snapshot.. If the given snapshot is already wrapped then the result remains unchanged.
+ 
+ @param snapshot snapshot instance to wrap
+ @returns wrapper instance
+ */
++ (nullable instancetype)ensureWrapped:(nullable id<FBXCElementSnapshot>)snapshot;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Routing/FBXCElementSnapshotWrapper.m

@@ -0,0 +1,45 @@
+/**
+ * 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 "FBXCElementSnapshotWrapper.h"
+
+#import <objc/runtime.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-protocol-property-synthesis"
+#pragma clang diagnostic ignored "-Wprotocol"
+
+@implementation FBXCElementSnapshotWrapper
+
+- (instancetype)initWithSnapshot:(id<FBXCElementSnapshot>)snapshot;
+{
+  self->_snapshot = snapshot;
+  return self;
+}
+
++ (instancetype)ensureWrapped:(id<FBXCElementSnapshot>)snapshot
+{
+  if (nil == snapshot) {
+    return nil;
+  }
+  return [(NSObject *)snapshot isKindOfClass:self.class]
+    ? (FBXCElementSnapshotWrapper *)snapshot
+    : [[FBXCElementSnapshotWrapper alloc] initWithSnapshot:snapshot];
+}
+
+- (id)forwardingTargetForSelector:(SEL)aSelector
+{
+  struct objc_method_description descr = protocol_getMethodDescription(@protocol(FBXCElementSnapshot), aSelector, YES, YES);
+  SEL selector = descr.name;
+  return nil == selector ? nil : self.snapshot;
+}
+
+@end
+
+#pragma clang diagnostic pop

package/WebDriverAgentLib/Utilities/FBActiveAppDetectionPoint.h

@@ -8,8 +8,7 @@
  */
 
 #import <XCTest/XCTest.h>
-
-@class XCAccessibilityElement;
+@protocol FBXCAccessibilityElement;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -28,14 +27,14 @@ NS_ASSUME_NONNULL_BEGIN
  * @param point The screen coordinates
  * @returns The retrieved accessbility element or nil if it cannot be detected
  */
-+ (nullable XCAccessibilityElement *)axElementWithPoint:(CGPoint)point;
++ (nullable id<FBXCAccessibilityElement>)axElementWithPoint:(CGPoint)point;
 
 /**
  * Retrieves the accessbility element for the current screen point
  *
  * @returns The retrieved accessbility element or nil if it cannot be detected
  */
-- (nullable XCAccessibilityElement *)axElement;
+- (nullable id<FBXCAccessibilityElement>)axElement;
 
 /**
  * Sets the coordinates for the current screen point