appium-webdriveragent 16.1.1 → 16.1.3

package/WebDriverAgentLib/Routing/FBSession.m

@@ -24,7 +24,6 @@
 #import "FBXCTestDaemonsProxy.h"
 #import "XCUIApplication+FBQuiescence.h"
 #import "XCUIElement.h"
-#import "XCUIElement+FBClassChain.h"
 
 /*!
  The intial value for the default application property.
@@ -56,14 +55,10 @@ NSString *const FB_SAFARI_BUNDLE_ID = @"com.apple.mobilesafari";
   NSString *autoClickAlertSelector = FBConfiguration.autoClickAlertSelector;
   if ([autoClickAlertSelector length] > 0) {
     @try {
-      NSArray<XCUIElement*> *matches = [alert.alertElement fb_descendantsMatchingClassChain:autoClickAlertSelector
-                                                                shouldReturnAfterFirstMatch:YES];
-      if (matches.count > 0) {
-          [[matches objectAtIndex:0] tap];
-      }
+      [alert clickElementMatchingClassChain:autoClickAlertSelector];
     } @catch (NSException *e) {
       [FBLogger logFmt:@"Could not click at the alert element '%@'. Original error: %@",
-       autoClickAlertSelector, e.description];
+        autoClickAlertSelector, e.reason];
     }
     // This setting has priority over other settings if enabled
     return;
@@ -73,14 +68,17 @@ NSString *const FB_SAFARI_BUNDLE_ID = @"com.apple.mobilesafari";
     return;
   }
 
-  NSError *error;
   if ([self.defaultAlertAction isEqualToString:@"accept"]) {
-    if (![alert acceptWithError:&error]) {
-      [FBLogger logFmt:@"Cannot accept the alert. Original error: %@", error.description];
+    @try {
+      [alert accept];
+    } @catch (NSException *e) {
+      [FBLogger logFmt:@"Cannot accept the alert. Original error: %@", e.reason];
     }
   } else if ([self.defaultAlertAction isEqualToString:@"dismiss"]) {
-    if (![alert dismissWithError:&error]) {
-      [FBLogger logFmt:@"Cannot dismiss the alert. Original error: %@", error.description];
+    @try {
+      [alert dismiss];
+    } @catch (NSException *e) {
+      [FBLogger logFmt:@"Cannot dismiss the alert. Original error: %@", e.reason];
     }
   } else {
     [FBLogger logFmt:@"'%@' default alert action is unsupported", self.defaultAlertAction];
@@ -213,7 +211,7 @@ static FBSession *_activeSession = nil;
     XCUIApplicationState testedAppState = self.testedApplication.state;
     if (testedAppState >= XCUIApplicationStateRunningForeground) {
       NSPredicate *searchPredicate = [NSPredicate predicateWithFormat:@"%K == %@ OR %K IN {%@, %@}",
-                                      @"elementType", @(XCUIElementTypeAlert), 
+                                      @"elementType", @(XCUIElementTypeAlert),
                                       // To look for `SBTransientOverlayWindow` elements. See https://github.com/appium/WebDriverAgent/pull/946
                                       @"identifier", @"SBTransientOverlayWindow",
                                       // To look for 'criticalAlertSetting' elements https://developer.apple.com/documentation/usernotifications/unnotificationsettings/criticalalertsetting

package/WebDriverAgentLib/Utilities/FBAlertsMonitor.m

@@ -52,26 +52,28 @@ static const NSTimeInterval FB_MONTORING_INTERVAL = 2.0;
     NSArray<XCUIApplication *> *activeApps = XCUIApplication.fb_activeApplications;
     BOOL didDetectAlert = NO;
     for (XCUIApplication *activeApp in activeApps) {
-      XCUIElement *alertElement = nil;
       @try {
-        alertElement = activeApp.fb_alertElement;
-        if (nil != alertElement) {
-          [delegate didDetectAlert:[FBAlert alertWithElement:alertElement]];
+        FBAlert *alert = [FBAlert alertWithApplication:activeApp];
+        if (alert.isPresent) {
+          [delegate didDetectAlert:alert];
+          didDetectAlert = YES;
         }
       } @catch (NSException *e) {
         [FBLogger logFmt:@"Got an unexpected exception while monitoring alerts: %@\n%@", e.reason, e.callStackSymbols];
       }
-      if (nil != alertElement) {
-        didDetectAlert = YES;
+      if (didDetectAlert) {
         break;
       }
     }
 
     if (!didDetectAlert) {
       @try {
-        XCUIElement *alertElement = [XCUIApplication fb_limitedAccessPromptAlertElement];
-        if (nil != alertElement) {
-          [delegate didDetectAlert:[FBAlert alertWithElement:alertElement]];
+        XCUIApplication *promptApp = XCUIApplication.fb_limitedAccessPromptApplication;
+        if (nil != promptApp) {
+          FBAlert *alert = [FBAlert alertWithApplication:promptApp];
+          if (alert.isPresent) {
+            [delegate didDetectAlert:alert];
+          }
         }
       } @catch (NSException *e) {
         [FBLogger logFmt:@"Got an unexpected exception while monitoring alerts: %@\n%@", e.reason, e.callStackSymbols];

package/WebDriverAgentLib/Utilities/FBPasteboard.m

@@ -11,6 +11,7 @@
 #import <mach/mach_time.h>
 #import "FBAlert.h"
 #import "FBErrorBuilder.h"
+#import "FBExceptions.h"
 #import "FBMacros.h"
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIApplication+FBAlert.h"
@@ -100,10 +101,13 @@
       break;
     }
 
-    XCUIElement *alertElement = XCUIApplication.fb_systemApplication.fb_alertElement;
-    if (nil != alertElement) {
-      FBAlert *alert = [FBAlert alertWithElement:alertElement];
-      [alert acceptWithError:nil];
+    @try {
+      [[FBAlert alertWithApplication:XCUIApplication.fb_systemApplication] accept];
+    } @catch (NSException *e) {
+      if (![e.name isEqualToString:FBAlertNotPresentException]) {
+        @throw e;
+      }
+      // No alert is present on this tick - expected on most iterations of this poll loop
     }
     uint64_t timeElapsed = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW) - timeStarted;
     if (timeElapsed / NSEC_PER_SEC > timeout) {

package/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m

@@ -48,6 +48,40 @@
   button.selected = !button.selected;
 }
 
+- (IBAction)goToDeepHierarchy:(id)sender
+{
+  // Plain UIViews with fixed frames only - no Auto Layout constraints and no
+  // specialized subclasses (e.g. UITextView) that carry their own layout/text
+  // engines, which can make a deep nested chain pathologically expensive to
+  // lay out. This page exists purely as a fixture for exercising element
+  // lookups (e.g. class chain locators) against a deep accessibility tree.
+  UIViewController *deepHierarchyViewController = [UIViewController new];
+  deepHierarchyViewController.view.backgroundColor = UIColor.whiteColor;
+  deepHierarchyViewController.view.accessibilityIdentifier = @"DeepHierarchyPage";
+
+  NSInteger depth = 70;
+  // A plain UILabel sibling, not part of the nested chain below, so the
+  // fixture stays recognizable to a human glancing at the simulator instead
+  // of showing a blank white screen.
+  UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, 60, CGRectGetWidth(UIScreen.mainScreen.bounds) - 40, 60)];
+  titleLabel.text = [NSString stringWithFormat:@"Deep Hierarchy\n%ld nested elements", (long)depth];
+  titleLabel.numberOfLines = 2;
+  titleLabel.textAlignment = NSTextAlignmentCenter;
+  titleLabel.font = [UIFont systemFontOfSize:20];
+  [deepHierarchyViewController.view addSubview:titleLabel];
+
+  UIView *parent = deepHierarchyViewController.view;
+  for (NSInteger i = 0; i < depth; i++) {
+    UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 1, 1)];
+    view.accessibilityIdentifier = [NSString stringWithFormat:@"view_%ld", (long)i];
+    view.accessibilityLabel = [NSString stringWithFormat:@"View %ld", (long)i];
+    [parent addSubview:view];
+    parent = view;
+  }
+
+  [self.navigationController pushViewController:deepHierarchyViewController animated:NO];
+}
+
 - (void)viewDidLayoutSubviews
 {
   [super viewDidLayoutSubviews];

package/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard

@@ -74,6 +74,16 @@
                                     <segue destination="XaE-eF-eIt" kind="show" id="q3u-B9-6R6"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dHi-01-Btn">
+                                <rect key="frame" x="150" y="380" width="114" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="dHi-02-Hgt"/>
+                                </constraints>
+                                <state key="normal" title="DeepHierarchy"/>
+                                <connections>
+                                    <action selector="goToDeepHierarchy:" destination="BYZ-38-t0r" eventType="touchUpInside" id="dHi-03-Act"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <accessibility key="accessibilityConfiguration" label="MainView"/>
@@ -90,6 +100,8 @@
                             <constraint firstItem="uiD-R4-b34" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="nFx-Xr-rGC"/>
                             <constraint firstItem="S56-6U-3gG" firstAttribute="top" secondItem="M2N-Yn-ytb" secondAttribute="bottom" constant="8" id="rMW-LW-ejO"/>
                             <constraint firstItem="M2N-Yn-ytb" firstAttribute="top" secondItem="YgP-SF-TkS" secondAttribute="bottom" constant="8" id="tMN-gl-smg"/>
+                            <constraint firstItem="dHi-01-Btn" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="dHi-04-Cnt"/>
+                            <constraint firstItem="dHi-01-Btn" firstAttribute="top" secondItem="1Ht-AF-MGW" secondAttribute="bottom" constant="8" id="dHi-05-Top"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="dmu-Fe-aoT"/>

package/WebDriverAgentTests/IntegrationTests/FBAlertTests.m

@@ -69,60 +69,54 @@
 
 - (void)testAlertPresence
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertFalse(alert.isPresent);
+  XCTAssertFalse([FBAlert alertWithApplication:self.testedApplication].isPresent);
   [self showApplicationAlert];
-  XCTAssertTrue(alert.isPresent);
+  XCTAssertTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 }
 
 - (void)testAlertText
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
   [self showApplicationAlert];
-  XCTAssertTrue([alert.text containsString:@"Magic"]);
-  XCTAssertTrue([alert.text containsString:@"Should read"]);
+  NSString *text = [FBAlert alertWithApplication:self.testedApplication].text;
+  XCTAssertTrue([text containsString:@"Magic"]);
+  XCTAssertTrue([text containsString:@"Should read"]);
 }
 
 - (void)testAlertLabels
 {
-  FBAlert* alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.buttonLabels);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].buttonLabels);
   [self showApplicationAlert];
-  XCTAssertNotNil(alert.buttonLabels);
-  XCTAssertEqual(1, alert.buttonLabels.count);
-  XCTAssertEqualObjects(@"Will do", alert.buttonLabels[0]);
+  NSArray *labels = [FBAlert alertWithApplication:self.testedApplication].buttonLabels;
+  XCTAssertNotNil(labels);
+  XCTAssertEqual(1, labels.count);
+  XCTAssertEqualObjects(@"Will do", labels[0]);
 }
 
 - (void)testClickAlertButton
 {
-  FBAlert* alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertFalse([alert clickAlertButton:@"Invalid" error:nil]);
+  XCTAssertThrows([[FBAlert alertWithApplication:self.testedApplication] clickAlertButton:@"Invalid"]);
   [self showApplicationAlert];
-  XCTAssertFalse([alert clickAlertButton:@"Invalid" error:nil]);
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
-  XCTAssertTrue([alert clickAlertButton:@"Will do" error:nil]);
-  FBAssertWaitTillBecomesTrue(!alert.isPresent);
+  XCTAssertThrows([[FBAlert alertWithApplication:self.testedApplication] clickAlertButton:@"Invalid"]);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
+  XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] clickAlertButton:@"Will do"]);
+  FBAssertWaitTillBecomesTrue(![FBAlert alertWithApplication:self.testedApplication].isPresent);
 }
 
 - (void)testAcceptingAlert
 {
-  NSError *error;
   [self showApplicationAlert];
-  XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] acceptWithError:&error]);
+  XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] accept]);
   FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-  XCTAssertNil(error);
 }
 
 - (void)testAcceptingAlertWithCustomLocator
 {
-  NSError *error;
   [self showApplicationAlert];
   [FBConfiguration setAcceptAlertButtonSelector:@"**/XCUIElementTypeButton[-1]"];
   @try {
-    XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] acceptWithError:&error]);
+    XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] accept]);
     FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-    XCTAssertNil(error);
   } @finally {
     [FBConfiguration setAcceptAlertButtonSelector:@""];
   }
