appium-webdriveragent 16.12.11 → 16.13.1

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -504,6 +504,18 @@ static NSString *const topNodeIndexPath = @"top";
                      indexPath:(nullable NSString *)indexPath
             includedAttributes:(nullable NSSet<Class> *)includedAttributes
 {
+  return [self recordElementAttributes:writer forElement:element indexPath:indexPath
+                   includedAttributes:includedAttributes siblingIndex:nil];
+}
+
++ (int)recordElementAttributes:(xmlTextWriterPtr)writer
+                    forElement:(id<FBXCElementSnapshot>)element
+                     indexPath:(nullable NSString *)indexPath
+            includedAttributes:(nullable NSSet<Class> *)includedAttributes
+                  siblingIndex:(nullable NSNumber *)siblingIndex
+{
+  FBXCElementSnapshotWrapper *wrapped = [FBXCElementSnapshotWrapper ensureWrapped:element];
+  NSDictionary *rect = nil;
   for (Class attributeCls in FBElementAttribute.supportedAttributes) {
     // include all supported attributes by default unless enumerated explicitly
     if (includedAttributes && ![includedAttributes containsObject:attributeCls]) {
@@ -519,8 +531,15 @@ static NSString *const topNodeIndexPath = @"top";
         !FBDoesElementSupportMinMaxValue(element.elementType)) {
       continue;
     }
-    int rc = [attributeCls recordWithWriter:writer
-                                 forElement:[FBXCElementSnapshotWrapper ensureWrapped:element]];
+    int rc;
+    if (attributeCls == FBIndexAttribute.class && nil != siblingIndex) {
+      rc = [attributeCls recordWithWriter:writer forValue:siblingIndex.stringValue];
+    } else if ([attributeCls isSubclassOfClass:FBDimensionAttribute.class]) {
+      rect = rect ?: wrapped.wdRect;
+      rc = [attributeCls recordWithWriter:writer forValue:[rect[[attributeCls name]] description]];
+    } else {
+      rc = [attributeCls recordWithWriter:writer forElement:wrapped];
+    }
     if (rc < 0) {
       return rc;
     }
@@ -559,6 +578,17 @@ static NSString *const topNodeIndexPath = @"top";
                   elementStore:(nullable NSMutableDictionary *)elementStore
             includedAttributes:(nullable NSSet<Class> *)includedAttributes
                         writer:(xmlTextWriterPtr)writer
+{
+  return [self writeXmlWithRootElement:root indexPath:indexPath elementStore:elementStore
+                   includedAttributes:includedAttributes writer:writer siblingIndex:nil];
+}
+
++ (int)writeXmlWithRootElement:(id<FBXCElementSnapshot>)root
+                     indexPath:(nullable NSString *)indexPath
+                  elementStore:(nullable NSMutableDictionary *)elementStore
+            includedAttributes:(nullable NSSet<Class> *)includedAttributes
+                        writer:(xmlTextWriterPtr)writer
+                  siblingIndex:(nullable NSNumber *)siblingIndex
 {
   NSAssert((indexPath == nil && elementStore == nil) || (indexPath != nil && elementStore != nil), @"Either both or none of indexPath and elementStore arguments should be equal to nil", nil);
 
@@ -578,7 +608,8 @@ static NSString *const topNodeIndexPath = @"top";
   rc = [self recordElementAttributes:writer
                           forElement:root
                            indexPath:indexPath
-                  includedAttributes:includedAttributes];
+                  includedAttributes:includedAttributes
+                        siblingIndex:siblingIndex];
   if (rc < 0) {
     return rc;
   }
@@ -594,7 +625,8 @@ static NSString *const topNodeIndexPath = @"top";
                                indexPath:newIndexPath
                             elementStore:elementStore
                       includedAttributes:includedAttributes
-                                  writer:writer];
+                                  writer:writer
+                            siblingIndex:@(i)];
       if (rc < 0) {
         return rc;
       }

package/WebDriverAgentLib/Utilities/LRUCache/LRUCache.m

@@ -80,7 +80,7 @@
   }
   LRUCacheNode *nextNode = node.next;
   if (nil != nextNode) {
-    nextNode.prev = node.prev;
+    nextNode.prev = previousNode;
   }
   if (node == self.tailNode) {
     self.tailNode = previousNode;
@@ -94,19 +94,22 @@
     return;
   }
 
