appium-webdriveragent 4.7.0 → 4.8.2

package/WebDriverAgentLib/Utilities/NSPredicate+FBFormat.m

@@ -9,23 +9,20 @@
 
 #import "NSPredicate+FBFormat.h"
 
-#import "FBPredicate.h"
 #import "NSExpression+FBFormat.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 
 @implementation NSPredicate (FBFormat)
 
-+ (instancetype)fb_predicateWithPredicate:(NSPredicate *)original comparisonModifier:(NSPredicate *(^)(NSComparisonPredicate *))comparisonModifier
++ (instancetype)fb_predicateWithPredicate:(NSPredicate *)original
+                       comparisonModifier:(NSPredicate *(^)(NSComparisonPredicate *))comparisonModifier
 {
   if ([original isKindOfClass:NSCompoundPredicate.class]) {
     NSCompoundPredicate *compPred = (NSCompoundPredicate *)original;
     NSMutableArray *predicates = [NSMutableArray array];
     for (NSPredicate *predicate in [compPred subpredicates]) {
-      if ([predicate.predicateFormat.lowercaseString isEqualToString:FBPredicate.forceResolvePredicateString.lowercaseString]) {
-        // Do not translete this predicate
-        [predicates addObject:predicate];
-        continue;
-      }
-      NSPredicate *newPredicate = [self.class fb_predicateWithPredicate:predicate comparisonModifier:comparisonModifier];
+      NSPredicate *newPredicate = [self.class fb_predicateWithPredicate:predicate
+                                                     comparisonModifier:comparisonModifier];
       if (nil != newPredicate) {
         [predicates addObject:newPredicate];
       }
@@ -41,7 +38,8 @@
 
 + (instancetype)fb_formatSearchPredicate:(NSPredicate *)input
 {
-  return [self.class fb_predicateWithPredicate:input comparisonModifier:^NSPredicate *(NSComparisonPredicate *cp) {
+  return [self.class fb_predicateWithPredicate:input
+                            comparisonModifier:^NSPredicate *(NSComparisonPredicate *cp) {
     NSExpression *left = [NSExpression fb_wdExpressionWithExpression:[cp leftExpression]];
     NSExpression *right = [NSExpression fb_wdExpressionWithExpression:[cp rightExpression]];
     return [NSComparisonPredicate predicateWithLeftExpression:left
@@ -52,4 +50,15 @@
   }];
 }
 
++ (instancetype)fb_snapshotBlockPredicateWithPredicate:(NSPredicate *)input
+{
+  NSPredicate *wdPredicate = [self.class fb_formatSearchPredicate:input];
+  return [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject,
+                                               NSDictionary<NSString *,id> * _Nullable bindings) {
+    FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:evaluatedObject];
+    return [wdPredicate evaluateWithObject:wrappedSnapshot];
+  }];
+}
+
+
 @end

package/WebDriverAgentLib/Utilities/XCTestPrivateSymbols.m

@@ -13,7 +13,6 @@
 
 #import "FBRuntimeUtils.h"
 #import "FBXCodeCompatibility.h"
-#import "XCElementSnapshot.h"
 
 NSNumber *FB_XCAXAIsVisibleAttribute;
 NSString *FB_XCAXAIsVisibleAttributeName = @"XC_kAXXCAttributeIsVisible";
@@ -56,8 +55,15 @@ void *FBRetrieveXCTestSymbol(const char *name)
 
 NSArray<NSString*> *FBStandardAttributeNames(void)
 {
-  return [XCElementSnapshot sanitizedElementSnapshotHierarchyAttributesForAttributes:nil
-                                                                             isMacOS:NO];
+  static NSArray<NSString *> *attributeNames;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    Class xcElementSnapshotClass = NSClassFromString(@"XCElementSnapshot");
+    NSCAssert(nil != xcElementSnapshotClass, @"XCElementSnapshot class must be resolvable", xcElementSnapshotClass);
+    attributeNames = [xcElementSnapshotClass sanitizedElementSnapshotHierarchyAttributesForAttributes:nil
+                                                                                              isMacOS:NO];
+  });
+  return attributeNames;
 }
 
 NSArray<NSString*> *FBCustomAttributeNames(void)

package/WebDriverAgentLib/Utilities/XCUIApplicationProcessDelay.m

@@ -21,10 +21,16 @@ static NSLock * lock = nil;
 
 @implementation XCUIApplicationProcessDelay
 
-+ (void)load {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-load-method"
+
++ (void)load
+{
   lock = [[NSLock alloc] init];
 }
 
+#pragma clang diagnostic pop
+
 + (void)setEventLoopHasIdledDelay:(NSTimeInterval)delay
 {
   [lock lock];

package/WebDriverAgentLib/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m

@@ -703,8 +703,11 @@ enum GCDAsyncSocketConfig
 	else {
 		maxPreBufferLength = preBufferLength;
 	}
-	
+  
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wvla"
 	uint8_t seq[termLength];
+#pragma clang diagnostic pop
 	const void *termBuf = [term bytes];
 	
 	NSUInteger bufLen = MIN(bytesDone, (termLength - 1));
@@ -7123,7 +7126,10 @@ static OSStatus SSLWriteFunction(SSLConnectionRef connection, const void *data,
 	{
 		NSArray *cipherSuites = (NSArray *)value;
 		NSUInteger numberCiphers = [cipherSuites count];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wvla"
 		SSLCipherSuite ciphers[numberCiphers];
+#pragma clang diagnostic pop
 		
 		NSUInteger cipherIndex;
 		for (cipherIndex = 0; cipherIndex < numberCiphers; cipherIndex++)

package/WebDriverAgentLib/WebDriverAgentLib.h

@@ -39,7 +39,6 @@ FOUNDATION_EXPORT const unsigned char WebDriverAgentLib_VersionString[];
 #import <WebDriverAgentLib/FBRuntimeUtils.h>
 #import <WebDriverAgentLib/FBSession.h>
 #import <WebDriverAgentLib/FBWebServer.h>
-#import <WebDriverAgentLib/XCElementSnapshot+FBHelpers.h>
 #import <WebDriverAgentLib/XCUIApplication+FBHelpers.h>
 #import <WebDriverAgentLib/XCUIDevice+FBHelpers.h>
 #import <WebDriverAgentLib/XCUIDevice+FBRotation.h>

package/WebDriverAgentTests/IntegrationTests/FBPasteboardTests.m

@@ -71,11 +71,7 @@
   FBWaitExact(1.0);
   NSData *result = [FBPasteboard dataForType:@"plaintext" error:&error];
   XCTAssertNil(error);
-  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"16.0")) {
-    // Pasteboard permission appears in a simulator. Not in a real device.
-  } else {
-    XCTAssertEqualObjects(textField.value, [[NSString alloc] initWithData:result encoding:NSUTF8StringEncoding]);
-  }
+  XCTAssertEqualObjects(textField.value, [[NSString alloc] initWithData:result encoding:NSUTF8StringEncoding]);
 }
 
 - (void)testUrlCopyPaste

package/WebDriverAgentTests/IntegrationTests/FBXPathIntegrationTests.m

@@ -13,6 +13,7 @@
 #import "FBTestMacros.h"
 #import "FBXPath.h"
 #import "FBXCodeCompatibility.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXMLGenerationOptions.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBFind.h"
@@ -38,64 +39,70 @@
   FBAssertWaitTillBecomesTrue(self.testedView.buttons.count > 0);
 }
 
-- (XCElementSnapshot *)destinationSnapshot
+- (id<FBXCElementSnapshot>)destinationSnapshot
 {
   XCUIElement *matchingElement = self.testedView.buttons.fb_firstMatch;
   FBAssertWaitTillBecomesTrue(nil != matchingElement.fb_takeSnapshot);
 
-  XCElementSnapshot *snapshot = matchingElement.fb_takeSnapshot;
+  id<FBXCElementSnapshot> snapshot = matchingElement.fb_takeSnapshot;
   // Over iOS13, snapshot returns a child.
-  // The purpose of here is return a single element so replace children with nil for testing.
-  snapshot.children = nil;
+  // The purpose of here is return a single element to replace children with an empty array for testing.
+  snapshot.children = @[];
   return snapshot;
 }
 
 - (void)testSingleDescendantXMLRepresentation
 {
-  XCElementSnapshot *snapshot = self.destinationSnapshot;
-  NSString *xmlStr = [FBXPath xmlStringWithRootElement:snapshot options:nil];
+  id<FBXCElementSnapshot> snapshot = self.destinationSnapshot;
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+  NSString *xmlStr = [FBXPath xmlStringWithRootElement:wrappedSnapshot
+                                               options:nil];
   XCTAssertNotNil(xmlStr);
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\"/>\n", snapshot.wdType, snapshot.wdType, snapshot.wdName, snapshot.wdLabel, snapshot.wdEnabled ? @"true" : @"false", snapshot.wdVisible ? @"true" : @"false", snapshot.wdAccessible ? @"true" : @"false", [snapshot.wdRect[@"x"] stringValue], [snapshot.wdRect[@"y"] stringValue], [snapshot.wdRect[@"width"] stringValue], [snapshot.wdRect[@"height"] stringValue], snapshot.wdIndex];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\"/>\n", wrappedSnapshot.wdType, wrappedSnapshot.wdType, wrappedSnapshot.wdName, wrappedSnapshot.wdLabel, wrappedSnapshot.wdEnabled ? @"true" : @"false", wrappedSnapshot.wdVisible ? @"true" : @"false", wrappedSnapshot.wdAccessible ? @"true" : @"false", [wrappedSnapshot.wdRect[@"x"] stringValue], [wrappedSnapshot.wdRect[@"y"] stringValue], [wrappedSnapshot.wdRect[@"width"] stringValue], [wrappedSnapshot.wdRect[@"height"] stringValue], wrappedSnapshot.wdIndex];
   XCTAssertEqualObjects(xmlStr, expectedXml);
 }
 
 - (void)testSingleDescendantXMLRepresentationWithScope
 {
-  XCElementSnapshot *snapshot = self.destinationSnapshot;
+  id<FBXCElementSnapshot> snapshot = self.destinationSnapshot;
   NSString *scope = @"AppiumAUT";
   FBXMLGenerationOptions *options = [[FBXMLGenerationOptions new] withScope:scope];
-  NSString *xmlStr = [FBXPath xmlStringWithRootElement:snapshot options:options];
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+  NSString *xmlStr = [FBXPath xmlStringWithRootElement:wrappedSnapshot
+                                               options:options];
   XCTAssertNotNil(xmlStr);
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@>\n  <%@ type=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\"/>\n</%@>\n", scope, snapshot.wdType, snapshot.wdType, snapshot.wdName, snapshot.wdLabel, snapshot.wdEnabled ? @"true" : @"false", snapshot.wdVisible ? @"true" : @"false", snapshot.wdAccessible ? @"true" : @"false", [snapshot.wdRect[@"x"] stringValue], [snapshot.wdRect[@"y"] stringValue], [snapshot.wdRect[@"width"] stringValue], [snapshot.wdRect[@"height"] stringValue], snapshot.wdIndex, scope];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@>\n  <%@ type=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\"/>\n</%@>\n", scope, wrappedSnapshot.wdType, wrappedSnapshot.wdType, wrappedSnapshot.wdName, wrappedSnapshot.wdLabel, wrappedSnapshot.wdEnabled ? @"true" : @"false", wrappedSnapshot.wdVisible ? @"true" : @"false", wrappedSnapshot.wdAccessible ? @"true" : @"false", [wrappedSnapshot.wdRect[@"x"] stringValue], [wrappedSnapshot.wdRect[@"y"] stringValue], [wrappedSnapshot.wdRect[@"width"] stringValue], [wrappedSnapshot.wdRect[@"height"] stringValue], wrappedSnapshot.wdIndex, scope];
   XCTAssertEqualObjects(xmlStr, expectedXml);
 }
 
 - (void)testSingleDescendantXMLRepresentationWithoutAttributes
 {
-  XCElementSnapshot *snapshot = self.destinationSnapshot;
+  id<FBXCElementSnapshot> snapshot = self.destinationSnapshot;
   FBXMLGenerationOptions *options = [[FBXMLGenerationOptions new]
                                      withExcludedAttributes:@[@"visible", @"enabled", @"index", @"blabla"]];
-  NSString *xmlStr = [FBXPath xmlStringWithRootElement:snapshot options:options];
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+  NSString *xmlStr = [FBXPath xmlStringWithRootElement:wrappedSnapshot
+                                               options:options];
   XCTAssertNotNil(xmlStr);
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" name=\"%@\" label=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\"/>\n", snapshot.wdType, snapshot.wdType, snapshot.wdName, snapshot.wdLabel, snapshot.wdAccessible ? @"true" : @"false", [snapshot.wdRect[@"x"] stringValue], [snapshot.wdRect[@"y"] stringValue], [snapshot.wdRect[@"width"] stringValue], [snapshot.wdRect[@"height"] stringValue]];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" name=\"%@\" label=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\"/>\n", wrappedSnapshot.wdType, wrappedSnapshot.wdType, wrappedSnapshot.wdName, wrappedSnapshot.wdLabel, wrappedSnapshot.wdAccessible ? @"true" : @"false", [wrappedSnapshot.wdRect[@"x"] stringValue], [wrappedSnapshot.wdRect[@"y"] stringValue], [wrappedSnapshot.wdRect[@"width"] stringValue], [wrappedSnapshot.wdRect[@"height"] stringValue]];
   XCTAssertEqualObjects(xmlStr, expectedXml);
 }
 
 - (void)testFindMatchesInElement
 {
-  NSArray *matchingSnapshots = [FBXPath matchesWithRootElement:self.testedApplication forQuery:@"//XCUIElementTypeButton"];
+  NSArray<id<FBXCElementSnapshot>> *matchingSnapshots = [FBXPath matchesWithRootElement:self.testedApplication forQuery:@"//XCUIElementTypeButton"];
   XCTAssertEqual([matchingSnapshots count], 5);
-  for (id<FBElement> element in matchingSnapshots) {
-    XCTAssertTrue([element.wdType isEqualToString:@"XCUIElementTypeButton"]);
+  for (id<FBXCElementSnapshot> element in matchingSnapshots) {
+    XCTAssertTrue([[FBXCElementSnapshotWrapper ensureWrapped:element].wdType isEqualToString:@"XCUIElementTypeButton"]);
   }
 }
 
 - (void)testFindMatchesInElementWithDotNotation
 {
-  NSArray *matchingSnapshots = [FBXPath matchesWithRootElement:self.testedApplication forQuery:@".//XCUIElementTypeButton"];
+  NSArray<id<FBXCElementSnapshot>> *matchingSnapshots = [FBXPath matchesWithRootElement:self.testedApplication forQuery:@".//XCUIElementTypeButton"];
   XCTAssertEqual([matchingSnapshots count], 5);
-  for (id<FBElement> element in matchingSnapshots) {
-    XCTAssertTrue([element.wdType isEqualToString:@"XCUIElementTypeButton"]);
+  for (id<FBXCElementSnapshot> element in matchingSnapshots) {
+    XCTAssertTrue([[FBXCElementSnapshotWrapper ensureWrapped:element].wdType isEqualToString:@"XCUIElementTypeButton"]);
   }
 }
 

package/WebDriverAgentTests/IntegrationTests/XCElementSnapshotHelperTests.m

@@ -11,11 +11,11 @@
 
 #import "FBIntegrationTestCase.h"
 #import "FBTestMacros.h"
-#import "XCElementSnapshot+FBHelpers.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCodeCompatibility.h"
 
 @interface XCElementSnapshotHelperTests : FBIntegrationTestCase
@@ -44,7 +44,8 @@
     @"Deadlock app",
     @"Touch",
   ]];