@@ -130,65 +124,52 @@
 
 - (void)testDismissingAlert
 {
-  NSError *error;
   [self showApplicationAlert];
-  XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] dismissWithError:&error]);
+  XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] dismiss]);
   FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-  XCTAssertNil(error);
 }
 
 - (void)testDismissingAlertWithCustomLocator
 {
-  NSError *error;
   [self showApplicationAlert];
   [FBConfiguration setDismissAlertButtonSelector:@"**/XCUIElementTypeButton[-1]"];
   @try {
-    XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] dismissWithError:&error]);
+    XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] dismiss]);
     FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-    XCTAssertNil(error);
   } @finally {
     [FBConfiguration setDismissAlertButtonSelector:@""];
   }
 }
 
-- (void)testAlertElement
-{
-  [self showApplicationAlert];
-  XCUIElement *alertElement = [FBAlert alertWithApplication:self.testedApplication].alertElement;
-  XCTAssertTrue(alertElement.exists);
-  XCTAssertTrue(alertElement.elementType == XCUIElementTypeAlert);
-}
-
 - (void)testNotificationAlert
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
   [self.testedApplication.buttons[@"Create Notification Alert"] tap];
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 
-  XCTAssertTrue([alert.text containsString:@"Would Like to Send You Notifications"]);
-  XCTAssertTrue([alert.text containsString:@"Notifications may include"]);
+  NSString *text = [FBAlert alertWithApplication:self.testedApplication].text;
+  XCTAssertTrue([text containsString:@"Would Like to Send You Notifications"]);
+  XCTAssertTrue([text containsString:@"Notifications may include"]);
 }
 
 - (void)testCameraRollAlert
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
 
   [self.testedApplication.buttons[@"Create Camera Roll Alert"] tap];
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 }
 
 - (void)testGPSAccessAlert
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
 
   [self.testedApplication.buttons[@"Create GPS access Alert"] tap];
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 
-  XCTAssertTrue([alert.text containsString:@"location"]);
-  XCTAssertTrue([alert.text containsString:@"Yo Yo"]);
+  NSString *text = [FBAlert alertWithApplication:self.testedApplication].text;
+  XCTAssertTrue([text containsString:@"location"]);
+  XCTAssertTrue([text containsString:@"Yo Yo"]);
 }
 
 @end

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.h

