@devicelab/maestro-runner-darwin-arm64 1.1.27 → 1.1.28

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests/FBMathUtilsTests.m

@@ -110,4 +110,42 @@
   XCTAssertTrue(FBSizeFuzzyEqualToSize(screenSizeLandscape, FBAdjustDimensionsForApplication(screenSizeLandscape, UIInterfaceOrientationLandscapeRight), t));
 }
 
+- (void)testScrollGestureOffsetsWithMatchingFrames
+{
+  CGRect frame = CGRectMake(20, 200, 300, 400);
+  CGVector proportion = CGVectorMake(0.5, 0.75);
+  CGVector vector = CGVectorMake(0, -200);
+  CGVector startOffset, endOffset;
+  XCTAssertTrue(FBScrollGestureOffsets(frame, frame, proportion, vector, &startOffset, &endOffset));
+  XCTAssertTrue(FBVectorFuzzyEqualToVector(startOffset, CGVectorMake(0.5, 0.75), 0.01));
+  XCTAssertTrue(FBVectorFuzzyEqualToVector(endOffset, CGVectorMake(0.5, 0.25), 0.01));
+}
+
+- (void)testScrollGestureOffsetsWithRescaledAnchorFrame
+{
+  // Simulates a compatibility-mode window: anchorFrame is scrollingFrame scaled by ~2.19x,
+  // same origin - offsets should still land within [0, 1] instead of drifting outside it.
+  CGRect scrollingFrame = CGRectMake(20, 202, 335, 420);
+  CGRect anchorFrame = CGRectMake(20, 202, 733, 920);
+  CGVector proportion = CGVectorMake(0.5, 0.75);
+  CGVector vector = CGVectorMake(0, -250);
+  CGVector startOffset, endOffset;
+  XCTAssertTrue(FBScrollGestureOffsets(scrollingFrame, anchorFrame, proportion, vector, &startOffset, &endOffset));
+  XCTAssertTrue(startOffset.dx >= 0 && startOffset.dx <= 1);
+  XCTAssertTrue(startOffset.dy >= 0 && startOffset.dy <= 1);
+  XCTAssertTrue(endOffset.dx >= 0 && endOffset.dx <= 1);
+  XCTAssertTrue(endOffset.dy >= 0 && endOffset.dy <= 1);
+}
+
+- (void)testScrollGestureOffsetsWithEmptyFrame
+{
+  CGVector startOffset = CGVectorMake(-1, -1);
+  CGVector endOffset = CGVectorMake(-1, -1);
+  XCTAssertFalse(FBScrollGestureOffsets(CGRectZero, CGRectMake(0, 0, 100, 100), CGVectorMake(0.5, 0.5), CGVectorMake(0, -50), &startOffset, &endOffset));
+  XCTAssertFalse(FBScrollGestureOffsets(CGRectMake(0, 0, 100, 100), CGRectZero, CGVectorMake(0.5, 0.5), CGVectorMake(0, -50), &startOffset, &endOffset));
+  // Untouched on failure
+  XCTAssertTrue(startOffset.dx == -1 && startOffset.dy == -1);
+  XCTAssertTrue(endOffset.dx == -1 && endOffset.dy == -1);
+}
+
 @end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests/FBResponseJSONPayloadTests.m