-  NSArray<XCElementSnapshot *> *matchingSnapshots = [self.testedView.fb_takeSnapshot fb_descendantsMatchingType:XCUIElementTypeButton];
+  NSArray<id<FBXCElementSnapshot>> *matchingSnapshots = [[FBXCElementSnapshotWrapper ensureWrapped:self.testedView.fb_takeSnapshot]
+                                                         fb_descendantsMatchingType:XCUIElementTypeButton];
   XCTAssertEqual(matchingSnapshots.count, expectedLabels.count);
   NSArray<NSString *> *labels = [matchingSnapshots valueForKeyPath:@"@distinctUnionOfObjects.label"];
   XCTAssertEqualObjects([NSSet setWithArray:labels], expectedLabels);
@@ -58,7 +59,8 @@
 {
   XCUIElement *button = self.testedApplication.buttons[@"Alerts"];
   FBAssertWaitTillBecomesTrue(button.exists);
-  XCElementSnapshot *windowSnapshot = [button.fb_takeSnapshot fb_parentMatchingType:XCUIElementTypeWindow];
+  id<FBXCElementSnapshot> windowSnapshot = [[FBXCElementSnapshotWrapper ensureWrapped:button.fb_takeSnapshot]
+                                            fb_parentMatchingType:XCUIElementTypeWindow];
   XCTAssertNotNil(windowSnapshot);
   XCTAssertEqual(windowSnapshot.elementType, XCUIElementTypeWindow);
 }
