appium-webdriveragent 5.15.5 → 5.15.7

package/WebDriverAgentLib/Commands/FBDebugCommands.m

@@ -9,7 +9,6 @@
 
 #import "FBDebugCommands.h"
 
-#import "FBApplication.h"
 #import "FBRouteRequest.h"
 #import "FBSession.h"
 #import "FBXMLGenerationOptions.h"
@@ -42,7 +41,7 @@ static NSString *const SOURCE_FORMAT_DESCRIPTION = @"description";
 + (id<FBResponsePayload>)handleGetSourceCommand:(FBRouteRequest *)request
 {
   // This method might be called without session
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   NSString *sourceType = request.parameters[@"format"] ?: SOURCE_FORMAT_XML;
   NSString *sourceScope = request.parameters[@"scope"];
   id result;
@@ -71,7 +70,7 @@ static NSString *const SOURCE_FORMAT_DESCRIPTION = @"description";
 + (id<FBResponsePayload>)handleGetAccessibleSourceCommand:(FBRouteRequest *)request
 {
   // This method might be called without session
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   return FBResponseWithObject(application.fb_accessibilityTree ?: @{});
 }
 

package/WebDriverAgentLib/Commands/FBElementCommands.m

@@ -9,7 +9,6 @@
 
 #import "FBElementCommands.h"
 
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBKeyboard.h"
 #import "FBRoute.h"
@@ -18,7 +17,6 @@
 #import "FBElementCache.h"
 #import "FBErrorBuilder.h"
 #import "FBSession.h"
-#import "FBApplication.h"
 #import "FBElementUtils.h"
 #import "FBMacros.h"
 #import "FBMathUtils.h"
@@ -529,7 +527,7 @@
 {
   XCUIElement *element = nil;
   if (nil == request.parameters[@"uuid"]) {
-    element = [FBApplication fb_activeApplication];
+    element = XCUIApplication.fb_activeApplication;
   } else {
     FBElementCache *elementCache = request.session.elementCache;
     element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
@@ -558,7 +556,7 @@
   NSString *textToType = [request.arguments[@"value"] componentsJoinedByString:@""];
   NSUInteger frequency = [request.arguments[@"frequency"] unsignedIntegerValue] ?: [FBConfiguration maxTypingFrequency];
   NSError *error;
-  if (![FBKeyboard typeText:textToType frequency:frequency error:&error]) {
+  if (!FBTypeText(textToType, frequency, &error)) {
     return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description
                                                                            traceback:nil]);
   }
@@ -567,7 +565,7 @@
 
 + (id<FBResponsePayload>)handleGetWindowSize:(FBRouteRequest *)request
 {
-  XCUIApplication *app = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *app = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
 
 #if TARGET_OS_TV
   CGSize screenSize = app.frame.size;

package/WebDriverAgentLib/Commands/FBFindElementCommands.m

@@ -10,7 +10,6 @@
 #import "FBFindElementCommands.h"
 
 #import "FBAlert.h"
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBElementCache.h"
 #import "FBExceptions.h"

package/WebDriverAgentLib/Commands/FBOrientationCommands.m

@@ -12,7 +12,8 @@
 #import "FBRouteRequest.h"
 #import "FBMacros.h"
 #import "FBSession.h"
-#import "FBApplication.h"
+#import "XCUIApplication.h"
+#import "XCUIApplication+FBHelpers.h"
 #import "XCUIDevice.h"
 
 extern const struct FBWDOrientationValues {
@@ -55,14 +56,14 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
 
 + (id<FBResponsePayload>)handleGetOrientation:(FBRouteRequest *)request
 {
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   NSString *orientation = [self.class interfaceOrientationForApplication:application];
   return FBResponseWithObject([[self _wdOrientationsMapping] objectForKey:orientation]);
 }
 
 + (id<FBResponsePayload>)handleSetOrientation:(FBRouteRequest *)request
 {
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   if ([self.class setDeviceOrientation:request.arguments[@"orientation"] forApplication:application]) {
     return FBResponseWithOK();
   }
@@ -73,7 +74,7 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
 + (id<FBResponsePayload>)handleGetRotation:(FBRouteRequest *)request
 {
   XCUIDevice *device = [XCUIDevice sharedDevice];
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   UIInterfaceOrientation orientation = application.interfaceOrientation;
   return FBResponseWithObject(device.fb_rotationMapping[@(orientation)]);
 }
@@ -101,7 +102,7 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
                                                                        traceback:nil]);
   }
 
-  FBApplication *application = request.session.activeApplication ?: FBApplication.fb_activeApplication;
+  XCUIApplication *application = request.session.activeApplication ?: XCUIApplication.fb_activeApplication;
   if (![self.class setDeviceRotation:request.arguments forApplication:application]) {
     NSString *errMessage = [
       NSString stringWithFormat:@"The current rotation cannot be set to %@. Make sure the %@ application supports it",
@@ -116,7 +117,7 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
 
 #pragma mark - Helpers
 
-+ (NSString *)interfaceOrientationForApplication:(FBApplication *)application
++ (NSString *)interfaceOrientationForApplication:(XCUIApplication *)application
 {
   NSNumber *orientation = @(application.interfaceOrientation);
   NSSet *keys = [[self _orientationsMapping] keysOfEntriesPassingTest:^BOOL(id key, NSNumber *obj, BOOL *stop) {
@@ -128,12 +129,12 @@ const struct FBWDOrientationValues FBWDOrientationValues = {
   return keys.anyObject;
 }
 
-+ (BOOL)setDeviceRotation:(NSDictionary *)rotationObj forApplication:(FBApplication *)application
++ (BOOL)setDeviceRotation:(NSDictionary *)rotationObj forApplication:(XCUIApplication *)application
 {
   return [[XCUIDevice sharedDevice] fb_setDeviceRotation:rotationObj];
 }
 
-+ (BOOL)setDeviceOrientation:(NSString *)orientation forApplication:(FBApplication *)application
++ (BOOL)setDeviceOrientation:(NSString *)orientation forApplication:(XCUIApplication *)application
 {
   NSNumber *orientationValue = [[self _orientationsMapping] objectForKey:[orientation uppercaseString]];
   if (orientationValue == nil) {

package/WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -9,7 +9,6 @@
 
 #import "FBSessionCommands.h"
 
-#import "FBApplication.h"
 #import "FBCapabilities.h"
 #import "FBConfiguration.h"
 #import "FBLogger.h"
@@ -17,7 +16,6 @@
 #import "FBRouteRequest.h"
 #import "FBSession.h"
 #import "FBSettings.h"
-#import "FBApplication.h"
 #import "FBRuntimeUtils.h"
 #import "FBActiveAppDetectionPoint.h"
 #import "FBXCodeCompatibility.h"
@@ -138,15 +136,15 @@
   }
 
   NSString *bundleID = capabilities[FB_CAP_BUNDLE_ID];
-  FBApplication *app = nil;
+  XCUIApplication *app = nil;
   if (bundleID != nil) {
-    app = [[FBApplication alloc] initWithBundleIdentifier:bundleID];
+    app = [[XCUIApplication alloc] initWithBundleIdentifier:bundleID];
     BOOL forceAppLaunch = YES;
     if (nil != capabilities[FB_CAP_FORCE_APP_LAUNCH]) {
       forceAppLaunch = [capabilities[FB_CAP_FORCE_APP_LAUNCH] boolValue];
     }
-    NSUInteger appState = [app fb_state];
-    BOOL isAppRunning = appState >= 2;
+    XCUIApplicationState appState = app.state;
+    BOOL isAppRunning = appState >= XCUIApplicationStateRunningBackground;
     if (!isAppRunning || (isAppRunning && forceAppLaunch)) {
       app.fb_shouldWaitForQuiescence = nil == capabilities[FB_CAP_SHOULD_WAIT_FOR_QUIESCENCE]
         || [capabilities[FB_CAP_SHOULD_WAIT_FOR_QUIESCENCE] boolValue];
@@ -158,8 +156,8 @@
         return FBResponseWithStatus([FBCommandStatus sessionNotCreatedError:errorMsg
                                                                   traceback:nil]);
       }
-    } else if (appState < 4 && !forceAppLaunch) {
-      [app fb_activate];
+    } else if (appState == XCUIApplicationStateRunningBackground && !forceAppLaunch) {
+      [app activate];
     }
   }
 
@@ -265,7 +263,7 @@
 
 + (id<FBResponsePayload>)handleGetHealthCheck:(FBRouteRequest *)request
 {
-  if (![[XCUIDevice sharedDevice] fb_healthCheckWithApplication:[FBApplication fb_activeApplication]]) {
+  if (![[XCUIDevice sharedDevice] fb_healthCheckWithApplication:[XCUIApplication fb_activeApplication]]) {
     return FBResponseWithUnknownErrorFormat(@"Health check failed");
   }
   return FBResponseWithOK();

package/WebDriverAgentLib/Commands/FBTouchActionCommands.m

@@ -9,7 +9,6 @@
 
 #import "FBTouchActionCommands.h"
 
-#import "FBApplication.h"
 #import "FBRoute.h"
 #import "FBRouteRequest.h"
 #import "FBSession.h"

package/WebDriverAgentLib/FBAlert.m

@@ -9,12 +9,12 @@
 
 #import "FBAlert.h"
 
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBErrorBuilder.h"
 #import "FBLogger.h"
 #import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCodeCompatibility.h"
+#import "XCUIApplication.h"
 #import "XCUIApplication+FBAlert.h"
 #import "XCUIElement+FBClassChain.h"
 #import "XCUIElement+FBTyping.h"
@@ -263,8 +263,8 @@
   if (nil == self.element) {
     self.element = self.application.fb_alertElement;
     if (nil == self.element) {
-      FBApplication *systemApp = FBApplication.fb_systemApplication;
-      for (FBApplication *activeApp in FBApplication.fb_activeApplications) {
+      XCUIApplication *systemApp = XCUIApplication.fb_systemApplication;
+      for (XCUIApplication *activeApp in XCUIApplication.fb_activeApplications) {
         if (systemApp.processID == activeApp.processID) {
           self.element = activeApp.fb_alertElement;
           break;

package/WebDriverAgentLib/Routing/FBSession.h

@@ -9,8 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
-@class FBApplication;
 @class FBElementCache;
+@class XCUIApplication;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -20,16 +20,16 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FBSession : NSObject
 
 /*! Application tested during that session */
-@property (nonatomic, strong, readonly) FBApplication *activeApplication;
+@property (nonatomic, readonly) XCUIApplication *activeApplication;
 
 /*! Session's identifier */
-@property (nonatomic, copy, readonly) NSString *identifier;
+@property (nonatomic, readonly) NSString *identifier;
 
 /*! Element cache related to that session */
-@property (nonatomic, strong, readonly) FBElementCache *elementCache;
+@property (nonatomic, readonly) FBElementCache *elementCache;
 
 /*! The identifier of the active application */
-@property (nonatomic, copy) NSString *defaultActiveApplication;
+@property (nonatomic) NSString *defaultActiveApplication;
 
 /*! The action to apply to unexpected alerts. Either "accept"/"dismiss" or nil/empty string (by default) to do nothing */
 @property (nonatomic, nullable) NSString *defaultAlertAction;
@@ -57,7 +57,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param application The application that we want to create session for
  @return new session
  */
-+ (instancetype)initWithApplication:(nullable FBApplication *)application;
++ (instancetype)initWithApplication:(nullable XCUIApplication *)application;
 
 /**
  Creates and saves new session for application with default alert handling behaviour
@@ -66,7 +66,8 @@ NS_ASSUME_NONNULL_BEGIN
  @param defaultAlertAction The default reaction to on-screen alert. Either 'accept' or 'dismiss'
  @return new session
  */
-+ (instancetype)initWithApplication:(nullable FBApplication *)application defaultAlertAction:(NSString *)defaultAlertAction;
++ (instancetype)initWithApplication:(nullable XCUIApplication *)application
+                 defaultAlertAction:(NSString *)defaultAlertAction;
 
 /**
  Kills application associated with that session and removes session
@@ -82,12 +83,11 @@ NS_ASSUME_NONNULL_BEGIN
  @param arguments The optional array of application command line arguments. The arguments are going to be applied if the application was not running before.
  @param environment The optional dictionary of environment variables for the application, which is going to be executed. The environment variables are going to be applied if the application was not running before.
  @return The application instance
- @throws FBApplicationMethodNotSupportedException if the method is not supported with the current XCTest SDK
  */
-- (FBApplication *)launchApplicationWithBundleId:(NSString *)bundleIdentifier
-                         shouldWaitForQuiescence:(nullable NSNumber *)shouldWaitForQuiescence
-                                       arguments:(nullable NSArray<NSString *> *)arguments
-                                     environment:(nullable NSDictionary <NSString *, NSString *> *)environment;
+- (XCUIApplication *)launchApplicationWithBundleId:(NSString *)bundleIdentifier
+                           shouldWaitForQuiescence:(nullable NSNumber *)shouldWaitForQuiescence
+                                         arguments:(nullable NSArray<NSString *> *)arguments
+                                       environment:(nullable NSDictionary <NSString *, NSString *> *)environment;
 
 /**
  Activate an application with given bundle identifier in scope of current session.
@@ -95,9 +95,8 @@ NS_ASSUME_NONNULL_BEGIN
 
  @param bundleIdentifier Valid bundle identifier of the application to be activated
  @return The application instance
- @throws FBApplicationMethodNotSupportedException if the method is not supported with the current XCTest SDK
  */
-- (FBApplication *)activateApplicationWithBundleId:(NSString *)bundleIdentifier;
+- (XCUIApplication *)activateApplicationWithBundleId:(NSString *)bundleIdentifier;
 
 /**
  Terminate an application with the given bundle id. The application should be previously

package/WebDriverAgentLib/Routing/FBSession.m

@@ -14,7 +14,6 @@
 
 #import "FBXCAccessibilityElement.h"
 #import "FBAlertsMonitor.h"
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBElementCache.h"
 #import "FBExceptions.h"
@@ -31,7 +30,7 @@
 NSString *const FBDefaultApplicationAuto = @"auto";
 
 @interface FBSession ()
-@property (nonatomic) NSString *testedApplicationBundleId;
+@property (nullable, nonatomic) XCUIApplication *testedApplication;
 @property (nonatomic) BOOL isTestedApplicationExpectedToRun;
 @property (nonatomic) BOOL shouldAppsWaitForQuiescence;
 @property (nonatomic, nullable) FBAlertsMonitor *alertsMonitor;
@@ -96,7 +95,7 @@ static FBSession *_activeSession = nil;
   return _activeSession;
 }
 
-+ (instancetype)initWithApplication:(FBApplication *)application
++ (instancetype)initWithApplication:(XCUIApplication *)application
 {
   FBSession *session = [FBSession new];
   session.useNativeCachingStrategy = YES;
@@ -105,10 +104,10 @@ static FBSession *_activeSession = nil;
   session.elementsVisibilityCache = [NSMutableDictionary dictionary];
   session.identifier = [[NSUUID UUID] UUIDString];
   session.defaultActiveApplication = FBDefaultApplicationAuto;
-  session.testedApplicationBundleId = nil;
+  session.testedApplication = nil;
   session.isTestedApplicationExpectedToRun = nil != application && application.running;
   if (application) {
-    session.testedApplicationBundleId = application.bundleID;
+    session.testedApplication = application;
     session.shouldAppsWaitForQuiescence = application.fb_shouldWaitForQuiescence;
   }
   session.elementCache = [FBElementCache new];
@@ -116,7 +115,7 @@ static FBSession *_activeSession = nil;
   return session;
 }
 
-+ (instancetype)initWithApplication:(nullable FBApplication *)application
++ (instancetype)initWithApplication:(nullable XCUIApplication *)application
                  defaultAlertAction:(NSString *)defaultAlertAction
 {
   FBSession *session = [self.class initWithApplication:application];
@@ -138,81 +137,78 @@ static FBSession *_activeSession = nil;
     self.alertsMonitor = nil;
   }
 
-  if (self.testedApplicationBundleId && [FBConfiguration shouldTerminateApp]
-      && ![self.testedApplicationBundleId isEqualToString:FBApplication.fb_systemApplication.bundleID]) {
-    FBApplication *app = [[FBApplication alloc] initWithBundleIdentifier:self.testedApplicationBundleId];
-    if ([app running]) {
-      @try {
-        [app terminate];
-      } @catch (NSException *e) {
-        [FBLogger logFmt:@"%@", e.description];
-      }
+  if (nil != self.testedApplication
+      && FBConfiguration.shouldTerminateApp
+      && self.testedApplication.running
+      && ![self.testedApplication fb_isSameAppAs:XCUIApplication.fb_systemApplication]) {
+    @try {
+      [self.testedApplication terminate];
+    } @catch (NSException *e) {
+      [FBLogger logFmt:@"%@", e.description];
     }
   }
 
   _activeSession = nil;
 }
 
-- (FBApplication *)activeApplication
+- (XCUIApplication *)activeApplication
 {
+  if (nil != self.testedApplication) {
+    XCUIApplicationState testedAppState = self.testedApplication.state;
+    if (testedAppState >= XCUIApplicationStateRunningForeground) {
+      return (XCUIApplication *)self.testedApplication;
+    }
+    if (self.isTestedApplicationExpectedToRun && testedAppState <= XCUIApplicationStateNotRunning) {
+      NSString *description = [NSString stringWithFormat:@"The application under test with bundle id '%@' is not running, possibly crashed", self.testedApplication.bundleID];
+      @throw [NSException exceptionWithName:FBApplicationCrashedException reason:description userInfo:nil];
+    }
+  }
+
   NSString *defaultBundleId = [self.defaultActiveApplication isEqualToString:FBDefaultApplicationAuto]
     ? nil
     : self.defaultActiveApplication;
-  FBApplication *application = [FBApplication fb_activeApplicationWithDefaultBundleId:defaultBundleId];
-  FBApplication *testedApplication = nil;
-  if (self.testedApplicationBundleId && self.isTestedApplicationExpectedToRun) {
-    testedApplication = nil != application.bundleID && [application.bundleID isEqualToString:self.testedApplicationBundleId]
-      ? application
-      : [[FBApplication alloc] initWithBundleIdentifier:self.testedApplicationBundleId];
-  }
-  if (testedApplication && !testedApplication.running) {
-    NSString *description = [NSString stringWithFormat:@"The application under test with bundle id '%@' is not running, possibly crashed", self.testedApplicationBundleId];
-    [[NSException exceptionWithName:FBApplicationCrashedException reason:description userInfo:nil] raise];
-  }
-  return application;
+  return [XCUIApplication fb_activeApplicationWithDefaultBundleId:defaultBundleId];
 }
 
-- (FBApplication *)launchApplicationWithBundleId:(NSString *)bundleIdentifier
-                         shouldWaitForQuiescence:(nullable NSNumber *)shouldWaitForQuiescence
-                                       arguments:(nullable NSArray<NSString *> *)arguments
-                                     environment:(nullable NSDictionary <NSString *, NSString *> *)environment
+- (XCUIApplication *)launchApplicationWithBundleId:(NSString *)bundleIdentifier
+                           shouldWaitForQuiescence:(nullable NSNumber *)shouldWaitForQuiescence
+                                         arguments:(nullable NSArray<NSString *> *)arguments
+                                       environment:(nullable NSDictionary <NSString *, NSString *> *)environment
 {
-  FBApplication *app = [[FBApplication alloc] initWithBundleIdentifier:bundleIdentifier];
+  XCUIApplication *app = [self makeApplicationWithBundleId:bundleIdentifier];
   if (nil == shouldWaitForQuiescence) {
     // Iherit the quiescence check setting from the main app under test by default
-    app.fb_shouldWaitForQuiescence = nil != self.testedApplicationBundleId && self.shouldAppsWaitForQuiescence;
+    app.fb_shouldWaitForQuiescence = nil != self.testedApplication && self.shouldAppsWaitForQuiescence;
   } else {
     app.fb_shouldWaitForQuiescence = [shouldWaitForQuiescence boolValue];
   }
-  if (app.fb_state < 2) {
+  if (!app.running) {
     app.launchArguments = arguments ?: @[];
     app.launchEnvironment = environment ?: @{};
     [app launch];
   } else {
-    [app fb_activate];
+    [app activate];
   }
-  if (nil != self.testedApplicationBundleId
-      && [bundleIdentifier isEqualToString:(NSString *)self.testedApplicationBundleId]) {
+  if ([app fb_isSameAppAs:self.testedApplication]) {
     self.isTestedApplicationExpectedToRun = YES;
   }
   return app;
 }
 
-- (FBApplication *)activateApplicationWithBundleId:(NSString *)bundleIdentifier
+- (XCUIApplication *)activateApplicationWithBundleId:(NSString *)bundleIdentifier
 {
-  FBApplication *app = [[FBApplication alloc] initWithBundleIdentifier:bundleIdentifier];
-  [app fb_activate];
+  XCUIApplication *app = [self makeApplicationWithBundleId:bundleIdentifier];
+  [app activate];
   return app;
 }
 
 - (BOOL)terminateApplicationWithBundleId:(NSString *)bundleIdentifier
 {
-  FBApplication *app = [[FBApplication alloc] initWithBundleIdentifier:bundleIdentifier];
-  if (nil != self.testedApplicationBundleId
-      && [bundleIdentifier isEqualToString:(NSString *)self.testedApplicationBundleId]) {
+  XCUIApplication *app = [self makeApplicationWithBundleId:bundleIdentifier];
+  if ([app fb_isSameAppAs:self.testedApplication]) {
     self.isTestedApplicationExpectedToRun = NO;
   }
-  if (app.fb_state >= 2) {
+  if (app.running) {
     [app terminate];
     return YES;
   }
@@ -221,7 +217,14 @@ static FBSession *_activeSession = nil;
 
 - (NSUInteger)applicationStateWithBundleId:(NSString *)bundleIdentifier
 {
-  return [[FBApplication alloc] initWithBundleIdentifier:bundleIdentifier].fb_state;
+  return [self makeApplicationWithBundleId:bundleIdentifier].state;
+}
+
+- (XCUIApplication *)makeApplicationWithBundleId:(NSString *)bundleIdentifier
+{
+  return nil != self.testedApplication && [bundleIdentifier isEqualToString:(NSString *)self.testedApplication.bundleID]
+    ? self.testedApplication
+    : [[XCUIApplication alloc] initWithBundleIdentifier:bundleIdentifier];
 }
 
 @end

package/WebDriverAgentLib/Utilities/FBAlertsMonitor.m

@@ -10,9 +10,9 @@
 #import "FBAlertsMonitor.h"
 
 #import "FBAlert.h"
-#import "FBApplication.h"
 #import "FBLogger.h"
 #import "XCUIApplication+FBAlert.h"
+#import "XCUIApplication+FBHelpers.h"
 
 static const NSTimeInterval FB_MONTORING_INTERVAL = 2.0;
 
@@ -49,8 +49,8 @@ static const NSTimeInterval FB_MONTORING_INTERVAL = 2.0;
   }
 
   dispatch_async(dispatch_get_main_queue(), ^{
-    NSArray<FBApplication *> *activeApps = FBApplication.fb_activeApplications;
-    for (FBApplication *activeApp in activeApps) {
+    NSArray<XCUIApplication *> *activeApps = XCUIApplication.fb_activeApplications;
+    for (XCUIApplication *activeApp in activeApps) {
       XCUIElement *alertElement = nil;
       @try {
         alertElement = activeApp.fb_alertElement;

package/WebDriverAgentLib/Utilities/FBConfiguration.h

@@ -60,6 +60,7 @@ extern NSString *const FBSnapshotMaxDepthKey;
 /* The maximum typing frequency for all typing activities */
 + (void)setMaxTypingFrequency:(NSUInteger)value;
 + (NSUInteger)maxTypingFrequency;
++ (NSUInteger)defaultTypingFrequency;
 
 /* Use singleton test manager proxy */
 + (void)setShouldUseSingletonTestManager:(BOOL)value;

package/WebDriverAgentLib/Utilities/FBConfiguration.m

@@ -39,7 +39,7 @@ static NSUInteger FBMjpegServerFramerate = 10;
 
 // Session-specific settings
 static BOOL FBShouldTerminateApp;
-static NSUInteger FBMaxTypingFrequency;
+static NSNumber* FBMaxTypingFrequency;
 static NSUInteger FBScreenshotQuality;
 static NSTimeInterval FBCustomSnapshotTimeout;
 static BOOL FBShouldUseFirstMatch;
@@ -57,6 +57,13 @@ static UIInterfaceOrientation FBScreenshotOrientation;
 
 @implementation FBConfiguration
 
++ (NSUInteger)defaultTypingFrequency
+{
+  NSInteger defaultFreq = [[NSUserDefaults standardUserDefaults]
+                           integerForKey:@"com.apple.xctest.iOSMaximumTypingFrequency"];
+  return defaultFreq > 0 ? defaultFreq : 60;
+}
+
 + (void)initialize
 {
   [FBConfiguration resetSessionSettings];
@@ -200,12 +207,17 @@ static UIInterfaceOrientation FBScreenshotOrientation;
 
 + (void)setMaxTypingFrequency:(NSUInteger)value
 {
-  FBMaxTypingFrequency = value;
+  FBMaxTypingFrequency = @(value);
 }
 
 + (NSUInteger)maxTypingFrequency
 {
-  return FBMaxTypingFrequency;
+  if (nil == FBMaxTypingFrequency) {
+    return [self defaultTypingFrequency];
+  }
+  return FBMaxTypingFrequency.integerValue <= 0 
+    ? [self defaultTypingFrequency]
+    : FBMaxTypingFrequency.integerValue;
 }
 
 + (void)setShouldUseSingletonTestManager:(BOOL)value
@@ -462,7 +474,7 @@ static UIInterfaceOrientation FBScreenshotOrientation;
   FBShouldTerminateApp = YES;
   FBShouldUseCompactResponses = YES;
   FBElementResponseAttributes = @"type,label";
-  FBMaxTypingFrequency = 60;
+  FBMaxTypingFrequency = @([self defaultTypingFrequency]);
   FBScreenshotQuality = 3;
   FBCustomSnapshotTimeout = 15.;
   FBShouldUseFirstMatch = NO;

package/WebDriverAgentLib/Utilities/FBKeyboard.h

@@ -23,19 +23,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (nullable NSString *)keyValueForName:(NSString *)name;
 #endif
 
-/**
- Types a string into active element. There must be element with keyboard focus; otherwise an
- error is raised.
-
- This API discards any modifiers set in the current context by +performWithKeyModifiers:block: so that
- it strictly interprets the provided text. To input keys with modifier flags, use  -typeKey:modifierFlags:.
-
- @param text that should be typed
- @param error If there is an error, upon return contains an NSError object that describes the problem.
- @return YES if the operation succeeds, otherwise NO.
- */
-+ (BOOL)typeText:(NSString *)text error:(NSError **)error;
-
 /**
  Waits until the keyboard is visible on the screen or a timeout happens
  
@@ -46,20 +33,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (BOOL)waitUntilVisibleForApplication:(XCUIApplication *)app timeout:(NSTimeInterval)timeout  error:(NSError **)error;
 
-/**
- Types a string into active element. There must be element with keyboard focus; otherwise an
- error is raised.
-
- This API discards any modifiers set in the current context by +performWithKeyModifiers:block: so that
- it strictly interprets the provided text. To input keys with modifier flags, use  -typeKey:modifierFlags:.
-
- @param text that should be typed
- @param frequency Frequency of typing (letters per sec)
- @param error If there is an error, upon return contains an NSError object that describes the problem.
- @return YES if the operation succeeds, otherwise NO.
- */
-+ (BOOL)typeText:(NSString *)text frequency:(NSUInteger)frequency error:(NSError **)error;
-
 @end
 
 NS_ASSUME_NONNULL_END