appium-webdriveragent 16.1.2 → 16.1.4

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.m

@@ -10,6 +10,7 @@
 
 #import "FBAlert.h"
 #import "FBTestMacros.h"
+#import "FBExceptions.h"
 #import "FBIntegrationTestCase.h"
 #import "FBConfiguration.h"
 #import "FBMacros.h"
@@ -151,7 +152,14 @@ NSArray<NSString *> *const FBMainViewButtonLabels = @[
 - (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_tvOS/FBTVFocusIntegrationTests.m

@@ -0,0 +1,84 @@
+/**
+ * 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>
+
+#if TARGET_OS_TV
+
+// `XCUIElement+FBTVFocuse` is a project-internal category (not exposed as a
+// Public framework header), so its two entry points are forward-declared
+// here rather than imported. The real implementation - the one this suite
+// exercises end to end against a live tvOS Simulator - is still the one
+// linked in from WebDriverAgentLib_tvOS.framework.
+@interface XCUIElement (FBTVFocuseForTesting)
+- (BOOL)fb_setFocusWithError:(NSError **)error;
+- (BOOL)fb_selectWithError:(NSError **)error;
+@end
+
+@interface FBTVFocusIntegrationTests : XCTestCase
+@property (nonatomic, strong) XCUIApplication *app;
+@end
+
+@implementation FBTVFocusIntegrationTests
+
+- (void)setUp
+{
+  [super setUp];
+  self.continueAfterFailure = NO;
+  self.app = [XCUIApplication new];
+  [self.app launch];
+  XCTAssertTrue([self.app.buttons[@"cell_0_0"] waitForExistenceWithTimeout:15]);
+}
+
+- (void)testSetFocusMovesFocusToADistantElement
+{
+  XCUIElement *target = self.app.buttons[@"cell_2_2"];
+  XCTAssertTrue(target.exists);
+  XCTAssertFalse(target.hasFocus);
+
+  NSError *error;
+  BOOL result = [target fb_setFocusWithError:&error];
+
+  XCTAssertTrue(result);
+  XCTAssertNil(error);
+  XCTAssertTrue(target.hasFocus);
+}
+
+- (void)testSelectMovesFocusAndTriggersTheElementsAction
+{
+  XCUIElement *target = self.app.buttons[@"cell_1_2"];
+  XCUIElement *statusLabel = self.app.staticTexts[@"lastSelectedLabel"];
+
+  NSError *error;
+  BOOL result = [target fb_selectWithError:&error];
+
+  XCTAssertTrue(result);
+  XCTAssertNil(error);
+  XCTAssertTrue(target.hasFocus);
+
+  NSPredicate *labelUpdated = [NSPredicate predicateWithFormat:@"label == %@", @"cell_1_2"];
+  XCTNSPredicateExpectation *expectation = [[XCTNSPredicateExpectation alloc] initWithPredicate:labelUpdated object:statusLabel];
+  [self waitForExpectations:@[expectation] timeout:5];
+}
+
+- (void)testSetFocusOnADisabledElementFails
+{
+  XCUIElement *disabled = self.app.buttons[@"disabledButton"];
+  XCTAssertTrue(disabled.exists);
+
+  NSError *error;
+  BOOL result = [disabled fb_setFocusWithError:&error];
+
+  XCTAssertFalse(result);
+  XCTAssertNotNil(error);
+  XCTAssertFalse(disabled.hasFocus);
+}
+
+@end
+
+#endif

package/WebDriverAgentTests/IntegrationTests_tvOS/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.facebook.wda.integrationTests.tvOS</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

package/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/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/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/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/WebDriverAgentTests/UnitTests_tvOS/FBTVNavigationTrackerTests.m

@@ -7,8 +7,10 @@
  */
 
 #import <XCTest/XCTest.h>
+#import <WebDriverAgentLib/FBXCElementSnapshot.h>
 
 #import "XCUIElementDouble.h"
+#import "FBXCElementSnapshotDouble.h"
 #import "FBTVNavigationTracker.h"
 #import "FBTVNavigationTracker-Private.h"
 
@@ -83,4 +85,50 @@
   XCTAssertEqual(FBTVDirectionNone, direction);
 }
 
+#pragma mark - directionTowardsTargetFromFocusedElementSnapshot:
+
+- (FBTVNavigationTracker *)trackerWithTargetFrame:(CGRect)targetFrame
+{
+  XCUIElementDouble *targetElement = XCUIElementDouble.new;
+  targetElement.wdFrame = targetFrame;
+  return [FBTVNavigationTracker trackerWithTargetElement:(XCUIElement *)targetElement];
+}
+
+- (void)testDirectionTowardsTargetFromFocusedElementSnapshotShouldPointRight
+{
+  // Target sits to the right of the currently focused element.
+  FBTVNavigationTracker *tracker = [self trackerWithTargetFrame:CGRectMake(100, 0, 0, 0)];
+  FBXCElementSnapshotDouble *focusedSnapshot = [FBXCElementSnapshotDouble snapshotWithElementId:1 frame:CGRectMake(0, 0, 0, 0) hasFocus:YES];
+
+  FBTVDirection direction = [tracker directionTowardsTargetFromFocusedElementSnapshot:(id<FBXCElementSnapshot>)focusedSnapshot];
+
+  XCTAssertEqual(FBTVDirectionRight, direction);
+}
+
+- (void)testDirectionTowardsTargetFromFocusedElementSnapshotShouldPointUp
+{
+  // Target sits above the currently focused element.
+  FBTVNavigationTracker *tracker = [self trackerWithTargetFrame:CGRectMake(0, -100, 0, 0)];
+  FBXCElementSnapshotDouble *focusedSnapshot = [FBXCElementSnapshotDouble snapshotWithElementId:1 frame:CGRectMake(0, 0, 0, 0) hasFocus:YES];
+
+  FBTVDirection direction = [tracker directionTowardsTargetFromFocusedElementSnapshot:(id<FBXCElementSnapshot>)focusedSnapshot];
+
+  XCTAssertEqual(FBTVDirectionUp, direction);
+}
+
+- (void)testDirectionTowardsTargetFromFocusedElementSnapshotShouldNotSuggestTheSameDirectionTwiceInARow
+{
+  // Same (unmoved) focused snapshot polled twice: the horizontal move gets
+  // suggested once, then withheld on the next call, per the "don't repeat a
+  // direction" bookkeeping in -directionWithItem:delta:positiveDirection:negativeDirection:.
+  FBTVNavigationTracker *tracker = [self trackerWithTargetFrame:CGRectMake(100, 0, 0, 0)];
+  FBXCElementSnapshotDouble *focusedSnapshot = [FBXCElementSnapshotDouble snapshotWithElementId:1 frame:CGRectMake(0, 0, 0, 0) hasFocus:YES];
+
+  FBTVDirection firstDirection = [tracker directionTowardsTargetFromFocusedElementSnapshot:(id<FBXCElementSnapshot>)focusedSnapshot];
+  XCTAssertEqual(FBTVDirectionRight, firstDirection);
+
+  FBTVDirection secondDirection = [tracker directionTowardsTargetFromFocusedElementSnapshot:(id<FBXCElementSnapshot>)focusedSnapshot];
+  XCTAssertEqual(FBTVDirectionNone, secondDirection);
+}
+
 @end

package/package.json

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