@@ -84,7 +86,8 @@
 {
   XCUIElement *todayPickerWheel = self.testedApplication.pickerWheels[@"Today"];
   FBAssertWaitTillBecomesTrue(todayPickerWheel.exists);
-  XCElementSnapshot *datePicker = [todayPickerWheel.fb_takeSnapshot fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeDatePicker), @(XCUIElementTypeWindow)]];
+  id<FBXCElementSnapshot> datePicker = [[FBXCElementSnapshotWrapper ensureWrapped:todayPickerWheel.fb_takeSnapshot]
+                                        fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeDatePicker), @(XCUIElementTypeWindow)]];
   XCTAssertNotNil(datePicker);
   XCTAssertEqual(datePicker.elementType, XCUIElementTypeDatePicker);
 }
@@ -93,27 +96,17 @@
 {
   XCUIElement *todayPickerWheel = self.testedApplication.pickerWheels[@"Today"];
   FBAssertWaitTillBecomesTrue(todayPickerWheel.exists);
-  XCElementSnapshot *otherSnapshot;
-  if (@available(iOS 13.0, *)) {
-    // </XCUIElementTypeOther>
-    //   <XCUIElementTypeDatePicker>
-    //     <XCUIElementTypePicker>
-    //       <XCUIElementTypePickerWheel value="Today"...>
-    otherSnapshot = [[[todayPickerWheel.fb_takeSnapshot fb_parentMatchingType:XCUIElementTypePicker]
-                      fb_parentMatchingType:XCUIElementTypeDatePicker] fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeAny), @(XCUIElementTypeWindow)]];
-  } else {
-    otherSnapshot = [todayPickerWheel.fb_takeSnapshot fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeAny),
-                                                                                    @(XCUIElementTypeWindow)]];
-  }
+  id<FBXCElementSnapshot> otherSnapshot =[[FBXCElementSnapshotWrapper ensureWrapped:todayPickerWheel.fb_takeSnapshot]
+                                          fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeAny)]];
   XCTAssertNotNil(otherSnapshot);