@@ -0,0 +1,76 @@
+/**
+ * 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.
+ */
+
+#import <XCTest/XCTest.h>
+
+#import "FBResponseJSONPayload.h"
+#import "RouteResponse.h"
+
+@interface FBResponseJSONPayloadTests : XCTestCase
+@end
+
+@implementation FBResponseJSONPayloadTests
+
+// https://github.com/appium/appium/issues/22673
+- (void)testDispatchSanitizesNonUtf8EncodableStrings
+{
+  unichar chars[] = {'a', 'b', 'c', 0xD800, 'd', 'e', 'f'};
+  NSString *unsafe = [NSString stringWithCharacters:chars length:sizeof(chars) / sizeof(unichar)];
+  NSDictionary *dictionary = @{@"value": unsafe};
+  FBResponseJSONPayload *payload = [[FBResponseJSONPayload alloc] initWithDictionary:dictionary
+                                                                        httpStatusCode:kHTTPStatusCodeOK];
+  RouteResponse *response = [RouteResponse new];
+
+  XCTAssertNoThrow([payload dispatchWithResponse:response]);
+  XCTAssertNotNil(response.responseData);
+
+  NSError *error = nil;
+  NSDictionary *parsed = [NSJSONSerialization JSONObjectWithData:response.responseData
+                                                           options:0
+                                                             error:&error];
+  XCTAssertNil(error);
+  XCTAssertEqualObjects(parsed[@"value"], @"abc�def");
+}
+
+// Dictionary keys must be sanitized too, not just values
+- (void)testDispatchSanitizesNonUtf8EncodableKeys
+{
+  unichar chars[] = {'k', 0xD800, 'y'};
+  NSString *unsafeKey = [NSString stringWithCharacters:chars length:sizeof(chars) / sizeof(unichar)];
+  NSDictionary *dictionary = @{unsafeKey: @"value"};
+  FBResponseJSONPayload *payload = [[FBResponseJSONPayload alloc] initWithDictionary:dictionary
+                                                                        httpStatusCode:kHTTPStatusCodeOK];
+  RouteResponse *response = [RouteResponse new];
+
+  XCTAssertNoThrow([payload dispatchWithResponse:response]);
+  XCTAssertNotNil(response.responseData);
+
+  NSError *error = nil;
+  NSDictionary *parsed = [NSJSONSerialization JSONObjectWithData:response.responseData
+                                                           options:0
+                                                             error:&error];
+  XCTAssertNil(error);
+  XCTAssertEqualObjects(parsed[@"k�y"], @"value");
+}
+
+- (void)testDispatchWithRegularDictionary
+{
+  NSDictionary *dictionary = @{@"value": @"regular string"};
+  FBResponseJSONPayload *payload = [[FBResponseJSONPayload alloc] initWithDictionary:dictionary
+                                                                        httpStatusCode:kHTTPStatusCodeOK];
+  RouteResponse *response = [RouteResponse new];
+
+  [payload dispatchWithResponse:response];
+
+  NSDictionary *parsed = [NSJSONSerialization JSONObjectWithData:response.responseData
+                                                           options:0
+                                                             error:nil];
+  XCTAssertEqualObjects(parsed, dictionary);
+}
+
+@end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests/FBSessionTests.m

@@ -24,15 +24,15 @@
 {
   [super setUp];
   self.testedApplication = (id)XCUIApplicationDouble.new;
-  self.shouldTerminateAppValue = FBConfiguration.shouldTerminateApp;
-  [FBConfiguration setShouldTerminateApp:NO];
+  self.shouldTerminateAppValue = FBConfiguration.sharedInstance.shouldTerminateApp;
+  FBConfiguration.sharedInstance.shouldTerminateApp = NO;
   self.session = [FBSession initWithApplication:self.testedApplication];
 }
 
 - (void)tearDown
 {
   [self.session kill];
-  [FBConfiguration setShouldTerminateApp:self.shouldTerminateAppValue];
+  FBConfiguration.sharedInstance.shouldTerminateApp = self.shouldTerminateAppValue;
   [super tearDown];
 }
 

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests/FBTouchableViewTests.m

