appium-webdriveragent 5.15.8 → 5.15.9

package/WebDriverAgentTests/IntegrationTests/FBAutoAlertsHandlerTests.m

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

package/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m

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

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.h

@@ -9,6 +9,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import "FBApplication.h"
+
 extern NSString *const FBShowAlertButtonName;
 extern NSString *const FBShowSheetAlertButtonName;
 extern NSString *const FBShowAlertForceTouchButtonName;
@@ -20,7 +22,7 @@ extern NSString *const FBTapsCountLabelIdentifier;
  */
 @interface FBIntegrationTestCase : XCTestCase
 @property (nonatomic, strong, readonly) XCUIApplication *testedApplication;
-@property (nonatomic, strong, readonly) XCUIApplication *springboard;
+@property (nonatomic, strong, readonly) FBApplication *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) XCUIApplication *springboard;
+@property (nonatomic, strong) FBApplication *springboard;
 @end
 
 @implementation FBIntegrationTestCase
@@ -46,7 +46,7 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
   [FBConfiguration disableApplicationUIInterruptionsHandling];
   [FBConfiguration disableScreenshots];
   self.continueAfterFailure = NO;
-  self.springboard = XCUIApplication.fb_systemApplication;
+  self.springboard = FBApplication.fb_systemApplication;
   self.testedApplication = [XCUIApplication new];
 }
 
@@ -91,10 +91,10 @@ NSString *const FBTapsCountLabelIdentifier = @"numberOfTapsLabel";
 {
   [[XCUIDevice sharedDevice] pressButton:XCUIDeviceButtonHome];
   [self.testedApplication fb_waitUntilStable];
-  FBAssertWaitTillBecomesTrue(XCUIApplication.fb_systemApplication.icons[@"Safari"].exists);
+  FBAssertWaitTillBecomesTrue(FBApplication.fb_systemApplication.icons[@"Safari"].exists);
   [[XCUIDevice sharedDevice] pressButton:XCUIDeviceButtonHome];
   [self.testedApplication fb_waitUntilStable];
-  FBAssertWaitTillBecomesTrue(XCUIApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.fb_isVisible);
+  FBAssertWaitTillBecomesTrue(FBApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.fb_isVisible);
 }
 
 - (void)goToSpringBoardExtras

package/WebDriverAgentTests/IntegrationTests/FBSafariAlertTests.m

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

package/WebDriverAgentTests/IntegrationTests/FBSessionIntegrationTests.m

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

package/WebDriverAgentTests/IntegrationTests/FBTapTest.m

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

package/WebDriverAgentTests/IntegrationTests/FBW3CMultiTouchActionsIntegrationTests.m

@@ -11,6 +11,7 @@
 
 #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(XCUIApplication.fb_systemApplication.icons[@"Safari"].exists);
-  XCTAssertTrue(XCUIApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.exists);
+  XCTAssertTrue(FBApplication.fb_systemApplication.icons[@"Safari"].exists);
+  XCTAssertTrue(FBApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.exists);
 }
 
 - (void)testApplicationTree
@@ -58,10 +58,10 @@
 
 - (void)testActiveApplication
 {
-  XCUIApplication *systemApp = XCUIApplication.fb_systemApplication;
-  XCTAssertTrue([XCUIApplication fb_activeApplication].buttons[@"Alerts"].fb_isVisible);
+  FBApplication *systemApp = FBApplication.fb_systemApplication;
+  XCTAssertTrue([FBApplication fb_activeApplication].buttons[@"Alerts"].fb_isVisible);
   [self goToSpringBoardFirstPage];
-  XCTAssertEqualObjects([XCUIApplication fb_activeApplication].bundleID, systemApp.bundleID);
+  XCTAssertEqualObjects([FBApplication fb_activeApplication].bundleID, systemApp.bundleID);
   XCTAssertTrue(systemApp.icons[@"Safari"].fb_isVisible);
 }
 
@@ -102,14 +102,14 @@
   }
 
   NSError *error;
-  NSArray *auditIssues1 = [XCUIApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypes:~0UL
+  NSArray *auditIssues1 = [FBApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypes:~0UL
                                                                                                    error:&error];
   XCTAssertNotNil(auditIssues1);
   XCTAssertNil(error);
 
   NSMutableSet *set = [NSMutableSet new];
   [set addObject:@"XCUIAccessibilityAuditTypeAll"];
-  NSArray *auditIssues2 = [XCUIApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypesSet:set.copy
+  NSArray *auditIssues2 = [FBApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypesSet:set.copy
                                                                                                       error:&error];
   XCTAssertEqualObjects(auditIssues1, auditIssues2);
   XCTAssertNil(error);

package/WebDriverAgentTests/IntegrationTests/XCUIDeviceHelperTests.m

@@ -9,12 +9,11 @@
 
 #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"
@@ -102,7 +101,7 @@
   NSError *error;
   XCTAssertTrue([[XCUIDevice sharedDevice] fb_goToHomescreenWithError:&error]);
   XCTAssertNil(error);
-  XCTAssertTrue([XCUIApplication fb_activeApplication].icons[@"Safari"].exists);
+  XCTAssertTrue([FBApplication fb_activeApplication].icons[@"Safari"].exists);
 }
 
 - (void)testLockUnlockScreen
@@ -125,7 +124,7 @@
 
   NSError *error;
   XCTAssertTrue([XCUIDevice.sharedDevice fb_openUrl:@"https://apple.com" error:&error]);
-  FBAssertWaitTillBecomesTrue([XCUIApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
+  FBAssertWaitTillBecomesTrue([FBApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
   XCTAssertNil(error);
 }
 
@@ -139,7 +138,7 @@
   XCTAssertTrue([XCUIDevice.sharedDevice fb_openUrl:@"https://apple.com"
                                     withApplication:@"com.apple.mobilesafari"
                                               error:&error]);
-  FBAssertWaitTillBecomesTrue([XCUIApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
+  FBAssertWaitTillBecomesTrue([FBApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
   XCTAssertNil(error);
 }
 

package/WebDriverAgentTests/IntegrationTests/XCUIElementHelperIntegrationTests.m

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

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

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

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

@@ -7,13 +7,13 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "XCUIApplicationDouble.h"
+#import "FBApplicationDouble.h"
 
-@interface XCUIApplicationDouble ()
+@interface FBApplicationDouble ()
 @property (nonatomic, assign, readwrite) BOOL didTerminate;
 @end
 
-@implementation XCUIApplicationDouble
+@implementation FBApplicationDouble
 
 - (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) XCUIApplication *testedApplication;
+@property (nonatomic, strong) FBApplication *testedApplication;
 @property (nonatomic) BOOL shouldTerminateAppValue;
 @end
 
@@ -24,7 +24,7 @@
 - (void)setUp
 {
   [super setUp];
-  self.testedApplication = (id)XCUIApplicationDouble.new;
+  self.testedApplication = (id)FBApplicationDouble.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.8",
+  "version": "5.15.9",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {