appium-webdriveragent 4.7.0 → 4.8.0

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

package/WebDriverAgentLib/Utilities/FBActiveAppDetectionPoint.m

@@ -36,13 +36,13 @@
   return instance;
 }
 
-+ (XCAccessibilityElement *)axElementWithPoint:(CGPoint)point
++ (id<FBXCAccessibilityElement>)axElementWithPoint:(CGPoint)point
 {
-  __block XCAccessibilityElement *onScreenElement = nil;
+  __block id<FBXCAccessibilityElement> onScreenElement = nil;
   id<XCTestManager_ManagerInterface> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
   dispatch_semaphore_t sem = dispatch_semaphore_create(0);
   [proxy _XCT_requestElementAtPoint:point
-                              reply:^(XCAccessibilityElement *element, NSError *error) {
+                              reply:^(id element, NSError *error) {
                                 if (nil == error) {
                                   onScreenElement = element;
                                 } else {
@@ -54,7 +54,7 @@
   return onScreenElement;
 }
 
-- (XCAccessibilityElement *)axElement
+- (id<FBXCAccessibilityElement>)axElement
 {
   return [self.class axElementWithPoint:self.coordinates];
 }

package/WebDriverAgentLib/Utilities/FBBaseActionsSynthesizer.h

@@ -8,8 +8,8 @@
  */
 
 #import "FBElementCache.h"
+#import "FBXCElementSnapshot.h"
 #import "XCUIApplication.h"
-#import "XCElementSnapshot.h"
 #import "XCSynthesizedEventRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -62,7 +62,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param snapshot Element's snapshot instance
  @return The fixed hit point coordinates, if there is a need to fix them, or the unchanged hit point value
  */
-- (CGPoint)fixedHitPointWith:(CGPoint)hitPoint forSnapshot:(XCElementSnapshot *)snapshot;
+- (CGPoint)fixedHitPointWith:(CGPoint)hitPoint forSnapshot:(id<FBXCElementSnapshot>)snapshot;
 
 /**
  Calculate absolute gesture position on the screen based on provided element and positionOffset values.

package/WebDriverAgentLib/Utilities/FBBaseActionsSynthesizer.m

@@ -13,12 +13,11 @@
 #import "FBLogger.h"
 #import "FBMacros.h"
 #import "FBMathUtils.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "XCUIApplication+FBHelpers.h"
+#import "XCUIElement.h"
 #import "XCUIElement+FBIsVisible.h"
-#import "XCElementSnapshot.h"
 #import "XCUIElement+FBCaching.h"
-#import "XCElementSnapshot+FBHitPoint.h"
-#import "XCElementSnapshot+FBHelpers.h"
 #import "XCPointerEventPath.h"
 #import "XCSynthesizedEventRecord.h"
 #import "XCUIElement+FBUtilities.h"
@@ -42,7 +41,7 @@
 
 @implementation FBBaseGestureItem
 
-- (CGPoint)fixedHitPointWith:(CGPoint)hitPoint forSnapshot:(XCElementSnapshot *)snapshot
+- (CGPoint)fixedHitPointWith:(CGPoint)hitPoint forSnapshot:(id<FBXCElementSnapshot>)snapshot
 {
   UIInterfaceOrientation interfaceOrientation = self.application.interfaceOrientation;
   if (interfaceOrientation == UIInterfaceOrientationPortrait) {
@@ -54,8 +53,8 @@
     // For Xcode11 it is always necessary to adjust the tap point coordinates
     return FBInvertPointForApplication(hitPoint, appFrame.size, interfaceOrientation);
   }
-  NSArray<XCElementSnapshot *> *ancestors = snapshot.fb_ancestors;
-  XCElementSnapshot *parentWindow = ancestors.count > 1 ? [ancestors objectAtIndex:ancestors.count - 2] : nil;
+  NSArray<id<FBXCElementSnapshot>> *ancestors = [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_ancestors;
+  id<FBXCElementSnapshot> parentWindow = ancestors.count > 1 ? [ancestors objectAtIndex:ancestors.count - 2] : nil;
   CGRect parentWindowFrame = nil == parentWindow ? snapshot.frame : parentWindow.frame;
   if ((appFrame.size.height > appFrame.size.width && parentWindowFrame.size.height < parentWindowFrame.size.width) ||
       (appFrame.size.height < appFrame.size.width && parentWindowFrame.size.height > parentWindowFrame.size.width)) {
@@ -86,11 +85,11 @@
   } else {
     // The offset relative to the element is defined
 
-    XCElementSnapshot *snapshot = element.fb_isResolvedFromCache.boolValue
+    id<FBXCElementSnapshot> snapshot = element.fb_isResolvedFromCache.boolValue
       ? element.lastSnapshot
       : element.fb_takeSnapshot;
     if (nil == positionOffset) {
-      NSValue *hitPointValue = snapshot.fb_hitPoint;
+      NSValue *hitPointValue = [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_hitPoint;
       if (nil != hitPointValue) {
         // short circuit element hitpoint
         return hitPointValue;

package/WebDriverAgentLib/Utilities/FBClassChainQueryParser.m

@@ -11,7 +11,6 @@
 #import "FBErrorBuilder.h"
 #import "FBElementTypeTransformer.h"
 #import "FBExceptions.h"
-#import "FBPredicate.h"
 #import "NSPredicate+FBFormat.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -559,7 +558,7 @@ static NSNumberFormatter *numberFormatter = nil;
         *error = [self.class compilationErrorWithQuery:originalQuery description:description];
         return nil;
       }
-      NSPredicate *value = [NSPredicate fb_formatSearchPredicate:[FBPredicate predicateWithFormat:token.asString]];
+      NSPredicate *value = [NSPredicate fb_snapshotBlockPredicateWithPredicate:[NSPredicate predicateWithFormat:token.asString]];
       if ([token isKindOfClass:FBSelfPredicateToken.class]) {
         [predicates addObject:[[FBSelfPredicateItem alloc] initWithValue:value]];
       } else if ([token isKindOfClass:FBDescendantPredicateToken.class]) {

package/WebDriverAgentLib/Utilities/FBConfiguration.m

@@ -15,7 +15,6 @@
 #include "TargetConditionals.h"
 #import "FBXCodeCompatibility.h"
 #import "XCTestPrivateSymbols.h"
-#import "XCElementSnapshot.h"
 #import "XCTestConfiguration.h"
 #import "XCUIApplication+FBUIInterruptions.h"
 

package/WebDriverAgentLib/Utilities/FBImageIOScaler.m

@@ -57,6 +57,8 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
   self.nextImage = image;
   [self.nextImageLock unlock];
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcompletion-handler"
   dispatch_async(self.scalingQueue, ^{
     [self.nextImageLock lock];
     NSData *next = self.nextImage;
@@ -77,6 +79,7 @@ const CGFloat FBMaxCompressionQuality = 1.0f;
     }
     completionHandler(scaled);
   });
+#pragma clang diagnostic pop
 }
 
 // This method is more optimized for JPEG scaling

package/WebDriverAgentLib/Utilities/FBKeyboard.m

@@ -17,7 +17,6 @@
 #import "FBRunLoopSpinner.h"
 #import "FBMacros.h"
 #import "FBXCodeCompatibility.h"
-#import "XCElementSnapshot.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCTestDriver.h"
@@ -58,7 +57,7 @@
       return NO;
     }
 
-    NSPredicate *keySearchPredicate = [NSPredicate predicateWithBlock:^BOOL(XCElementSnapshot *snapshot,
+    NSPredicate *keySearchPredicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot,
                                                                             NSDictionary *bindings) {
       return snapshot.label.length > 0;
     }];

package/WebDriverAgentLib/Utilities/FBTVNavigationTracker.m

@@ -59,7 +59,7 @@
   if (self) {
     _targetElement = targetElement;
     CGRect frame = targetElement.fb_isResolvedFromCache.boolValue
-      ? targetElement.lastSnapshot.wdFrame
+      ? [FBXCElementSnapshotWrapper ensureWrapped:targetElement.lastSnapshot].wdFrame
       : targetElement.wdFrame;
     _targetCenter = FBRectGetCenter(frame);
     _navigationItems = [NSMutableDictionary dictionary];

package/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m

@@ -19,7 +19,7 @@
 #import "FBW3CActionsHelpers.h"
 #import "FBXCodeCompatibility.h"
 #import "FBXCTestDaemonsProxy.h"
-#import "XCElementSnapshot+FBHelpers.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIDevice.h"
 #import "XCUIElement+FBCaching.h"
@@ -163,13 +163,13 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
   }
 
   // An offset relative to the element is defined
-  XCElementSnapshot *snapshot = element.fb_isResolvedFromCache.boolValue
+  id<FBXCElementSnapshot> snapshot = element.fb_isResolvedFromCache.boolValue
     ? element.lastSnapshot
     : element.fb_takeSnapshot;
   CGRect frame = snapshot.frame;
   if (CGRectIsEmpty(frame)) {
     [FBLogger log:self.application.fb_descriptionRepresentation];
-    NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable", snapshot.fb_description];
+    NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable", [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_description];
     if (error) {
       *error = [[FBErrorBuilder.builder withDescription:description] build];
     }

package/WebDriverAgentLib/Utilities/FBXCAXClientProxy.h

@@ -8,8 +8,9 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "XCElementSnapshot.h"
-#import "XCAccessibilityElement.h"
+#import "FBXCElementSnapshot.h"
+
+@protocol FBXCAccessibilityElement;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -24,21 +25,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)setAXTimeout:(NSTimeInterval)timeout error:(NSError **)error;
 
-- (nullable XCElementSnapshot *)snapshotForElement:(XCAccessibilityElement *)element
-                                        attributes:(nullable NSArray<NSString *> *)attributes
-                                          maxDepth:(nullable NSNumber *)maxDepth
-                                             error:(NSError **)error;
+- (nullable id<FBXCElementSnapshot>)snapshotForElement:(id<FBXCAccessibilityElement>)element
+                                            attributes:(nullable NSArray<NSString *> *)attributes
+                                              maxDepth:(nullable NSNumber *)maxDepth
+                                                 error:(NSError **)error;
 
-- (NSArray<XCAccessibilityElement *> *)activeApplications;
+- (NSArray<id<FBXCAccessibilityElement>> *)activeApplications;
 
-- (XCAccessibilityElement *)systemApplication;
+- (id<FBXCAccessibilityElement>)systemApplication;
 
 - (NSDictionary *)defaultParameters;
 
 - (void)notifyWhenNoAnimationsAreActiveForApplication:(XCUIApplication *)application
                                                 reply:(void (^)(void))reply;
 
-- (NSDictionary *)attributesForElement:(XCAccessibilityElement *)element
+- (NSDictionary *)attributesForElement:(id<FBXCAccessibilityElement>)element
                             attributes:(NSArray *)attributes;
 
 - (XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid;

package/WebDriverAgentLib/Utilities/FBXCAXClientProxy.m

@@ -11,6 +11,7 @@
 
 #import <objc/runtime.h>
 
+#import "FBXCAccessibilityElement.h"
 #import "FBConfiguration.h"
 #import "FBLogger.h"
 #import "FBMacros.h"
@@ -32,6 +33,9 @@ static id FBAXClient = nil;
   return FBConfiguration.snapshotRequestParameters;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-load-method"
+
 + (void)load
 {
   static dispatch_once_t onceToken;
@@ -42,6 +46,8 @@ static id FBAXClient = nil;
   });
 }
 
+#pragma clang diagnostic pop
+
 @end
 
 @implementation FBXCAXClientProxy
@@ -62,10 +68,10 @@ static id FBAXClient = nil;
   return [FBAXClient _setAXTimeout:timeout error:error];
 }
 
-- (XCElementSnapshot *)snapshotForElement:(XCAccessibilityElement *)element
-                               attributes:(NSArray<NSString *> *)attributes
-                                 maxDepth:(nullable NSNumber *)maxDepth
-                                    error:(NSError **)error
+- (id<FBXCElementSnapshot>)snapshotForElement:(id<FBXCAccessibilityElement>)element
+                                   attributes:(NSArray<NSString *> *)attributes
+                                     maxDepth:(nullable NSNumber *)maxDepth
+                                        error:(NSError **)error
 {
   NSMutableDictionary *parameters = [[NSMutableDictionary alloc] init];
   // Mimicking XCTest framework behavior (this attribute is added by default unless it is an excludingNonModalElements query)
@@ -82,16 +88,16 @@ static id FBAXClient = nil;
                                          attributes:attributes
                                          parameters:[parameters copy]
                                               error:error];
-  XCElementSnapshot *snapshot = [result valueForKey:@"_rootElementSnapshot"];
+  id<FBXCElementSnapshot> snapshot = [result valueForKey:@"_rootElementSnapshot"];
   return nil == snapshot ? result : snapshot;
 }
 
-- (NSArray<XCAccessibilityElement *> *)activeApplications
+- (NSArray<id<FBXCAccessibilityElement>> *)activeApplications
 {
   return [FBAXClient activeApplications];
 }
 
-- (XCAccessibilityElement *)systemApplication
+- (id<FBXCAccessibilityElement>)systemApplication
 {
   return [FBAXClient systemApplication];
 }
@@ -107,7 +113,7 @@ static id FBAXClient = nil;
   [FBAXClient notifyWhenNoAnimationsAreActiveForApplication:application reply:reply];
 }
 
-- (NSDictionary *)attributesForElement:(XCAccessibilityElement *)element
+- (NSDictionary *)attributesForElement:(id<FBXCAccessibilityElement>)element
                             attributes:(NSArray *)attributes
 {
   NSError *error = nil;

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.h

@@ -9,7 +9,6 @@
 
 #import <XCTest/XCTest.h>
 #import "XCSynthesizedEventRecord.h"
-#import "XCElementSnapshot.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.m

@@ -23,6 +23,10 @@
 
 static Class FBXCTRunnerDaemonSessionClass = nil;
 static dispatch_once_t onceTestRunnerDaemonClass;
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-load-method"
+
 + (void)load
 {
   // XCTRunnerDaemonSession class is only available since Xcode 8.3
@@ -31,6 +35,8 @@ static dispatch_once_t onceTestRunnerDaemonClass;
   });
 }
 
+#pragma clang diagnostic pop
+
 + (id<XCTestManager_ManagerInterface>)testRunnerProxy
 {
   static id<XCTestManager_ManagerInterface> proxy = nil;

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.h

@@ -28,16 +28,6 @@ NSInteger FBTestmanagerdVersion(void);
 
 NS_ASSUME_NONNULL_BEGIN
 
-/**
- Set of categories that patches method name differences between Xcode versions,
- so that WDA can be build with different Xcode versions.
- */
-@interface XCElementSnapshot (FBCompatibility)
-
-+ (nullable SEL)fb_attributesForElementSnapshotKeyPathsSelector;
-
-@end
-
 /**
  The exception happends if one tries to call application method,
  which is not supported in the current iOS version