-  XCTAssertEqual(otherSnapshot.elementType, XCUIElementTypeOther);
 }
 
 - (void)testParentMatchingOneOfTypesWithAbsentParents
 {
   XCUIElement *todayPickerWheel = self.testedApplication.pickerWheels[@"Today"];
   FBAssertWaitTillBecomesTrue(todayPickerWheel.exists);
-  XCElementSnapshot *otherSnapshot = [todayPickerWheel.fb_takeSnapshot fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeTab), @(XCUIElementTypeLink)]];
+  id<FBXCElementSnapshot> otherSnapshot = [[FBXCElementSnapshotWrapper ensureWrapped:todayPickerWheel.fb_takeSnapshot]
+                                      fb_parentMatchingOneOfTypes:@[@(XCUIElementTypeTab), @(XCUIElementTypeLink)]];
   XCTAssertNil(otherSnapshot);
 }
 
@@ -143,10 +136,11 @@
                                @(XCUIElementTypeCollectionView),
                                @(XCUIElementTypeTable),
                                ];
-  XCElementSnapshot *scrollView = [threeStaticText.fb_takeSnapshot fb_parentMatchingOneOfTypes:acceptedParents
-                                                                                        filter:^(XCElementSnapshot *snapshot) {
-                                                                                          return [snapshot isWDVisible];
-                                                                                        }];
+  id<FBXCElementSnapshot> scrollView = [[FBXCElementSnapshotWrapper ensureWrapped:threeStaticText.fb_takeSnapshot]
+                                   fb_parentMatchingOneOfTypes:acceptedParents                                  
+                                                        filter:^BOOL(id<FBXCElementSnapshot> snapshot) {
+    return [[FBXCElementSnapshotWrapper ensureWrapped:snapshot] isWDVisible];
+  }];
   XCTAssertEqualObjects(scrollView.identifier, @"scrollView");
 }
 
