appium-webdriveragent 5.15.9 → 6.0.0

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

@@ -9,8 +9,6 @@
 
 #import "FBKeyboard.h"
 
-
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBXCTestDaemonsProxy.h"
 #import "FBErrorBuilder.h"
@@ -25,10 +23,13 @@
 
 @implementation FBKeyboard
 
-+ (BOOL)waitUntilVisibleForApplication:(XCUIApplication *)app timeout:(NSTimeInterval)timeout error:(NSError **)error
++ (BOOL)waitUntilVisibleForApplication:(XCUIApplication *)app 
+                               timeout:(NSTimeInterval)timeout
+                                 error:(NSError **)error
 {
   BOOL (^isKeyboardVisible)(void) = ^BOOL(void) {
-    if (!app.keyboard.exists) {
+    XCUIElement *keyboard = app.keyboards.fb_firstMatch;
+    if (nil == keyboard) {
       return NO;
     }
 
@@ -36,7 +37,7 @@
                                                                             NSDictionary *bindings) {
       return snapshot.label.length > 0;
     }];
-    XCUIElement *firstKey = [[app.keyboard descendantsMatchingType:XCUIElementTypeKey]
+    XCUIElement *firstKey = [[keyboard descendantsMatchingType:XCUIElementTypeKey]
                              matchingPredicate:keySearchPredicate].allElementsBoundByIndex.firstObject;
     return firstKey.exists && firstKey.hittable;
   };

package/WebDriverAgentLib/Utilities/FBMjpegServer.m

@@ -13,7 +13,6 @@
 @import UniformTypeIdentifiers;
 
 #import "GCDAsyncSocket.h"
-#import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBLogger.h"
 #import "FBScreenshot.h"

package/WebDriverAgentLib/Utilities/FBPasteboard.m

@@ -11,9 +11,9 @@
 
 #import <mach/mach_time.h>
 #import "FBAlert.h"
-#import "FBApplication.h"
 #import "FBErrorBuilder.h"
 #import "FBMacros.h"
+#import "XCUIApplication+FBHelpers.h"
 #import "XCUIApplication+FBAlert.h"
 
 #define ALERT_TIMEOUT_SEC 30
@@ -101,7 +101,7 @@
       break;
     }
 