+  LRUCacheNode *previousNode = node.prev;
   if (nil != node.next) {
-    node.next.prev = node.prev;
+    node.next.prev = previousNode;
   }
   if (node == self.headNode) {
     self.headNode = node.next;
   }
-  if (nil != node.prev) {
-    node.prev.next = node.next;
+  if (nil != previousNode) {
+    previousNode.next = node.next;
   }
   if (node == self.tailNode) {
-    self.tailNode = node.prev;
+    self.tailNode = previousNode;
   }
   [self.store removeObjectForKey:(id)node.key];
+  node.next = nil;
+  node.prev = nil;
 }
 
 - (nullable LRUCacheNode *)addNodeToHead:(nullable LRUCacheNode *)node

package/WebDriverAgentLib/Utilities/LRUCache/LRUCacheNode.h

@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 /*! Pointer to the next node */
 @property (nonatomic, nullable) LRUCacheNode *next;
 /*! Pointer to the previous node */
-@property (nonatomic, nullable) LRUCacheNode *prev;
+@property (nonatomic, weak, nullable) LRUCacheNode *prev;
 
 /**
  Factory method to create a new cache node with the given value and key

package/WebDriverAgentTests/IntegrationTests/FBElementSwipingTests.m

@@ -13,6 +13,10 @@
 #import "XCUIElement+FBWebDriverAttributes.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIElement+FBSwiping.h"
+#import "FBExceptions.h"
+#import "XCUIApplication+FBTouchAction.h"
+#import "XCSynthesizedEventRecord.h"
+#import "XCUICoordinate.h"
 
 @interface FBElementSwipingTests : FBIntegrationTestCase
 @property (nonatomic, strong) XCUIElement *scrollView;
@@ -125,3 +129,94 @@
 }
 
 @end
+
+/**
+ Stands in for a coordinate whose application did not deliver a usable snapshot (as happens for a
+ busy application right after an app switch), which XCTest resolves to an infinite screen point.
+ */
+@interface FBUnresolvableCoordinate : XCUICoordinate
+@end
+
+@implementation FBUnresolvableCoordinate
+
+- (CGPoint)screenPoint
+{
+  return CGPointMake(INFINITY, INFINITY);
+}
+
+@end
+
+@interface FBPressAndDragTests : FBIntegrationTestCase
+@end
+
+@implementation FBPressAndDragTests
+
+- (void)setUp
+{
+  [super setUp];
+  [self resetOrientation];
+  [self launchApplication];
+  [self goToScrollPageWithCells:YES];
+}
+
+- (void)testPressAndDragBetweenApplicationCoordinates
+{
+  XCUICoordinate *start = [self.testedApplication coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.7)];
+  XCUICoordinate *end = [self.testedApplication coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.3)];
+  NSError *error;
+  XCTAssertTrue([self.testedApplication fb_pressAtCoordinate:start
+                                                 forDuration:0.3
+                                        thenDragToCoordinate:end
+                                                withVelocity:XCUIGestureVelocityDefault
+                                         thenHoldForDuration:0
+                                                       error:&error]);
+  XCTAssertNil(error);
+  FBAssertInvisibleCell(@"0");
+}
+
+// https://github.com/appium/WebDriverAgent/issues/1056
+- (void)testPressAndDragFailsCleanlyForUnresolvableCoordinates
+{
+  XCUICoordinate *start = [[FBUnresolvableCoordinate alloc] initWithElement:self.testedApplication
+                                                           normalizedOffset:CGVectorMake(0.5, 0.7)];
+  XCUICoordinate *end = [self.testedApplication coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.3)];
+  NSError *error;
+  XCTAssertFalse([self.testedApplication fb_pressAtCoordinate:start
+                                                  forDuration:0.3
+                                         thenDragToCoordinate:end
+                                                 withVelocity:XCUIGestureVelocityDefault
+                                          thenHoldForDuration:0
+                                                        error:&error]);
+  XCTAssertTrue([error.localizedDescription containsString:@"Cannot resolve the on-screen position"]);
+  FBAssertVisibleCell(@"0");
+}
+
+- (void)testPressDragEventKeepsDisplayIDAndTiming
+{
+  XCSynthesizedEventRecord *event = [XCUIApplication fb_pressDragEventFromPoint:CGPointMake(100, 500)
+                                                                    forDuration:0.3
+                                                                        toPoint:CGPointMake(100, 100)
+                                                                pointsPerSecond:500
+                                                            thenHoldForDuration:0.1
+                                                                      displayID:42
+                                                           interfaceOrientation:UIInterfaceOrientationPortrait];
+  XCTAssertEqual(event.displayID, 42ULL);
+  XCTAssertEqual(event.eventPaths.count, 1U);
+  // 0.3 s press + 400 pt / 500 pt per s drag + 0.1 s hold
+  XCTAssertEqualWithAccuracy(event.maximumOffset, 1.2, 0.0001);
+}
+
+- (void)testPressAndDragRejectsInvalidVelocity
+{
+  XCUICoordinate *start = [self.testedApplication coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.7)];
+  XCUICoordinate *end = [self.testedApplication coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.3)];
+  XCTAssertThrowsSpecificNamed([self.testedApplication fb_pressAtCoordinate:start
+                                                                forDuration:0
+                                                       thenDragToCoordinate:end
+                                                               withVelocity:0
+                                                        thenHoldForDuration:0
+                                                                      error:nil],
+                               NSException, FBInvalidArgumentException);
+}
+
+@end