@@ -159,10 +153,11 @@
                                @(XCUIElementTypeCollectionView),
                                @(XCUIElementTypeTable),
                                ];
-  XCElementSnapshot *scrollView = [threeStaticText.fb_takeSnapshot fb_parentMatchingOneOfTypes:acceptedParents
-                                                                                        filter:^(XCElementSnapshot *snapshot) {
-                                                                                          return NO;
-                                                                                        }];
+  id<FBXCElementSnapshot> scrollView = [[FBXCElementSnapshotWrapper ensureWrapped:threeStaticText.fb_takeSnapshot]
+                                        fb_parentMatchingOneOfTypes:acceptedParents
+                                                             filter:^BOOL(id<FBXCElementSnapshot> snapshot) {
+    return NO;
+  }];
   XCTAssertNil(scrollView);
 }
 
@@ -170,9 +165,9 @@
 {
   XCUIElement *scrollView = self.testedApplication.scrollViews[@"scrollView"];
   FBAssertWaitTillBecomesTrue(self.testedApplication.staticTexts[@"3"].fb_isVisible);
-  NSArray *cells = [scrollView.fb_takeSnapshot fb_descendantsCellSnapshots];
+  NSArray *cells = [[FBXCElementSnapshotWrapper ensureWrapped:scrollView.fb_takeSnapshot] fb_descendantsCellSnapshots];
   XCTAssertGreaterThanOrEqual(cells.count, 10);
-  XCElementSnapshot *element = cells.firstObject;
+  id<FBXCElementSnapshot> element = cells.firstObject;
   XCTAssertEqualObjects(element.label, @"0");
 }
 