@@ -0,0 +1,121 @@
+/**
+ * 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.
+ */
+
+#import <XCTest/XCTest.h>
+
+#import "../IntegrationApp/Classes/TouchableView.h"
+
+// Only the location and identity are needed to replay UIKit's touch callbacks.
+@interface FBFixtureTouchDouble : NSObject
+@end
+
+@implementation FBFixtureTouchDouble
+- (CGPoint)locationInView:(UIView *)view
+{
+  return CGPointMake(50, 50);
+}
+@end
+
+@interface FBTouchableViewTests : XCTestCase <TouchableViewDelegate>
+@property (nonatomic, strong) TouchableView *touchable;
+@property (nonatomic) int reportedTouches;
+@property (nonatomic) int reportedTaps;
+@end
+
+@implementation FBTouchableViewTests
+
+- (void)setUp
+{
+  [super setUp];
+  self.reportedTouches = 0;
+  self.reportedTaps = 0;
+  self.touchable = [[TouchableView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
+  self.touchable.delegate = self;
+}
+
+- (void)tearDown
+{
+  self.touchable.delegate = nil;
+  self.touchable = nil;
+  [super tearDown];
+}
+
+- (void)shouldHandleTouchesNumber:(int)touchesCount
+{
+  self.reportedTouches = touchesCount;
+}
+
+- (void)shouldHandleTapsNumber:(int)numberOfTaps
+{
+  self.reportedTaps = numberOfTaps;
+}
+
+- (UITouch *)newTouch
+{
+  return (UITouch *)[FBFixtureTouchDouble new];
+}
+
+- (void)testStaggeredTouchesTrackActiveFingers
+{
+  NSSet *first = [NSSet setWithObject:[self newTouch]];
+  NSSet *second = [NSSet setWithObject:[self newTouch]];
+  [self.touchable touchesBegan:first withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 1);
+  [self.touchable touchesBegan:second withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 2);
+  XCTAssertEqual(self.reportedTaps, 0);
+
+  [self.touchable touchesEnded:first withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 1);
+  XCTAssertEqual(self.reportedTaps, 1);
+  [self.touchable touchesEnded:second withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 2);
+}
+
+- (void)testSimultaneousContactsCountIndependentlyOfCallbackBatching
+{
+  NSSet *touches = [NSSet setWithObjects:[self newTouch], [self newTouch], nil];
+  [self.touchable touchesBegan:touches withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 2);
+  [self.touchable touchesEnded:touches withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 2);
+}
+
+- (void)testCancelledContactsDoNotCarryOverIntoNextTap
+{
+  NSSet *first = [NSSet setWithObject:[self newTouch]];
+  NSSet *second = [NSSet setWithObject:[self newTouch]];
+  [self.touchable touchesBegan:first withEvent:nil];
+  [self.touchable touchesBegan:second withEvent:nil];
+  [self.touchable touchesCancelled:[first setByAddingObjectsFromSet:second] withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 0);
+
+  NSSet *next = [NSSet setWithObject:[self newTouch]];
+  [self.touchable touchesBegan:next withEvent:nil];
+  [self.touchable touchesEnded:next withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 1);
+}
+
+- (void)testCancellingOneFingerPreservesTheOtherContact
+{
+  NSSet *first = [NSSet setWithObject:[self newTouch]];
+  NSSet *second = [NSSet setWithObject:[self newTouch]];
+  [self.touchable touchesBegan:[first setByAddingObjectsFromSet:second] withEvent:nil];
+  [self.touchable touchesCancelled:first withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 1);
+  XCTAssertEqual(self.reportedTaps, 0);
+  [self.touchable touchesEnded:second withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 1);
+}
+
+@end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests/FBXCAXClientProxyTests.m

@@ -0,0 +1,90 @@
+/**
+ * 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.
+ */
+
+#import <XCTest/XCTest.h>
+
+#import "CDStructures.h"
+#import "FBXCAXClientProxy.h"
+
+@interface FBXCAXClientProxyTests : XCTestCase
+@end
+
+@implementation FBXCAXClientProxyTests
+
+- (void)testApplicationStateTimeoutSetsValueDuringBlockAndRestoresAfter
+{
+  double original = _XCTApplicationStateTimeout();
+  __block double observed = -1;
+  BOOL completed = [FBXCAXClientProxy withApplicationStateTimeout:12.5 do:^{
+    observed = _XCTApplicationStateTimeout();
+  }];
+  XCTAssertTrue(completed);
+  XCTAssertEqual(observed, 12.5);
+  XCTAssertEqual(_XCTApplicationStateTimeout(), original);
+}
+
+- (void)testApplicationStateTimeoutNestedCallsRestoreCorrectly
+{
+  double original = _XCTApplicationStateTimeout();
+  [FBXCAXClientProxy withApplicationStateTimeout:20 do:^{
+    XCTAssertEqual(_XCTApplicationStateTimeout(), 20);
+    [FBXCAXClientProxy withApplicationStateTimeout:5 do:^{
+      XCTAssertEqual(_XCTApplicationStateTimeout(), 5);
+    }];
+    XCTAssertEqual(_XCTApplicationStateTimeout(), 20);
+  }];
+  XCTAssertEqual(_XCTApplicationStateTimeout(), original);
+}
+
+- (void)testApplicationStateTimeoutOverlappingCallsRestoreOriginalValue
+{
+  double original = _XCTApplicationStateTimeout();
+  NSInteger iterations = 50;
+  dispatch_group_t group = dispatch_group_create();
+  dispatch_queue_t queue = dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0);
+  for (NSInteger i = 0; i < iterations; i++) {
+    dispatch_group_async(group, queue, ^{
+      [FBXCAXClientProxy withApplicationStateTimeout:10 + (double)i do:^{
+        usleep(500);
+      }];
+    });
+  }
+  dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
+  XCTAssertEqual(_XCTApplicationStateTimeout(), original);
+}
+
+- (void)testXPCRequestTimeoutSetsValueDuringBlockAndRestoresAfter
+{
+  double original = _XCTXPCRequestTimeout();
+  __block double observed = -1;
+  BOOL completed = [FBXCAXClientProxy withXPCRequestTimeout:7.5 do:^{
+    observed = _XCTXPCRequestTimeout();
+  }];
+  XCTAssertTrue(completed);
+  XCTAssertEqual(observed, 7.5);
+  XCTAssertEqual(_XCTXPCRequestTimeout(), original);
+}
+
+- (void)testXPCRequestTimeoutOverlappingCallsRestoreOriginalValue
+{
+  double original = _XCTXPCRequestTimeout();
+  NSInteger iterations = 50;
+  dispatch_group_t group = dispatch_group_create();
+  dispatch_queue_t queue = dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0);
+  for (NSInteger i = 0; i < iterations; i++) {
+    dispatch_group_async(group, queue, ^{
+      [FBXCAXClientProxy withXPCRequestTimeout:10 + (double)i do:^{
+        usleep(500);
+      }];
+    });
+  }
+  dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
+  XCTAssertEqual(_XCTXPCRequestTimeout(), original);
+}
+
+@end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests/FBXPathTests.m