package/WebDriverAgentTests/IntegrationTests/FBImageProcessorTests.m

@@ -9,6 +9,7 @@
 #import <XCTest/XCTest.h>
 
 #import "FBImageProcessor.h"
+@import UniformTypeIdentifiers;
 #import "FBIntegrationTestCase.h"
 
 
@@ -80,3 +81,36 @@
 
 @end
 
+
+
+// Synthetic images keep these renderer regressions independent of the app's screen.
+@interface FBImageRendererScalingTests : XCTestCase
+@end
+
+@implementation FBImageRendererScalingTests
+
+- (void)testOrientationFixDoesNotApplyScalingTwice
+{
+  for (NSNumber *sourceScale in @[@1, @2, @3]) {
+    UIGraphicsImageRendererFormat *format = [UIGraphicsImageRendererFormat new];
+    format.scale = sourceScale.doubleValue;
+    UIGraphicsImageRenderer *renderer = [[UIGraphicsImageRenderer alloc]
+      initWithSize:CGSizeMake(120, 80) format:format];
+    NSData *data = [renderer PNGDataWithActions:^(UIGraphicsImageRendererContext *context) {
+      [UIColor.redColor setFill];
+      [context fillRect:CGRectMake(0, 0, 120, 80)];
+    }];
+    FBImageProcessor *processor = [FBImageProcessor new];
+    NSData *scaled = [processor scaledImageWithData:data
+                                               uti:UTTypePNG
+                                     scalingFactor:0.5
+                                compressionQuality:1.0
+                                             error:nil];
+    UIImage *image = [UIImage imageWithData:scaled];
+    XCTAssertNotNil(image);
+    XCTAssertEqual(CGImageGetWidth(image.CGImage), (size_t)(60 * sourceScale.integerValue));
+    XCTAssertEqual(CGImageGetHeight(image.CGImage), (size_t)(40 * sourceScale.integerValue));
+  }
+}
+
+@end

package/WebDriverAgentTests/IntegrationTests/FBScreenTests.m

@@ -9,7 +9,10 @@
 #import <XCTest/XCTest.h>
 
 #import "FBIntegrationTestCase.h"
+#import "FBConfiguration.h"
 #import "FBScreen.h"
+#import "FBScreenshot.h"
+#import "XCUIScreen.h"
 
 @interface FBScreenTests : FBIntegrationTestCase
 @end
@@ -22,6 +25,12 @@
   [self launchApplication];
 }
 
+- (void)tearDown
+{
+  FBConfiguration.sharedInstance.currentDisplayId = nil;
+  [super tearDown];
+}
+
 - (void)testDisplayID
 {
   XCTAssertGreaterThanOrEqual([FBScreen displayID], 0LL);
@@ -50,6 +59,64 @@
   XCTAssertNotNil(mainScreen[@"traits"]);
 }
 