@@ -197,7 +192,7 @@
 {
   FBAssertWaitTillBecomesTrue(self.testedApplication.staticTexts[@"3"].fb_isVisible);
   XCUIElement *threeStaticText = self.testedApplication.staticTexts[@"3"];
-  XCElementSnapshot *xcuiElementCell = [threeStaticText.fb_takeSnapshot fb_parentCellSnapshot];
+  id<FBXCElementSnapshot> xcuiElementCell = [[FBXCElementSnapshotWrapper ensureWrapped:threeStaticText.fb_takeSnapshot] fb_parentCellSnapshot];
   XCTAssertEqual(xcuiElementCell.elementType, 75);
 }
 

package/WebDriverAgentTests/IntegrationTests/XCElementSnapshotHitPointTests.m

@@ -9,7 +9,7 @@
 
 #import "FBIntegrationTestCase.h"
 #import "FBTestMacros.h"
-#import "XCElementSnapshot+FBHitpoint.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBUtilities.h"
 
@@ -23,7 +23,7 @@
   [self launchApplication];
   [self goToAttributesPage];
   XCUIElement *dstBtn = self.testedApplication.buttons[@"not_accessible"];
-  CGPoint hitPoint = dstBtn.fb_takeSnapshot.fb_hitPoint.CGPointValue;
+  CGPoint hitPoint = [FBXCElementSnapshotWrapper ensureWrapped:dstBtn.fb_takeSnapshot].fb_hitPoint.CGPointValue;
   XCTAssertTrue(hitPoint.x > 0 && hitPoint.y > 0);
 }
 

package/WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m

@@ -15,7 +15,7 @@
 #import "FBTestMacros.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBFind.h"
-#import "XCElementSnapshot+FBHelpers.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBClassChain.h"
 #import "XCUIElement+FBResolve.h"
