appium-webdriveragent 5.15.6 → 5.15.7

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"

package/WebDriverAgentTests/IntegrationTests/XCUIApplicationHelperTests.m

@@ -11,11 +11,11 @@
 
 #import <mach/mach_time.h>
 
-#import "FBApplication.h"
 #import "FBIntegrationTestCase.h"
 #import "FBElement.h"
 #import "FBMacros.h"
 #import "FBTestMacros.h"
+#import "XCUIApplication.h"
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "FBXCodeCompatibility.h"
@@ -34,8 +34,8 @@
 - (void)testQueringSpringboard
 {
   [self goToSpringBoardFirstPage];
-  XCTAssertTrue(FBApplication.fb_systemApplication.icons[@"Safari"].exists);
-  XCTAssertTrue(FBApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.exists);
+  XCTAssertTrue(XCUIApplication.fb_systemApplication.icons[@"Safari"].exists);
+  XCTAssertTrue(XCUIApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.exists);
 }
 
 - (void)testApplicationTree
@@ -58,10 +58,10 @@
 
 - (void)testActiveApplication
 {
-  FBApplication *systemApp = FBApplication.fb_systemApplication;
-  XCTAssertTrue([FBApplication fb_activeApplication].buttons[@"Alerts"].fb_isVisible);
+  XCUIApplication *systemApp = XCUIApplication.fb_systemApplication;
+  XCTAssertTrue([XCUIApplication fb_activeApplication].buttons[@"Alerts"].fb_isVisible);
   [self goToSpringBoardFirstPage];
-  XCTAssertEqualObjects([FBApplication fb_activeApplication].bundleID, systemApp.bundleID);
+  XCTAssertEqualObjects([XCUIApplication fb_activeApplication].bundleID, systemApp.bundleID);
   XCTAssertTrue(systemApp.icons[@"Safari"].fb_isVisible);
 }
 
@@ -102,14 +102,14 @@
   }
 
   NSError *error;