+- (void)testScreenWithDisplayID
+{
+  NSError *error = nil;
+  XCUIScreen *screen = [FBScreen screenWithDisplayID:[FBScreen displayID] error:&error];
+  XCTAssertNil(error);
+  XCTAssertEqual(screen.displayID, [FBScreen displayID]);
+
+  XCTAssertNil([FBScreen screenWithDisplayID:[self unknownDisplayID] error:&error]);
+  XCTAssertNotNil(error);
+  NSMutableArray<NSNumber *> *availableIDs = [NSMutableArray array];
+  for (NSDictionary<NSString *, id> *availableScreen in [FBScreen screensWithError:nil]) {
+    [availableIDs addObject:availableScreen[@"displayId"]];
+  }
+  NSString *availableDisplays = [NSString stringWithFormat:@"Available display ids: [%@]",
+                                [availableIDs componentsJoinedByString:@", "]];
+  XCTAssertTrue([error.localizedDescription containsString:availableDisplays]);
+}
+
+- (void)testCurrentScreenDefaultsToMainScreen
+{
+  NSError *error = nil;
+  XCTAssertTrue([FBScreen currentScreenWithError:&error].isMainScreen);
+  XCTAssertNil(error);
+}
+
+- (void)testCurrentScreenFollowsSetting
+{
+  FBConfiguration.sharedInstance.currentDisplayId = @([FBScreen displayID]);
+  NSError *error = nil;
+  XCTAssertEqual([FBScreen currentScreenWithError:&error].displayID, [FBScreen displayID]);
+  XCTAssertNil(error);
+  XCTAssertNotNil([FBScreenshot takeInOriginalResolutionWithQuality:0 error:&error]);
+  XCTAssertNil(error);
+
+  FBConfiguration.sharedInstance.currentDisplayId = @([self unknownDisplayID]);
+  XCTAssertNil([FBScreen currentScreenWithError:&error]);
+  XCTAssertNotNil(error);
+  error = nil;
+  XCTAssertNil([FBScreenshot takeInOriginalResolutionWithQuality:0 error:&error]);
+  XCTAssertNotNil(error);
+}
+
+- (void)testSessionResetClearsCurrentDisplay
+{
+  FBConfiguration.sharedInstance.currentDisplayId = @([FBScreen displayID]);
+  [FBConfiguration.sharedInstance resetSessionSettings];
+  XCTAssertNil(FBConfiguration.sharedInstance.currentDisplayId);
+}
+
+- (long long)unknownDisplayID
+{
+  long long maxID = 0;
+  for (NSDictionary<NSString *, id> *screen in [FBScreen screensWithError:nil]) {
+    maxID = MAX(maxID, [screen[@"displayId"] longLongValue]);
+  }
+  return maxID + 1;
+}
+
 - (void)testScreenScale
 {
   XCTAssertTrue([FBScreen scale] >= 2);

package/WebDriverAgentTests/UnitTests/FBHTTPServerTests.m

@@ -17,11 +17,35 @@
 
 static atomic_int gFramingProbeHits;
 
+// The response in `data` once all of it has arrived - its header block and Content-Length body -
+// or nil while more is due.
+static NSString *FBCompleteResponse(NSData *data)
+{
+  NSData *separator = (NSData * _Nonnull)[@"\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding];
+  NSRange headerEnd = [data rangeOfData:separator options:(NSDataSearchOptions)0 range:NSMakeRange(0, data.length)];
+  if (NSNotFound == headerEnd.location) {
+    return nil;
+  }
+  NSString *headers = [[NSString alloc] initWithData:[data subdataWithRange:NSMakeRange(0, headerEnd.location)] encoding:NSUTF8StringEncoding];
+  NSUInteger contentLength = 0;
+  for (NSString *line in [headers componentsSeparatedByString:@"\r\n"]) {
+    NSArray<NSString *> *field = [line componentsSeparatedByString:@":"];
+    if (2 == field.count && NSOrderedSame == [field[0] caseInsensitiveCompare:@"Content-Length"]) {
+      contentLength = (NSUInteger)[field[1] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet].integerValue;
+    }
+  }
+  if (data.length < NSMaxRange(headerEnd) + contentLength) {
+    return nil;
+  }
+  return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+}
+
 // Exercises FBHTTPServer's HTTP framing defenses with raw socket data that URL-loading APIs
 // cannot produce: malformed Content-Length values and header blocks that never terminate.
 @interface FBHTTPServerTests : XCTestCase
 @property (nonatomic, strong) FBHTTPServer *server;
 @property (nonatomic, assign) uint16_t port;
+@property (nonatomic, strong) dispatch_semaphore_t slowRouteStarted;
 @end
 
 @implementation FBHTTPServerTests
@@ -38,6 +62,13 @@ static atomic_int gFramingProbeHits;
   [self.server get:@"/framing/ping" withBlock:^(RouteRequest *request, RouteResponse *response) {
     [response respondWithString:@"pong"];
   }];
+  dispatch_semaphore_t slowRouteStarted = dispatch_semaphore_create(0);
+  self.slowRouteStarted = slowRouteStarted;
+  [self.server get:@"/framing/slow" withBlock:^(RouteRequest *request, RouteResponse *response) {
+    dispatch_semaphore_signal(slowRouteStarted);
+    [NSThread sleepForTimeInterval:0.5];
+    [response respondWithString:@"slow-ok"];
+  }];
   self.server.port = 0;
   NSError *error;
   XCTAssertTrue([self.server start:&error], @"%@", error);
@@ -51,14 +82,12 @@ static atomic_int gFramingProbeHits;
   [super tearDown];
 }
 
-// Sends `payload` as-is and reads until the server closes the connection or `timeout` elapses.
-// Returns everything received (nil on connect failure); *didClose reports whether EOF was seen.
-- (NSString *)responseForRawPayload:(NSData *)payload timeout:(NSTimeInterval)timeout didClose:(BOOL *)didClose
+// A socket connected to the server that gives up reading after `timeout`, or -1.
+- (int)connectedSocketWithTimeout:(NSTimeInterval)timeout
 {
-  *didClose = NO;
   int fd = socket(AF_INET, SOCK_STREAM, 0);
   if (fd < 0) {
-    return nil;
+    return -1;
   }
   int noSigpipe = 1;
   setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &noSigpipe, sizeof(noSigpipe));
@@ -68,6 +97,84 @@ static atomic_int gFramingProbeHits;
   addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
   if (0 != connect(fd, (struct sockaddr *)&addr, sizeof(addr))) {
     close(fd);
+    return -1;
+  }
+  return fd;
+}
+
+// Descriptors in this process bound to the server's port: its listener plus one per server-side
+// connection still open. Client sockets are bound to ephemeral ports, so they never count.
+- (NSInteger)serverSocketCount
+{
+  NSInteger count = 0;
+  int limit = getdtablesize();
+  for (int fd = 0; fd < limit; fd++) {
+    struct sockaddr_storage addr;
+    socklen_t length = sizeof(addr);
+    if (0 != getsockname(fd, (struct sockaddr *)&addr, &length)) {
+      continue;
+    }
+    in_port_t port = 0;
+    if (AF_INET == addr.ss_family) {
+      port = ((struct sockaddr_in *)&addr)->sin_port;
+    } else if (AF_INET6 == addr.ss_family) {
+      port = ((struct sockaddr_in6 *)&addr)->sin6_port;
+    }
+    if (ntohs(port) == self.port) {
+      count++;
+    }
+  }
+  return count;
+}
+
+// The server learns about hang-ups asynchronously: polls until it holds `expected` sockets or
+// 5 seconds pass, and returns the last count.
+- (NSInteger)serverSocketCountSettlingAt:(NSInteger)expected
+{
+  NSInteger count = [self serverSocketCount];
+  NSDate *deadline = [NSDate dateWithTimeIntervalSinceNow:5.0];
+  while (count != expected && deadline.timeIntervalSinceNow > 0) {
+    [NSThread sleepForTimeInterval:0.05];
+    count = [self serverSocketCount];
+  }
+  return count;
+}
+
+// Sends `request` on a new connection, reads its complete response and then hangs up first, the
+// way curl or iproxy end a keep-alive exchange. Returns nil unless the server answered and still
+// held its side open when the client hung up.
+- (NSString *)responseClosingFirstForRequest:(NSString *)request
+{
+  int fd = [self connectedSocketWithTimeout:5.0];
+  if (fd < 0) {
+    return nil;
+  }
+  NSData *payload = (NSData * _Nonnull)[request dataUsingEncoding:NSUTF8StringEncoding];
+  send(fd, payload.bytes, payload.length, 0);
+  NSMutableData *received = [NSMutableData data];
+  NSString *response = nil;
+  char chunk[4096];
+  while (nil == response) {
+    ssize_t n = recv(fd, chunk, sizeof(chunk), 0);
+    if (n <= 0) {
+      break;
+    }
+    [received appendBytes:chunk length:(NSUInteger)n];
+    response = FBCompleteResponse(received);
+  }
+  char probe;
+  BOOL isStillOpen = -1 == recv(fd, &probe, 1, MSG_PEEK | MSG_DONTWAIT) && EAGAIN == errno;
+  close(fd);
+  return isStillOpen ? response : nil;
+}
+
+// Sends `payload` as-is and reads until the server closes the connection or `timeout` elapses.
+// Returns everything received (nil on connect failure); *didClose reports whether EOF was seen.
+- (NSString *)responseForRawPayload:(NSData *)payload timeout:(NSTimeInterval)timeout didClose:(BOOL *)didClose
+{
+  *didClose = NO;
+  int fd = [self connectedSocketWithTimeout:timeout];
+  if (fd < 0) {
     return nil;
   }
   // send(2) may write only part of the payload, which would truncate the multi-KiB flood
@@ -122,6 +229,43 @@ static atomic_int gFramingProbeHits;
   XCTAssertTrue([response containsString:@"pong"], @"%@", response);
 }
 