@@ -182,7 +182,8 @@
 - (void)testDescendantsWithPredicateString
 {
   NSPredicate *predicate = [NSPredicate predicateWithFormat:@"label = 'Alerts'"];
-  NSArray<XCUIElement *> *matchingSnapshots = [self.testedView fb_descendantsMatchingPredicate:predicate shouldReturnAfterFirstMatch:NO];
+  NSArray<XCUIElement *> *matchingSnapshots = [self.testedView fb_descendantsMatchingPredicate:predicate
+                                                                   shouldReturnAfterFirstMatch:NO];
   int snapshotsCount = 1;
   if (@available(iOS 13.0, *)) {
     snapshotsCount = 2;
@@ -191,7 +192,8 @@
   XCTAssertEqual(matchingSnapshots.firstObject.elementType, XCUIElementTypeButton);
   XCTAssertEqualObjects(matchingSnapshots.lastObject.label, @"Alerts");
   NSPredicate *selfPredicate = [NSPredicate predicateWithFormat:@"label == 'Alerts'"];
-  NSArray<XCUIElement *> *selfElementsByPredicate = [matchingSnapshots.lastObject fb_descendantsMatchingPredicate:selfPredicate shouldReturnAfterFirstMatch:NO];
+  NSArray<XCUIElement *> *selfElementsByPredicate = [matchingSnapshots.lastObject fb_descendantsMatchingPredicate:selfPredicate
+                                                                                      shouldReturnAfterFirstMatch:NO];
   XCTAssertEqual(selfElementsByPredicate.count, 1);
 }
 

package/WebDriverAgentTests/IntegrationTests/XCUIElementHelperIntegrationTests.m

@@ -15,6 +15,7 @@
 #import "FBTestMacros.h"
 #import "FBElement.h"
 #import "FBElementUtils.h"
+#import "FBXCElementSnapshot.h"
 #import "XCUIElement+FBUtilities.h"
 
 @interface XCUIElementHelperIntegrationTests : FBIntegrationTestCase
@@ -40,7 +41,7 @@
   [allElements addObjectsFromArray:buttons];
   [allElements addObjectsFromArray:windows];
   
-  NSMutableArray<XCElementSnapshot *> *buttonSnapshots = [NSMutableArray array];
+  NSMutableArray<id<FBXCElementSnapshot>> *buttonSnapshots = [NSMutableArray array];
   [buttonSnapshots addObject:[buttons.firstObject fb_takeSnapshot]];
   
   NSArray<XCUIElement *> *result = [self.testedApplication fb_filterDescendantsWithSnapshots:buttonSnapshots selfUID:nil onlyChildren:NO];

package/{WebDriverAgentLib/Categories/XCElementSnapshot+FBHitPoint.h → WebDriverAgentTests/UnitTests/Doubles/XCElementSnapshotDouble.h}

@@ -7,19 +7,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <WebDriverAgentLib/XCElementSnapshot.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface XCElementSnapshot (FBHitPoint)
-
-/**
- Wrapper for Apple's hitpoint, thats resolves few known issues
-
- @return Element's hitpoint if exists nil otherwise
- */
-- (nullable NSValue *)fb_hitPoint;
+#import <XCTest/XCTest.h>
 
+@interface XCElementSnapshotDouble : NSObject<XCUIElementAttributes>
+@property (readwrite, nullable) id value;
 @end
-
-NS_ASSUME_NONNULL_END

package/WebDriverAgentTests/UnitTests/Doubles/XCElementSnapshotDouble.m

@@ -0,0 +1,99 @@
+/**
+ * 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 "XCElementSnapshotDouble.h"
+
+#import "FBXCAccessibilityElement.h"
+#import "FBXCElementSnapshot.h"
+
+@implementation XCElementSnapshotDouble
+
+- (id)init
+{
+  self = [super init];
+  self->_value = @"magicValue";
+  return self;
+}
+
+- (NSString *)identifier
+{
+  return @"testName";
+}
+
+- (CGRect)frame
+{
+  return CGRectZero;
+}
+
+- (NSString *)title
+{
+  return @"testTitle";
+}
+
+- (NSString *)label
+{
+  return @"testLabel";
+}
+
+- (XCUIElementType)elementType
+{
+  return XCUIElementTypeOther;
+}
+
+- (BOOL)isEnabled
+{
+  return YES;
+}
+
+- (XCUIUserInterfaceSizeClass)horizontalSizeClass
+{
+  return XCUIUserInterfaceSizeClassUnspecified;
+}
+
+- (XCUIUserInterfaceSizeClass)verticalSizeClass
+{
+  return XCUIUserInterfaceSizeClassUnspecified;
+}
+
+- (NSString *)placeholderValue
+{
+  return @"";
+}
+
+- (BOOL)isSelected
+{
+  return YES;
+}
+
+- (BOOL)hasFocus
+{
+  return YES;
+}
+
+- (NSDictionary *)additionalAttributes
+{
+  return @{};
+}
+
+- (id<FBXCAccessibilityElement>)accessibilityElement
+{
+  return nil;
+}
+
+- (id<FBXCElementSnapshot>)parent
+{
+  return nil;
+}
+
+- (NSArray *)children
+{
+  return @[];
+}
+
+@end