-  NSArray *auditIssues1 = [FBApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypes:~0UL
+  NSArray *auditIssues1 = [XCUIApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypes:~0UL
                                                                                                    error:&error];
   XCTAssertNotNil(auditIssues1);
   XCTAssertNil(error);
 
   NSMutableSet *set = [NSMutableSet new];
   [set addObject:@"XCUIAccessibilityAuditTypeAll"];
-  NSArray *auditIssues2 = [FBApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypesSet:set.copy
+  NSArray *auditIssues2 = [XCUIApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypesSet:set.copy
                                                                                                       error:&error];
   XCTAssertEqualObjects(auditIssues1, auditIssues2);
   XCTAssertNil(error);

package/WebDriverAgentTests/IntegrationTests/XCUIDeviceHelperTests.m

@@ -9,11 +9,12 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FBApplication.h"
 #import "FBIntegrationTestCase.h"
 #import "FBImageUtils.h"
 #import "FBMacros.h"
 #import "FBTestMacros.h"
+#import "XCUIApplication.h"
+#import "XCUIApplication+FBHelpers.h"
 #import "XCUIDevice+FBHelpers.h"
 #import "XCUIDevice+FBRotation.h"
 #import "XCUIScreen.h"
@@ -101,7 +102,7 @@
   NSError *error;
   XCTAssertTrue([[XCUIDevice sharedDevice] fb_goToHomescreenWithError:&error]);
   XCTAssertNil(error);
-  XCTAssertTrue([FBApplication fb_activeApplication].icons[@"Safari"].exists);
+  XCTAssertTrue([XCUIApplication fb_activeApplication].icons[@"Safari"].exists);
 }
 
 - (void)testLockUnlockScreen
@@ -124,7 +125,7 @@
 
   NSError *error;
   XCTAssertTrue([XCUIDevice.sharedDevice fb_openUrl:@"https://apple.com" error:&error]);
-  FBAssertWaitTillBecomesTrue([FBApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
+  FBAssertWaitTillBecomesTrue([XCUIApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
   XCTAssertNil(error);
 }
 
@@ -138,7 +139,7 @@
   XCTAssertTrue([XCUIDevice.sharedDevice fb_openUrl:@"https://apple.com"
                                     withApplication:@"com.apple.mobilesafari"
                                               error:&error]);
-  FBAssertWaitTillBecomesTrue([FBApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
+  FBAssertWaitTillBecomesTrue([XCUIApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
   XCTAssertNil(error);
 }
 

package/WebDriverAgentTests/IntegrationTests/XCUIElementHelperIntegrationTests.m

@@ -10,7 +10,6 @@
 #import <XCTest/XCTest.h>
 #import "XCTest/XCUIElementTypes.h"
 
-#import "FBApplication.h"
 #import "FBIntegrationTestCase.h"
 #import "FBTestMacros.h"
 #import "FBElement.h"

package/WebDriverAgentTests/UnitTests/Doubles/{FBApplicationDouble.h → XCUIApplicationDouble.h}

@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface FBApplicationDouble : NSObject
+@interface XCUIApplicationDouble : NSObject
 @property (nonatomic, assign, readonly) BOOL didTerminate;
 @property (nonatomic, strong) NSString* bundleID;
 @property (nonatomic) BOOL fb_shouldWaitForQuiescence;

package/WebDriverAgentTests/UnitTests/Doubles/{FBApplicationDouble.m → XCUIApplicationDouble.m}

@@ -7,13 +7,13 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "FBApplicationDouble.h"
+#import "XCUIApplicationDouble.h"
 
-@interface FBApplicationDouble ()
+@interface XCUIApplicationDouble ()
 @property (nonatomic, assign, readwrite) BOOL didTerminate;
 @end
 
-@implementation FBApplicationDouble
+@implementation XCUIApplicationDouble
 
 - (instancetype)init
 {

package/WebDriverAgentTests/UnitTests/FBSessionTests.m

@@ -9,13 +9,13 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FBApplicationDouble.h"
 #import "FBSession.h"
 #import "FBConfiguration.h"
+#import "XCUIApplicationDouble.h"
 
 @interface FBSessionTests : XCTestCase
 @property (nonatomic, strong) FBSession *session;
-@property (nonatomic, strong) FBApplication *testedApplication;
+@property (nonatomic, strong) XCUIApplication *testedApplication;
 @property (nonatomic) BOOL shouldTerminateAppValue;
 @end
 
@@ -24,7 +24,7 @@
 - (void)setUp
 {
   [super setUp];
-  self.testedApplication = (id)FBApplicationDouble.new;
+  self.testedApplication = (id)XCUIApplicationDouble.new;
   self.shouldTerminateAppValue = FBConfiguration.shouldTerminateApp;
   [FBConfiguration setShouldTerminateApp:NO];
   self.session = [FBSession initWithApplication:self.testedApplication];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "5.15.6",
+  "version": "5.15.7",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {
@@ -87,7 +87,7 @@
     "mocha": "^10.0.0",
     "pre-commit": "^1.2.2",
     "prettier": "^3.0.0",
-    "semantic-release": "^22.0.5",
+    "semantic-release": "^23.0.0",
     "sinon": "^17.0.0",
     "ts-node": "^10.9.1",
     "typescript": "~5.2"

package/WebDriverAgentLib/FBApplication.h

@@ -1,49 +0,0 @@
-/**
- * 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. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import <WebDriverAgentLib/XCUIApplication.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FBApplication : XCUIApplication
-
-/**
- Constructor used to get current active application
- */
-+ (instancetype)fb_activeApplication;
-
-/**
- Constructor used to get current active application
-
- @param bundleId The bundle identifier of an app, which should be selected as active by default
- if it is present in the list of active applications
- */
-+ (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bundleId;
-
-/**
- Constructor used to get the system application (e.g. Springboard on iOS)
- */
-+ (instancetype)fb_systemApplication;
-
-/**
- Retrieves the list of all currently active applications
- */
-+ (NSArray<FBApplication *> *)fb_activeApplications;
-
-/**
- Switch to system app (called Springboard on iOS)
-
- @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)fb_switchToSystemApplicationWithError:(NSError **)error;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/FBApplication.m

@@ -1,185 +0,0 @@
-/**
- * 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. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import "FBApplication.h"
-
-#import "FBXCAccessibilityElement.h"
-#import "FBLogger.h"
-#import "FBExceptions.h"
-#import "FBRunLoopSpinner.h"
-#import "FBMacros.h"
-#import "FBActiveAppDetectionPoint.h"
-#import "FBXCodeCompatibility.h"
-#import "FBXCTestDaemonsProxy.h"
-#import "XCUIApplication.h"
-#import "XCUIApplication+FBHelpers.h"
-#import "XCUIApplicationImpl.h"
-#import "XCUIApplicationProcess.h"
-#import "XCUIElement.h"
-#import "XCUIElementQuery.h"
-#import "FBXCAXClientProxy.h"
-
-
-static const NSTimeInterval APP_STATE_CHANGE_TIMEOUT = 5.0;
-
-@interface FBApplication ()
-@end
-
-@implementation FBApplication
-
-+ (instancetype)fb_activeApplication
-{
-  return [self fb_activeApplicationWithDefaultBundleId:nil];
-}
-
-+ (NSArray<FBApplication *> *)fb_activeApplications
-{
-  NSArray<id<FBXCAccessibilityElement>> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
-  NSMutableArray<FBApplication *> *result = [NSMutableArray array];
-  if (activeApplicationElements.count > 0) {
-    for (id<FBXCAccessibilityElement> applicationElement in activeApplicationElements) {
-      FBApplication *app = [FBApplication fb_applicationWithPID:applicationElement.processIdentifier];
-      if (nil != app) {
-        [result addObject:app];
-      }
-    }
-  }
-  return result.count > 0 ? result.copy : @[self.class.fb_systemApplication];
-}
-
-+ (instancetype)fb_activeApplicationWithDefaultBundleId:(nullable NSString *)bundleId
-{
-  NSArray<id<FBXCAccessibilityElement>> *activeApplicationElements = [FBXCAXClientProxy.sharedClient activeApplications];
-  id<FBXCAccessibilityElement> activeApplicationElement = nil;
-  id<FBXCAccessibilityElement> currentElement = nil;
-  if (nil != bundleId) {
-    currentElement = FBActiveAppDetectionPoint.sharedInstance.axElement;
-    if (nil != currentElement) {
-      NSArray<NSDictionary *> *appInfos = [self fb_appsInfoWithAxElements:@[currentElement]];
-      [FBLogger logFmt:@"Detected on-screen application: %@", appInfos.firstObject[@"bundleId"]];
-      if ([[appInfos.firstObject objectForKey:@"bundleId"] isEqualToString:(id)bundleId]) {
-        activeApplicationElement = currentElement;
-      }
-    }
-  }
-  if (nil == activeApplicationElement && activeApplicationElements.count > 1) {
-    if (nil != bundleId) {
-      NSArray<NSDictionary *> *appInfos = [self fb_appsInfoWithAxElements:activeApplicationElements];
-      NSMutableArray<NSString *> *bundleIds = [NSMutableArray array];
-      for (NSDictionary *appInfo in appInfos) {
-        [bundleIds addObject:(NSString *)appInfo[@"bundleId"]];
-      }
-      [FBLogger logFmt:@"Detected system active application(s): %@", bundleIds];
-      // Try to select the desired application first
-      for (NSUInteger appIdx = 0; appIdx < appInfos.count; appIdx++) {
-        if ([[[appInfos objectAtIndex:appIdx] objectForKey:@"bundleId"] isEqualToString:(id)bundleId]) {
-          activeApplicationElement = [activeApplicationElements objectAtIndex:appIdx];
-          break;
-        }
-      }
-    }
-    // Fall back to the "normal" algorithm if the desired application is either
-    // not set or is not active
-    if (nil == activeApplicationElement) {
-      if (nil == currentElement) {
-        currentElement = FBActiveAppDetectionPoint.sharedInstance.axElement;
-      }
-      if (nil == currentElement) {
-        [FBLogger log:@"Cannot precisely detect the current application. Will use the system's recently active one"];
-        if (nil == bundleId) {
-          [FBLogger log:@"Consider changing the 'defaultActiveApplication' setting to the bundle identifier of the desired application under test"];
-        }
-      } else {
-        for (id<FBXCAccessibilityElement> appElement in activeApplicationElements) {
-          if (appElement.processIdentifier == currentElement.processIdentifier) {
-            activeApplicationElement = appElement;
-            break;
-          }
-        }
-      }
-    }
-  }
-
-  if (nil != activeApplicationElement) {
-    FBApplication *application = [FBApplication fb_applicationWithPID:activeApplicationElement.processIdentifier];
-    if (nil != application) {
-      return application;
-    }
-    [FBLogger log:@"Cannot translate the active process identifier into an application object"];
-  }
-
-  if (activeApplicationElements.count > 0) {
-    [FBLogger logFmt:@"Getting the most recent active application (out of %@ total items)", @(activeApplicationElements.count)];
-    for (id<FBXCAccessibilityElement> appElement in activeApplicationElements) {
-      FBApplication *application = [FBApplication fb_applicationWithPID:appElement.processIdentifier];
-      if (nil != application) {
-        return application;
-      }
-    }
-  }
-
-  [FBLogger log:@"Cannot retrieve any active applications. Assuming the system application is the active one"];
-  return [self fb_systemApplication];
-}
-
-+ (instancetype)fb_systemApplication
-{
-  return [self fb_applicationWithPID:
-   [[FBXCAXClientProxy.sharedClient systemApplication] processIdentifier]];
-}
-
-+ (instancetype)applicationWithPID:(pid_t)processID
-{
-  if ([NSProcessInfo processInfo].processIdentifier == processID) {
-    return nil;
-  }
-  return (FBApplication *)[FBXCAXClientProxy.sharedClient monitoredApplicationWithProcessIdentifier:processID];
-}
-
-- (void)launch
-{
-  [super launch];
-  if (![self fb_waitForAppElement:APP_STATE_CHANGE_TIMEOUT]) {
-    [FBLogger logFmt:@"The application '%@' is not running in foreground after %.2f seconds", self.bundleID, APP_STATE_CHANGE_TIMEOUT];
-  }
-}
-
-- (void)terminate
-{
-  [super 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];
-  }
-}
-
-+ (BOOL)fb_switchToSystemApplicationWithError:(NSError **)error
-{
-  FBApplication *systemApp = self.fb_systemApplication;
-  @try {
-    if ([systemApp fb_state] < 2) {
-      [systemApp launch];
-    } else {
-      [systemApp fb_activate];
-    }
-  } @catch (NSException *e) {
-    return [[[FBErrorBuilder alloc]
-             withDescription:nil == e ? @"Cannot open the home screen" : e.reason]
-            buildError:error];
-  }
-  return [[[[FBRunLoopSpinner new]
-            timeout:5]
-           timeoutErrorMessage:@"Timeout waiting until the home screen is visible"]
-          spinUntilTrue:^BOOL{
-    FBApplication *activeApp = self.fb_activeApplication;
-    return nil != activeApp && [activeApp.bundleID isEqualToString:systemApp.bundleID];
-  }
-          error:error];
-}
-
-@end