-    XCUIElement *alertElement = FBApplication.fb_systemApplication.fb_alertElement;
+    XCUIElement *alertElement = XCUIApplication.fb_systemApplication.fb_alertElement;
     if (nil != alertElement) {
       FBAlert *alert = [FBAlert alertWithElement:alertElement];
       [alert acceptWithError:nil];

package/WebDriverAgentLib/Utilities/FBScreen.m

@@ -8,7 +8,6 @@
  */
 
 #import "FBScreen.h"
-#import "FBApplication.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIScreen.h"
@@ -22,7 +21,7 @@
 
 + (CGSize)statusBarSizeForApplication:(XCUIApplication *)application
 {
-  XCUIApplication *app = FBApplication.fb_systemApplication;
+  XCUIApplication *app = XCUIApplication.fb_systemApplication;
   // Since iOS 13 the status bar is no longer part of the application, it’s part of the SpringBoard
   XCUIElement *mainStatusBar = app.statusBars.allElementsBoundByIndex.firstObject;
   if (nil == mainStatusBar) {

package/WebDriverAgentLib/Utilities/FBTVNavigationTracker.m

@@ -10,7 +10,6 @@
 #import "FBTVNavigationTracker.h"
 #import "FBTVNavigationTracker-Private.h"
 
-#import "FBApplication.h"
 #import "FBMathUtils.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIElement+FBUtilities.h"
@@ -69,7 +68,7 @@
 
 - (FBTVDirection)directionToFocusedElement
 {
-  XCUIElement *focused = FBApplication.fb_activeApplication.fb_focusedElement;
+  XCUIElement *focused = XCUIApplication.fb_activeApplication.fb_focusedElement;
 
   CGPoint focusedCenter = FBRectGetCenter(focused.wdFrame);
   FBTVNavigationItem *item = [self navigationItemWithElement:focused];

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.h

@@ -28,39 +28,6 @@ NSInteger FBTestmanagerdVersion(void);
 
 NS_ASSUME_NONNULL_BEGIN
 
-/**
- The exception happends if one tries to call application method,
- which is not supported in the current iOS version
- */
-extern NSString *const FBApplicationMethodNotSupportedException;
-
-@interface XCUIApplication (FBCompatibility)
-
-+ (nullable instancetype)fb_applicationWithPID:(pid_t)processID;
-
-/**
- Get the state of the application. This method only returns reliable results on Xcode SDK 9+
-
- @return State value as enum item. See https://developer.apple.com/documentation/xctest/xcuiapplicationstate?language=objc for more details.
- */
-- (NSUInteger)fb_state;
-
-/**
- Activate the application by restoring it from the background.
- Nothing will happen if the application is already in foreground.
- This method is only supported since Xcode9.
-
- @throws FBTimeoutException if the app is still not active after the timeout
- */
-- (void)fb_activate;
-
-/**
- Terminate the application and wait until it disappears from the list of active apps
- */
-- (void)fb_terminate;
-
-@end
-
 @interface XCUIElementQuery (FBCompatibility)
 
 /* Performs short-circuit UI tree traversion in iOS 11+ to get the first element matched by the query. Equals to nil if no matching elements are found */

package/WebDriverAgentLib/Utilities/FBXCodeCompatibility.m

@@ -9,6 +9,7 @@
 
 #import "FBXCodeCompatibility.h"
 
+#import "FBXCAXClientProxy.h"
 #import "FBConfiguration.h"
 #import "FBErrorBuilder.h"
 #import "FBLogger.h"
@@ -17,45 +18,6 @@
 #import "FBXCTestDaemonsProxy.h"
 #import "XCTestManager_ManagerInterface-Protocol.h"
 
-static const NSTimeInterval APP_STATE_CHANGE_TIMEOUT = 5.0;
-
-NSString *const FBApplicationMethodNotSupportedException = @"FBApplicationMethodNotSupportedException";
-
-@implementation XCUIApplication (FBCompatibility)
-
-+ (instancetype)fb_applicationWithPID:(pid_t)processID
-{
-  if (0 == processID) {
-    return nil;
-  }
-
-  return [self applicationWithPID:processID];
-}
-
-- (void)fb_activate
-{
-  [self activate];
-  if (![self waitForState:XCUIApplicationStateRunningForeground timeout:APP_STATE_CHANGE_TIMEOUT / 2] || ![self fb_waitForAppElement:APP_STATE_CHANGE_TIMEOUT / 2]) {
-    [FBLogger logFmt:@"The application '%@' is not running in foreground after %.2f seconds", self.bundleID, APP_STATE_CHANGE_TIMEOUT];
-  }
-}
-
-- (void)fb_terminate
-{
-  [self terminate];
-  if (![self waitForState:XCUIApplicationStateNotRunning timeout:APP_STATE_CHANGE_TIMEOUT]) {
-    [FBLogger logFmt:@"The active application is still '%@' after %.2f seconds timeout", self.bundleID, APP_STATE_CHANGE_TIMEOUT];
-  }
-}
-
-- (NSUInteger)fb_state
-{
-  return [[self valueForKey:@"state"] intValue];
-}
-
-@end
-
-
 @implementation XCUIElementQuery (FBCompatibility)
 
 - (XCElementSnapshot *)fb_uniqueSnapshotWithError:(NSError **)error
@@ -89,7 +51,7 @@ NSString *const FBApplicationMethodNotSupportedException = @"FBApplicationMethod
   static dispatch_once_t hasIncludingNonModalElements;
   static BOOL result;
   dispatch_once(&hasIncludingNonModalElements, ^{
-    result = [FBApplication.fb_systemApplication.query respondsToSelector:@selector(includingNonModalElements)];
+    result = [XCUIApplication.fb_systemApplication.query respondsToSelector:@selector(includingNonModalElements)];
   });
   return result;
 }

package/WebDriverAgentLib/WebDriverAgentLib.h

@@ -16,7 +16,6 @@ FOUNDATION_EXPORT double WebDriverAgentLib_VersionNumber;
 FOUNDATION_EXPORT const unsigned char WebDriverAgentLib_VersionString[];
 
 #import <WebDriverAgentLib/FBAlert.h>
-#import <WebDriverAgentLib/FBApplication.h>
 #import <WebDriverAgentLib/FBCommandHandler.h>
 #import <WebDriverAgentLib/FBCommandStatus.h>
 #import <WebDriverAgentLib/FBConfiguration.h>

package/WebDriverAgentTests/IntegrationTests/FBAutoAlertsHandlerTests.m

@@ -10,7 +10,6 @@
 #import <XCTest/XCTest.h>
 
 #import "FBIntegrationTestCase.h"
-#import "FBApplication.h"
 #import "FBMacros.h"
 #import "FBSession.h"
 #import "FBXCodeCompatibility.h"
@@ -50,7 +49,7 @@
 - (void)disabled_testAutoAcceptingOfAlerts
 {
   self.session = [FBSession
-                  initWithApplication:FBApplication.fb_activeApplication
+                  initWithApplication:XCUIApplication.fb_activeApplication
                   defaultAlertAction:@"accept"];
   for (int i = 0; i < 2; i++) {
     [self.testedApplication.buttons[FBShowAlertButtonName] tap];
@@ -63,7 +62,7 @@
 - (void)disabled_testAutoDismissingOfAlerts
 {
   self.session = [FBSession
-                  initWithApplication:FBApplication.fb_activeApplication
+                  initWithApplication:XCUIApplication.fb_activeApplication
                   defaultAlertAction:@"dismiss"];
   for (int i = 0; i < 2; i++) {
     [self.testedApplication.buttons[FBShowAlertButtonName] tap];

package/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m

@@ -9,7 +9,6 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FBApplication.h"
 #import "FBIntegrationTestCase.h"
 #import "FBMacros.h"
 #import "FBTestMacros.h"

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.h

@@ -9,8 +9,6 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FBApplication.h"
-
 extern NSString *const FBShowAlertButtonName;
 extern NSString *const FBShowSheetAlertButtonName;
 extern NSString *const FBShowAlertForceTouchButtonName;
@@ -22,7 +20,7 @@ extern NSString *const FBTapsCountLabelIdentifier;
  */
 @interface FBIntegrationTestCase : XCTestCase
 @property (nonatomic, strong, readonly) XCUIApplication *testedApplication;
-@property (nonatomic, strong, readonly) FBApplication *springboard;
+@property (nonatomic, strong, readonly) XCUIApplication *springboard;
 
 /**
  Launches application and resets side effects of testing like orientation etc.

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m

@@ -10,12 +10,12 @@
 #import <XCTest/XCTest.h>
 
 #import "FBAlert.h"
-#import "FBApplication.h"
 #import "FBTestMacros.h"
 #import "FBIntegrationTestCase.h"
 #import "FBConfiguration.h"
 #import "FBMacros.h"
 #import "FBRunLoopSpinner.h"
+#import "XCUIApplication+FBHelpers.h"
 #import "XCUIDevice+FBRotation.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBIsVisible.h"
@@ -30,7 +30,7 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
 
 @interface FBIntegrationTestCase ()
 @property (nonatomic, strong) XCUIApplication *testedApplication;
-@property (nonatomic, strong) FBApplication *springboard;
+@property (nonatomic, strong) XCUIApplication *springboard;
 @end
 
 @implementation FBIntegrationTestCase
@@ -46,7 +46,7 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
   [FBConfiguration disableApplicationUIInterruptionsHandling];
   [FBConfiguration disableScreenshots];
   self.continueAfterFailure = NO;
-  self.springboard = FBApplication.fb_systemApplication;
+  self.springboard = XCUIApplication.fb_systemApplication;
   self.testedApplication = [XCUIApplication new];
 }
 
@@ -91,10 +91,10 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
 {
   [[XCUIDevice sharedDevice] pressButton:XCUIDeviceButtonHome];
   [self.testedApplication fb_waitUntilStable];
-  FBAssertWaitTillBecomesTrue(FBApplication.fb_systemApplication.icons[@"Safari"].exists);
+  FBAssertWaitTillBecomesTrue(XCUIApplication.fb_systemApplication.icons[@"Safari"].exists);
   [[XCUIDevice sharedDevice] pressButton:XCUIDeviceButtonHome];
   [self.testedApplication fb_waitUntilStable];
-  FBAssertWaitTillBecomesTrue(FBApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.fb_isVisible);
+  FBAssertWaitTillBecomesTrue(XCUIApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.fb_isVisible);
 }
 
 - (void)goToSpringBoardExtras

package/WebDriverAgentTests/IntegrationTests/FBSafariAlertTests.m

@@ -10,7 +10,6 @@
 #import <XCTest/XCTest.h>
 
 #import "FBIntegrationTestCase.h"
-#import "FBApplication.h"
 #import "FBTestMacros.h"
 #import "FBMacros.h"
 #import "FBSession.h"
@@ -33,7 +32,7 @@ static NSString *const SAFARI_BUNDLE_ID = @"com.apple.mobilesafari";
 - (void)setUp
 {
   [super setUp];
-  self.session = [FBSession initWithApplication:FBApplication.fb_activeApplication];
+  self.session = [FBSession initWithApplication:XCUIApplication.fb_activeApplication];
   [self.session launchApplicationWithBundleId:SAFARI_BUNDLE_ID
                       shouldWaitForQuiescence:nil
                                     arguments:nil

package/WebDriverAgentTests/IntegrationTests/FBSessionIntegrationTests.m

@@ -10,13 +10,14 @@
 #import <XCTest/XCTest.h>
 
 #import "FBIntegrationTestCase.h"
-#import "FBApplication.h"
 #import "FBExceptions.h"
 #import "FBMacros.h"
 #import "FBSession.h"
 #import "FBXCodeCompatibility.h"
 #import "FBTestMacros.h"
 #import "FBUnattachedAppLauncher.h"
+#import "XCUIApplication+FBHelpers.h"
+#import "XCUIApplication.h"
 
 @interface FBSession (Tests)
 
@@ -35,7 +36,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
 {
   [super setUp];
   [self launchApplication];
-  FBApplication *app = [[FBApplication alloc] initWithBundleIdentifier:self.testedApplication.bundleID];
+  XCUIApplication *app = [[XCUIApplication alloc] initWithBundleIdentifier:self.testedApplication.bundleID];
   self.session = [FBSession initWithApplication:app];
 }
 
@@ -47,7 +48,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
 
 - (void)testSettingsAppCanBeOpenedInScopeOfTheCurrentSession
 {
-  FBApplication *testedApp = FBApplication.fb_activeApplication;
+  XCUIApplication *testedApp = XCUIApplication.fb_activeApplication;
   [self.session launchApplicationWithBundleId:SETTINGS_BUNDLE_ID
                       shouldWaitForQuiescence:nil
                                     arguments:nil
@@ -61,7 +62,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
 
 - (void)testSettingsAppCanBeReopenedInScopeOfTheCurrentSession
 {
-  FBApplication *systemApp = self.springboard;
+  XCUIApplication *systemApp = self.springboard;
   [self.session launchApplicationWithBundleId:SETTINGS_BUNDLE_ID
                       shouldWaitForQuiescence:nil
                                     arguments:nil
@@ -78,7 +79,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
 
 - (void)testMainAppCanBeReactivatedInScopeOfTheCurrentSession
 {
-  FBApplication *testedApp = FBApplication.fb_activeApplication;
+  XCUIApplication *testedApp = XCUIApplication.fb_activeApplication;
   [self.session launchApplicationWithBundleId:SETTINGS_BUNDLE_ID
                       shouldWaitForQuiescence:nil
                                     arguments:nil
@@ -90,8 +91,8 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
 
 - (void)testMainAppCanBeRestartedInScopeOfTheCurrentSession
 {
-  FBApplication *systemApp = self.springboard;
-  FBApplication *testedApp = [[FBApplication alloc] initWithBundleIdentifier:self.testedApplication.bundleID];
+  XCUIApplication *systemApp = self.springboard;
+  XCUIApplication *testedApp = [[XCUIApplication alloc] initWithBundleIdentifier:self.testedApplication.bundleID];
   [self.session terminateApplicationWithBundleId:testedApp.bundleID];
   FBAssertWaitTillBecomesTrue([self.session.activeApplication.bundleID isEqualToString:systemApp.bundleID]);
   [self.session launchApplicationWithBundleId:testedApp.bundleID
@@ -105,12 +106,12 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
 {
   [FBUnattachedAppLauncher launchAppWithBundleId:SETTINGS_BUNDLE_ID];
   [self.session kill];
-  XCTAssertEqualObjects(SETTINGS_BUNDLE_ID, FBApplication.fb_activeApplication.bundleID);
+  XCTAssertEqualObjects(SETTINGS_BUNDLE_ID, XCUIApplication.fb_activeApplication.bundleID);
 }
 
 - (void)testAppWithInvalidBundleIDCannotBeStarted
 {
-  FBApplication *testedApp = [[FBApplication alloc] initWithBundleIdentifier:@"yolo"];
+  XCUIApplication *testedApp = [[XCUIApplication alloc] initWithBundleIdentifier:@"yolo"];
   @try {
     [testedApp launch];
     XCTFail(@"An exception is expected to be thrown");
@@ -121,7 +122,7 @@ static NSString *const SETTINGS_BUNDLE_ID = @"com.apple.Preferences";
 
 - (void)testAppWithInvalidBundleIDCannotBeActivated
 {
-  FBApplication *testedApp = [[FBApplication alloc] initWithBundleIdentifier:@"yolo"];
+  XCUIApplication *testedApp = [[XCUIApplication alloc] initWithBundleIdentifier:@"yolo"];
   @try {
     [testedApp activate];
     XCTFail(@"An exception is expected to be thrown");

package/WebDriverAgentTests/IntegrationTests/FBTapTest.m

@@ -11,7 +11,6 @@
 
 #import "FBIntegrationTestCase.h"
 
-#import "FBApplication.h"
 #import "FBElementCache.h"
 #import "FBTestMacros.h"
 #import "XCUIDevice+FBRotation.h"

package/WebDriverAgentTests/IntegrationTests/FBW3CMultiTouchActionsIntegrationTests.m

@@ -11,7 +11,6 @@
 
 #import "FBIntegrationTestCase.h"
 
-#import "FBApplication.h"
 #import "XCUIElement.h"
 #import "XCUIApplication+FBTouchAction.h"
 #import "FBTestMacros.h"