@@ -92,8 +92,8 @@
   NSString *resultXml = [self xmlStringWithElement:(id<FBXCElementSnapshot>)element
                                         xpathQuery:[NSString stringWithFormat:@"//%@[@*]", element.wdType]
                                excludingAttributes:@[@"visible"]];
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" value=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\" hittable=\"%@\" traits=\"%@\" nativeFrame=\"%@\" customActions=\"%@\" private_indexPath=\"top\"/>\n",
-                           element.wdType, element.wdType, @"йоло&lt;&gt;&amp;&quot;", element.wdName, @"a&#10;b", FBBoolToString(element.wdEnabled), FBBoolToString(element.wdVisible), FBBoolToString(element.wdAccessible), element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex, FBBoolToString(element.wdHittable), element.wdTraits, NSStringFromCGRect(element.wdNativeFrame), element.wdCustomActions];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" value=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" nativeAccessibilityElement=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\" hittable=\"%@\" traits=\"%@\" nativeFrame=\"%@\" customActions=\"%@\" private_indexPath=\"top\"/>\n",
+                           element.wdType, element.wdType, @"йоло&lt;&gt;&amp;&quot;", element.wdName, @"a&#10;b", FBBoolToString(element.wdEnabled), FBBoolToString(element.wdVisible), FBBoolToString(element.wdAccessible), FBBoolToString(element.wdNativeAccessibilityElement), element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex, FBBoolToString(element.wdHittable), element.wdTraits, NSStringFromCGRect(element.wdNativeFrame), element.wdCustomActions];
   XCTAssertEqualObjects(expectedXml, resultXml);
 }
 
@@ -152,4 +152,129 @@
   XCTAssertEqual(1, [matchingSnapshots count]);
 }
 
+- (NSString *)xpathStringResultForQuery:(NSString *)query document:(xmlDocPtr)doc
+{
+  xmlXPathObjectPtr queryResult = [FBXPath evaluate:query document:doc contextNode:NULL];
+  if (NULL == queryResult) {
+    return nil;
+  }
+  xmlChar *stringValue = xmlXPathCastToString(queryResult);
+  xmlXPathFreeObject(queryResult);
+  if (NULL == stringValue) {
+    return nil;
+  }
+  NSString *result = [NSString stringWithUTF8String:(const char *)stringValue];
+  xmlFree(stringValue);
+  return result;
+}
+
+- (BOOL)xpathBooleanResultForQuery:(NSString *)query document:(xmlDocPtr)doc
+{
+  xmlXPathObjectPtr queryResult = [FBXPath evaluate:query document:doc contextNode:NULL];
+  if (NULL == queryResult) {
+    return NO;
+  }
+  BOOL result = queryResult->boolval;
+  xmlXPathFreeObject(queryResult);
+  return result;
+}
+
+- (xmlDocPtr)documentForSnapshot:(XCElementSnapshotDouble *)snapshot query:(NSString *)query
+{
+  xmlDocPtr doc;
+  xmlTextWriterPtr writer = xmlNewTextWriterDoc(&doc, 0);
+  NSMutableDictionary *elementStore = [NSMutableDictionary dictionary];
+  id<FBElement> root = (id<FBElement>)[FBXCElementSnapshotWrapper ensureWrapped:(id)snapshot];
+  int rc = xmlTextWriterStartDocument(writer, NULL, "UTF-8", NULL);
+  if (rc >= 0) {
+    rc = [FBXPath xmlRepresentationWithRootElement:(id<FBXCElementSnapshot>)root
+                                            writer:writer
+                                      elementStore:elementStore
+                                             query:query
+                               excludingAttributes:nil];
+    if (rc >= 0) {
+      rc = xmlTextWriterEndDocument(writer);
+    }
+  }
+  xmlFreeTextWriter(writer);
+  XCTAssertTrue(rc >= 0);
+  return doc;
+}
+
+- (void)testXPathExtensionFunctions
+{
+  XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
+  snapshot.label = @"Hello World";
+  snapshot.value = @"One-Two-Three";
+
+  xmlDocPtr doc = [self documentForSnapshot:snapshot query:@"//*[@label and @name and @value]"];
+
+  @try {
+    XCTAssertTrue([self xpathBooleanResultForQuery:@"matches(//XCUIElementTypeOther/@label, 'Hello.*')" document:doc]);
+    XCTAssertFalse([self xpathBooleanResultForQuery:@"matches(//XCUIElementTypeOther/@label, 'hello.*')" document:doc]);
+    XCTAssertTrue([self xpathBooleanResultForQuery:@"matches(//XCUIElementTypeOther/@label, 'hello.*', 'i')" document:doc]);
+    XCTAssertTrue([self xpathBooleanResultForQuery:@"ends-with(//XCUIElementTypeOther/@name, 'Name')" document:doc]);
+    XCTAssertFalse([self xpathBooleanResultForQuery:@"ends-with(//XCUIElementTypeOther/@name, 'Foo')" document:doc]);
+    XCTAssertEqualObjects([self xpathStringResultForQuery:@"lower-case(//XCUIElementTypeOther/@label)" document:doc], @"hello world");
+    XCTAssertEqualObjects([self xpathStringResultForQuery:@"upper-case(//XCUIElementTypeOther/@name)" document:doc], @"TESTNAME");
+    XCTAssertEqualObjects([self xpathStringResultForQuery:@"replace(//XCUIElementTypeOther/@value, '-', '_')" document:doc], @"One_Two_Three");
+    XCTAssertEqualObjects([self xpathStringResultForQuery:@"string-join(tokenize(//XCUIElementTypeOther/@value, '-'), '|')" document:doc], @"One|Two|Three");
+  } @finally {
+    xmlFreeDoc(doc);
+  }
+}
+
+- (void)testInvalidXPathExtensionRegexp
+{
+  XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
+  snapshot.label = @"Hello World";
+  snapshot.value = @"One-Two-Three";
+
+  xmlDocPtr doc = [self documentForSnapshot:snapshot query:@"//*[@label and @name and @value]"];
+
+  @try {
+    [self assertXPathEvaluationFailsForQuery:@"matches(//XCUIElementTypeOther/@label, '[')" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"replace(//XCUIElementTypeOther/@label, '[', '')" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"tokenize(//XCUIElementTypeOther/@value, '[')" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"matches(//XCUIElementTypeOther/@label, 'a', 'z')" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"//XCUIElementTypeOther[matches(@label, '[')]" document:doc];
+  } @finally {
+    xmlFreeDoc(doc);
+  }
+}
+
+- (void)assertXPathEvaluationFailsForQuery:(NSString *)query document:(xmlDocPtr)doc
+{
+  xmlXPathObjectPtr queryResult = [FBXPath evaluate:query document:doc contextNode:NULL];
+  @try {
+    XCTAssertEqual(NULL, queryResult);
+  } @finally {
+    if (NULL != queryResult) {
+      xmlXPathFreeObject(queryResult);
+    }
+  }
+}
+
+- (void)testInvalidXPathExtensionFunctionArity
+{
+  XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
+  snapshot.label = @"Hello World";
+  snapshot.value = @"One-Two-Three";
+
+  xmlDocPtr doc = [self documentForSnapshot:snapshot query:@"//*[@label and @name and @value]"];
+
+  @try {
+    [self assertXPathEvaluationFailsForQuery:@"matches(//XCUIElementTypeOther/@label)" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"lower-case()" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"string-join(//XCUIElementTypeOther/@label)" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"replace(//XCUIElementTypeOther/@label, '-')" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"//XCUIElementTypeOther[matches(@label)]" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"//XCUIElementTypeOther[lower-case()]" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"//XCUIElementTypeOther[string-join(@label)]" document:doc];
+    [self assertXPathEvaluationFailsForQuery:@"//XCUIElementTypeOther[replace(@label, '-')]" document:doc];
+  } @finally {
+    xmlFreeDoc(doc);
+  }
+}
+
 @end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests/NSDictionaryFBUtf8SafeTests.m