@@ -14,6 +14,13 @@ extern NSString *const FBShowAlertForceTouchButtonName;
 extern NSString *const FBTouchesCountLabelIdentifier;
 extern NSString *const FBTapsCountLabelIdentifier;
 
+/**
+ Labels of the buttons on the integration app's main page, in their on-screen
+ (top to bottom) order. Update this in one place - WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard -
+ and here, rather than duplicating the list/count across individual tests.
+ */
+extern NSArray<NSString *> *const FBMainViewButtonLabels;
+
 /**
  XCTestCase helper class used for integration tests
  */
@@ -62,6 +69,15 @@ extern NSString *const FBTapsCountLabelIdentifier;
  */
 - (void)goToScrollPageWithCells:(BOOL)showCells;
 
+/**
+ Navigates integration app to a page containing a 70-level-deep chain of
+ nested elements (otherElements[@"view_0"]...otherElements[@"view_69"]),
+ each nested directly inside the previous one. Intended as a fixture for
+ performance testing of element lookups (e.g. class chain locators) against
+ a deep accessibility tree.
+ */
+- (void)goToDeepHierarchyPage;
+
 /**
  Verifies no alerts are present on the page.
  If an alert exists then it is going to be dismissed.

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m

@@ -10,6 +10,7 @@
 
 #import "FBAlert.h"
 #import "FBTestMacros.h"
+#import "FBExceptions.h"
 #import "FBIntegrationTestCase.h"
 #import "FBConfiguration.h"
 #import "FBMacros.h"
@@ -26,6 +27,14 @@ NSString *const FBShowSheetAlertButtonName = @"Create Sheet Alert";
 NSString *const FBShowAlertForceTouchButtonName = @"Create Alert (Force Touch)";
 NSString *const FBTouchesCountLabelIdentifier = @"numberOfTouchesLabel";
 NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
+NSArray<NSString *> *const FBMainViewButtonLabels = @[
+  @"Alerts",
+  @"Deadlock app",
+  @"Attributes",
+  @"Scrolling",
+  @"Touch",
+  @"DeepHierarchy",
+];
 
 @interface FBIntegrationTestCase ()
 @property (nonatomic, strong) XCUIApplication *testedApplication;
@@ -129,10 +138,28 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
   FBAssertWaitTillBecomesTrue(self.testedApplication.staticTexts[@"3"].fb_isVisible);
 }
 
+- (void)goToDeepHierarchyPage
+{
+  [self.testedApplication.buttons[@"DeepHierarchy"] tap];
+  [self.testedApplication fb_waitUntilStable];
+  // Not fb_isVisible: that runs a native visibility computation which is
+  // pathologically slow to resolve for a view nested 70 levels deep at a
+  // 1x1 frame. Existence in the accessibility tree is all this fixture
+  // actually needs to confirm navigation succeeded.
+  FBAssertWaitTillBecomesTrue(self.testedApplication.otherElements[@"view_0"].exists);
+}
+
 - (void)clearAlert
 {
   [self.testedApplication fb_waitUntilStable];
-  [[FBAlert alertWithApplication:self.testedApplication] dismissWithError:nil];
+  @try {
+    [[FBAlert alertWithApplication:self.testedApplication] dismiss];
+  } @catch (NSException *e) {
+    if (![e.name isEqualToString:FBAlertNotPresentException]) {
+      @throw e;
+    }
+    // No alert is present, nothing to clear
+  }
   [self.testedApplication fb_waitUntilStable];
   FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
 }

package/WebDriverAgentTests/IntegrationTests/FBSafariAlertTests.m

@@ -67,7 +67,7 @@
   XCTAssertEqualObjects(buttonLabels.firstObject, @"Close");
   XCTAssertNotNil([self.safariApp fb_descendantsMatchingXPathQuery:@"//XCUIElementTypeButton[@label='Close']"
                                        shouldReturnAfterFirstMatch:YES].firstObject);
-  XCTAssertTrue([alert acceptWithError:nil]);
+  XCTAssertNoThrow([alert accept]);
 }
 
 @end

package/WebDriverAgentTests/IntegrationTests/FBXPathIntegrationTests.m

@@ -130,7 +130,7 @@
 - (void)testFindMatchesInElement
 {
   NSArray<id<FBXCElementSnapshot>> *matchingSnapshots = [FBXPath matchesWithRootElement:self.testedApplication forQuery:@"//XCUIElementTypeButton"];
-  XCTAssertEqual([matchingSnapshots count], 5);
+  XCTAssertEqual([matchingSnapshots count], FBMainViewButtonLabels.count);
   for (id<FBXCElementSnapshot> element in matchingSnapshots) {
     XCTAssertTrue([[FBXCElementSnapshotWrapper ensureWrapped:element].wdType isEqualToString:@"XCUIElementTypeButton"]);
   }
@@ -174,7 +174,7 @@
 - (void)testFindMatchesInElementWithDotNotation
 {
   NSArray<id<FBXCElementSnapshot>> *matchingSnapshots = [FBXPath matchesWithRootElement:self.testedApplication forQuery:@".//XCUIElementTypeButton"];
-  XCTAssertEqual([matchingSnapshots count], 5);
+  XCTAssertEqual([matchingSnapshots count], FBMainViewButtonLabels.count);
   for (id<FBXCElementSnapshot> element in matchingSnapshots) {
     XCTAssertTrue([[FBXCElementSnapshotWrapper ensureWrapped:element].wdType isEqualToString:@"XCUIElementTypeButton"]);
   }
@@ -232,7 +232,7 @@
 - (void)testFindMultipleMatchesWithMatchesFunction
 {
   [self assertXPathQuery:@"//XCUIElementTypeButton[matches(@label, '.*')]"
-       findsButtonLabels:@[@"Alerts", @"Deadlock app", @"Attributes", @"Scrolling", @"Touch"]];
+       findsButtonLabels:FBMainViewButtonLabels];
 }
 
 - (void)testInvalidXPathExtensionFunctionViaElementLookup

package/WebDriverAgentTests/IntegrationTests/XCElementSnapshotHelperTests.m

@@ -36,13 +36,7 @@
 
 - (void)testDescendantsMatchingType
 {
-  NSSet<NSString *> *expectedLabels = [NSSet setWithArray:@[
-    @"Alerts",
-    @"Attributes",
-    @"Scrolling",
-    @"Deadlock app",
-    @"Touch",
-  ]];
+  NSSet<NSString *> *expectedLabels = [NSSet setWithArray:FBMainViewButtonLabels];
   NSArray<id<FBXCElementSnapshot>> *matchingSnapshots = [[FBXCElementSnapshotWrapper ensureWrapped:
                                                           [self.testedView fb_customSnapshot]]
                                                          fb_descendantsMatchingType:XCUIElementTypeButton];

package/WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m

@@ -41,13 +41,7 @@
 
 - (void)testDescendantsWithClassName
 {
-  NSSet<NSString *> *expectedLabels = [NSSet setWithArray:@[
-    @"Alerts",
-    @"Attributes",
-    @"Scrolling",
-    @"Deadlock app",
-    @"Touch",
-  ]];
+  NSSet<NSString *> *expectedLabels = [NSSet setWithArray:FBMainViewButtonLabels];
   NSArray<XCUIElement *> *matchingSnapshots = [self.testedView fb_descendantsMatchingClassName:@"XCUIElementTypeButton"
                                                                    shouldReturnAfterFirstMatch:NO];
   XCTAssertEqual(matchingSnapshots.count, expectedLabels.count);
@@ -273,7 +267,7 @@
   NSString *queryString =@"XCUIElementTypeWindow/XCUIElementTypeOther/**/XCUIElementTypeButton";
   matchingSnapshots = [self.testedApplication fb_descendantsMatchingClassChain:queryString
                                                    shouldReturnAfterFirstMatch:NO];