+- (void)testConnectionsTheClientClosesReleaseTheirSockets
+{
+  // The server keeps a connection open after answering, so the client is the one that hangs up.
+  // Each such connection must give its server-side socket back, or a long-running server
+  // eventually fails every request with EMFILE.
+  NSInteger baseline = [self serverSocketCount];
+  for (int i = 0; i < 50; i++) {
+    NSString *response = [self responseClosingFirstForRequest:@"GET /framing/ping HTTP/1.1\r\n\r\n"];
+    XCTAssertTrue([response containsString:@"pong"], @"%@", response);
+  }
+  XCTAssertEqual([self serverSocketCountSettlingAt:baseline], baseline);
+}
+
+- (void)testHalfClosedClientGetsItsResponseAndIsThenClosed
+{
+  // A client may shut down its sending side right after the request and wait for the response.
+  // Its end-of-stream must not cost it that response, and the server must close afterwards.
+  NSInteger baseline = [self serverSocketCount];
+  int fd = [self connectedSocketWithTimeout:5.0];
+  XCTAssertGreaterThanOrEqual(fd, 0);
+  NSData *payload = (NSData * _Nonnull)[@"GET /framing/slow HTTP/1.1\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding];
+  XCTAssertEqual(send(fd, payload.bytes, payload.length, 0), (ssize_t)payload.length);
+  XCTAssertEqual(dispatch_semaphore_wait(self.slowRouteStarted, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC))), 0L);
+  XCTAssertEqual(shutdown(fd, SHUT_WR), 0);
+  NSMutableData *received = [NSMutableData data];
+  char chunk[4096];
+  ssize_t n;
+  while ((n = recv(fd, chunk, sizeof(chunk), 0)) > 0) {
+    [received appendBytes:chunk length:(NSUInteger)n];
+  }
+  close(fd);
+  NSString *response = [[NSString alloc] initWithData:received encoding:NSUTF8StringEncoding];
+  XCTAssertTrue([response containsString:@"slow-ok"], @"%@", response);
+  XCTAssertEqual(n, (ssize_t)0, @"the server must close the connection once it has answered");
+  XCTAssertEqual([self serverSocketCountSettlingAt:baseline], baseline);
+}
+
 - (void)testNonNumericContentLengthIsRejected
 {
   // Under -integerValue's lenient parsing "bogus" became 0: the probe route would run with an

package/WebDriverAgentTests/UnitTests/FBLRUCacheTests.m

@@ -15,6 +15,40 @@
 
 @implementation FBLRUCacheTests
 
+- (void)testDestroyingCacheReleasesAllValues
+{
+  __weak NSObject *firstValue;
+  __weak NSObject *secondValue;
+  @autoreleasepool {
+    LRUCache *cache = [[LRUCache alloc] initWithCapacity:2];
+    NSObject *first = [NSObject new];
+    NSObject *second = [NSObject new];
+    firstValue = first;
+    secondValue = second;
+    [cache setObject:first forKey:@"first"];
+    [cache setObject:second forKey:@"second"];
+    XCTAssertNotNil([cache objectForKey:@"first"]);
+  }
+  XCTAssertNil(firstValue);
+  XCTAssertNil(secondValue);
+}
+
+- (void)testRemovingValueReleasesItWhileCacheRemainsAlive
+{
+  LRUCache *cache = [[LRUCache alloc] initWithCapacity:3];
+  __weak NSObject *removedValue;
+  @autoreleasepool {
+    NSObject *value = [NSObject new];
+    removedValue = value;
+    [cache setObject:@"oldest" forKey:@"oldest"];
+    [cache setObject:value forKey:@"removed"];
+    [cache setObject:@"newest" forKey:@"newest"];
+    [cache removeObjectForKey:@"removed"];
+  }
+  XCTAssertNil(removedValue);
+  XCTAssertEqualObjects(cache.allObjects, (@[@"newest", @"oldest"]));
+}
+
 - (void)assertArray:(NSArray *)array1 equalsTo:(NSArray *)array2
 {
   XCTAssertEqualObjects(array1, array2);

package/WebDriverAgentTests/UnitTests/FBXPathTests.m

@@ -16,11 +16,47 @@
 #import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "XCTestPrivateSymbols.h"
 
+@interface FBTraversalSnapshot : XCElementSnapshotDouble
+@property (nonatomic, copy) NSArray *childSnapshots;
+@property (nonatomic, weak) FBTraversalSnapshot *parentSnapshot;
+@property (nonatomic) NSUInteger childrenReads;
+@property (nonatomic) NSUInteger frameReads;
+@end
+@implementation FBTraversalSnapshot
+- (NSArray *)children { self.childrenReads++; return self.childSnapshots ?: @[]; }
+- (id)parent { return self.parentSnapshot; }
+- (CGRect)frame { self.frameReads++; return CGRectMake(1, 2, 3, 4); }
+@end
+
 @interface FBXPathTests : XCTestCase
 @end
 
 @implementation FBXPathTests
 
+- (void)testSerializationVisitsSiblingListAndFrameOnce
+{
+  FBTraversalSnapshot *root = [FBTraversalSnapshot new];
+  NSMutableArray *children = [NSMutableArray array];
+  for (NSUInteger index = 0; index < 64; index++) {
+    FBTraversalSnapshot *child = [FBTraversalSnapshot new];
+    child.parentSnapshot = root;
+    [children addObject:child];
+  }
+  root.childSnapshots = children;
+  NSString *query = @"//*[@index >= 0 and @x=1 and @y=2 and @width=3 and @height=4]";
+  xmlDocPtr doc = [self documentForSnapshot:root query:query];
+  @try {
+    XCTAssertEqual(root.childrenReads, 1u);
+    XCTAssertEqual(root.frameReads, 1u);
+    for (FBTraversalSnapshot *child in children) {
+      XCTAssertEqual(child.frameReads, 1u);
+    }
+    XCTAssertEqualObjects([self xpathStringResultForQuery:@"count(//*[@index=63])" document:doc], @"1");
+  } @finally {
+    xmlFreeDoc(doc);
+  }
+}
+
 - (NSString *)xmlStringWithElement:(id<FBXCElementSnapshot>)snapshot
                         xpathQuery:(nullable NSString *)query
                excludingAttributes:(nullable NSArray<NSString *> *)excludedAttributes

package/build/lib/xcodebuild.d.ts

@@ -33,7 +33,6 @@ export declare class XcodeBuild {
     private readonly resultBundlePath?;
     private readonly resultBundleVersion?;
     private _didBuildFail;
-    private _didProcessExit;
     private readonly _buildSettingsPromises;
     private noSessionProxy?;
     private xctestrunFilePath?;

package/build/lib/xcodebuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xcodebuild.d.ts","sourceRoot":"","sources":["../../lib/xcodebuild.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xcodebuild.d.ts","sourceRoot":"","sources":["../../lib/xcodebuild.ts"],"names":[],"mappings":"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"}