@@ -31,4 +31,47 @@
   XCTAssertEqualObjects(d, d.fb_utf8SafeDictionary);
 }
 
+- (void)testUnpairedSurrogateSanitization
+{
+  unichar chars[] = {'a', 'b', 'c', 0xD800, 'd', 'e', 'f'};
+  NSString *unsafe = [NSString stringWithCharacters:chars length:sizeof(chars) / sizeof(unichar)];
+  NSDictionary *d = @{
+    @"key": unsafe,
+    @"nested": @{@"value": @[unsafe]},
+  };
+  NSDictionary *safe = d.fb_utf8SafeDictionary;
+
+  NSString *expected = @"abc�def";
+  XCTAssertEqualObjects(safe[@"key"], expected);
+  XCTAssertEqualObjects(safe[@"nested"][@"value"][0], expected);
+
+  NSError *error = nil;
+  NSData *jsonData = [NSJSONSerialization dataWithJSONObject:safe
+                                                     options:0
+                                                       error:&error];
+  XCTAssertNotNil(jsonData, @"JSON serialization of the sanitized dictionary unexpectedly failed: %@", error);
+}
+
+- (void)testUnpairedSurrogateKeySanitization
+{
+  unichar chars[] = {'k', 0xD800, 'y'};
+  NSString *unsafeKey = [NSString stringWithCharacters:chars length:sizeof(chars) / sizeof(unichar)];
+  NSDictionary *d = @{unsafeKey: @"value"};
+  NSDictionary *safe = d.fb_utf8SafeDictionary;
+
+  XCTAssertEqualObjects(safe[@"k�y"], @"value");
+
+  NSError *error = nil;
+  NSData *jsonData = [NSJSONSerialization dataWithJSONObject:safe
+                                                     options:0
+                                                       error:&error];
+  XCTAssertNotNil(jsonData, @"JSON serialization of the sanitized dictionary unexpectedly failed: %@", error);
+}
+
+- (void)testValidSurrogatePairIsPreserved
+{
+  NSString *emoji = @"a😀b";
+  XCTAssertEqualObjects([emoji fb_utf8SafeStringWithReplacement:0xfffd], emoji);
+}
+
 @end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests_tvOS/Doubles/FBXCAccessibilityElementDouble.h