-  XCTAssertEqual(matchingSnapshots.count, 5); // /XCUIElementTypeButton
+  XCTAssertEqual(matchingSnapshots.count, FBMainViewButtonLabels.count); // /XCUIElementTypeButton
   for (XCUIElement *matchingSnapshot in matchingSnapshots) {
     XCTAssertEqual(matchingSnapshot.elementType, XCUIElementTypeButton);
   }
@@ -292,7 +286,7 @@
     matchingSnapshots = [self.testedApplication fb_descendantsMatchingClassChain:queryString
                                                      shouldReturnAfterFirstMatch:NO];
   }
-  XCTAssertEqual(matchingSnapshots.count, 5); // /XCUIElementTypeButton
+  XCTAssertEqual(matchingSnapshots.count, FBMainViewButtonLabels.count); // /XCUIElementTypeButton
   for (XCUIElement *matchingSnapshot in matchingSnapshots) {
     XCTAssertEqual(matchingSnapshot.elementType, XCUIElementTypeButton);
   }
@@ -376,7 +370,7 @@
   
   XCTAssertEqual(matchingSnapshots.count, 1);
   XCTAssertEqual(matchingSnapshots.lastObject.elementType, XCUIElementTypeButton);
-  XCTAssertTrue([matchingSnapshots.lastObject.label isEqualToString:@"Touch"]);
+  XCTAssertEqualObjects(matchingSnapshots.lastObject.label, FBMainViewButtonLabels.lastObject);
   
   matchingSnapshots = [self.testedView fb_descendantsMatchingClassChain:@"XCUIElementTypeButton[-10]"
                                             shouldReturnAfterFirstMatch:YES];
@@ -470,3 +464,75 @@
 }
 
 @end
+
+@interface XCUIElementFBFindTests_DeepHierarchyPage : FBIntegrationTestCase
+@end
+@implementation XCUIElementFBFindTests_DeepHierarchyPage
+
+- (void)setUp
+{
+  [super setUp];
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    [self launchApplication];
+    [self goToDeepHierarchyPage];
+  });
+}
+
+// No intermediate segment has a position here (only the final one does), so
+// this exercises the query-based class chain strategy - the fast path for
+// the common case. See fb_hasIntermediatePosition: in XCUIElement+FBClassChain.m.
+- (void)testClassChainWithoutIntermediatePositionOnDeepHierarchy
+{
+  NSString *query = @"**/XCUIElementTypeOther[`label BEGINSWITH \"View 19\"`]/XCUIElementTypeOther[1]";
+  NSArray<XCUIElement *> *matches = [self.testedApplication fb_descendantsMatchingClassChain:query
+                                                                   shouldReturnAfterFirstMatch:NO];
+  XCTAssertEqual(matches.count, 1);
+  XCTAssertEqualObjects(matches.firstObject.label, @"View 20");
+}
+
+// The first segment here has an explicit position and is not the last
+// segment in the chain, so this exercises the snapshot-walk class chain
+// strategy - the one that avoids paying an extra accessibility round trip
+// per intermediate indexed segment.
+- (void)testClassChainWithIntermediatePositionOnDeepHierarchy
+{
+  NSString *query = @"**/XCUIElementTypeOther[`label == \"View 10\"`][1]/**/XCUIElementTypeOther[`label BEGINSWITH \"View 19\"`]";
+  NSArray<XCUIElement *> *matches = [self.testedApplication fb_descendantsMatchingClassChain:query
+                                                                   shouldReturnAfterFirstMatch:NO];
+  XCTAssertEqual(matches.count, 1);
+  XCTAssertEqualObjects(matches.firstObject.label, @"View 19");
+}
+
+// Exercises the snapshot-walk strategy with several intermediate positions
+// (the shape it exists for), as opposed to testPerformanceOfClassChainLookupOnDeepHierarchy
+// above, which only has a position on the final segment and stays on the
+// query-based strategy. Kept within the default snapshotMaxDepth (50)
+// combined with the app's own chrome depth above this fixture's root -
+// going deeper hit a native kAXErrorIllegalArgument even after raising
+// snapshotMaxDepth, which looks like a platform-level limitation
+// independent of this lookup, not something to route around here.
+- (void)testPerformanceOfMultiCheckpointClassChainLookupOnDeepHierarchy
+{
+  NSString *query = @"**/XCUIElementTypeOther[`label == \"View 5\"`][1]/**/XCUIElementTypeOther[`label == \"View 15\"`][1]/**/XCUIElementTypeOther[`label == \"View 25\"`][1]/**/XCUIElementTypeOther[`label BEGINSWITH \"View 30\"`]";
+  [self measureBlock:^{
+    NSArray<XCUIElement *> *matches = [self.testedApplication fb_descendantsMatchingClassChain:query
+                                                                     shouldReturnAfterFirstMatch:NO];
+    XCTAssertEqual(matches.count, 1);
+  }];
+}
+
+// Not a strict pass/fail assertion (timings vary across machines/CI) - this
+// records a measurement baseline so future regressions on this lookup show
+// up in Xcode's test reports.
+- (void)testPerformanceOfClassChainLookupOnDeepHierarchy
+{
+  NSString *query = @"**/XCUIElementTypeOther[`label BEGINSWITH \"View 19\"`]/XCUIElementTypeOther[1]";
+  [self measureBlock:^{
+    NSArray<XCUIElement *> *matches = [self.testedApplication fb_descendantsMatchingClassChain:query
+                                                                     shouldReturnAfterFirstMatch:NO];
+    XCTAssertEqual(matches.count, 1);
+  }];
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "16.1.1",
+  "version": "16.1.3",
   "description": "Package bundling WebDriverAgent",
   "keywords": [
     "Appium",