@@ -0,0 +1,27 @@
+/**
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Minimal fake of the private `id<FBXCAccessibilityElement>` handle every
+ real snapshot carries, just enough for `FBElementUtils uidWithAccessibilityElement:`
+ to derive a stable, distinct `wdUID` per fake element id.
+ */
+@interface FBXCAccessibilityElementDouble : NSObject
+
+@property (nonatomic, readonly) id payload;
+@property (nonatomic, readonly) int processIdentifier;
+
+- (instancetype)initWithElementId:(unsigned long long)elementId;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests_tvOS/Doubles/FBXCAccessibilityElementDouble.m

@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+
+#import "FBXCAccessibilityElementDouble.h"
+
+@implementation FBXCAccessibilityElementDouble
+
+- (instancetype)initWithElementId:(unsigned long long)elementId
+{
+  self = [super init];
+  if (self) {
+    _payload = @{@"uid.elementID": @(elementId)};
+    _processIdentifier = 1;
+  }
+  return self;
+}
+
+@end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests_tvOS/Doubles/FBXCElementSnapshotDouble.h

@@ -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.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "FBXCAccessibilityElementDouble.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Fake `id<FBXCElementSnapshot>` leaf node. Deliberately does NOT declare
+ formal conformance to the (large, mostly-unrelated) `FBXCElementSnapshot`
+ protocol - it only implements the selectors
+ `FBTVNavigationTracker`'s `-directionTowardsTargetFromFocusedElementSnapshot:`
+ actually reads: `frame`, `hasFocus` and `accessibilityElement` (the latter
+ indirectly, via `FBXCElementSnapshotWrapper.wdUID`). Cast to
+ `id<FBXCElementSnapshot>` at the call site. Lets tests supply a fake focused
+ element snapshot without a live app/device.
+ */
+@interface FBXCElementSnapshotDouble : NSObject
+
+@property (nonatomic, assign) CGRect frame;
+@property (nonatomic, assign) BOOL hasFocus;
+@property (nonatomic, strong, nullable) FBXCAccessibilityElementDouble *accessibilityElement;
+
+/**
+ @param elementId Fake AX element id, used to derive a distinct `wdUID`
+ @param frame The snapshot's frame
+ @param hasFocus Whether this node should report `hasFocus == YES`
+ @return A snapshot double
+ */
++ (instancetype)snapshotWithElementId:(unsigned long long)elementId
+                                 frame:(CGRect)frame
+                              hasFocus:(BOOL)hasFocus;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests_tvOS/Doubles/FBXCElementSnapshotDouble.m

@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+
+#import "FBXCElementSnapshotDouble.h"
+
+@implementation FBXCElementSnapshotDouble
+
++ (instancetype)snapshotWithElementId:(unsigned long long)elementId
+                                 frame:(CGRect)frame
+                              hasFocus:(BOOL)hasFocus
+{
+  FBXCElementSnapshotDouble *snapshot = [self new];
+  snapshot.accessibilityElement = [[FBXCAccessibilityElementDouble alloc] initWithElementId:elementId];
+  snapshot.frame = frame;
+  snapshot.hasFocus = hasFocus;
+  return snapshot;
+}
+
+@end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests_tvOS/Doubles/XCUIElementDouble.h

@@ -29,6 +29,7 @@
 @property (nonatomic, readwrite) NSUInteger wdIndex;
 @property (nonatomic, readwrite, getter=isWDVisible) BOOL wdVisible;
 @property (nonatomic, readwrite, getter=isWDAccessible) BOOL wdAccessible;
+@property (nonatomic, readwrite, getter=isWDNativeAccessibilityElement) BOOL wdNativeAccessibilityElement;
 @property (nonatomic, readwrite, getter=isWDFocused) BOOL wdFocused;
 @property (nonatomic, readwrite, getter = isWDHittable) BOOL wdHittable;
 @property (copy, nonnull) NSArray *children;

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/UnitTests_tvOS/Doubles/XCUIElementDouble.m

@@ -24,6 +24,7 @@
     self.wdValue = @"magicValue";
     self.wdVisible = YES;
     self.wdAccessible = YES;
+    self.wdNativeAccessibilityElement = YES;
     self.wdEnabled = YES;
     self.wdSelected = YES;
     self.wdHittable = YES;