appium-webdriveragent 3.5.0 → 3.8.0

package/PrivateHeaders/XCTest/XCUIDevice.h

@@ -12,11 +12,12 @@
 @property (readonly) id accessibilityInterface; // implements XCUIAccessibilityInterface
 @property (readonly) id eventSynthesizer; // implements XCUIEventSynthesizing
 @property(readonly) id screenDataSource; // @synthesize screenDataSource=_screenDataSource;
-
+- (_Bool)performDeviceEvent:(id)arg1 error:(id *)arg2;
 
 - (void)pressLockButton;
 - (void)holdHomeButtonForDuration:(double)arg1;
 - (void)_silentPressButton:(long long)arg1;
+// Removed in Xcode 10.2
 - (void)_dispatchEventWithPage:(unsigned int)arg1 usage:(unsigned int)arg2 duration:(double)arg3;
 
 @end

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -128,6 +128,7 @@ static NSString* const FBUnknownBundleId = @"unknown";
   info[@"frame"] = NSStringFromCGRect(snapshot.wdFrame);
   info[@"isEnabled"] = [@([snapshot isWDEnabled]) stringValue];
   info[@"isVisible"] = [@([snapshot isWDVisible]) stringValue];
+  info[@"isAccessible"] = [@([snapshot isWDAccessible]) stringValue];
 #if TARGET_OS_TV
   info[@"isFocused"] = [@([snapshot isWDFocused]) stringValue];
 #endif

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.h

@@ -91,6 +91,28 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)fb_activateSiriVoiceRecognitionWithText:(NSString *)text error:(NSError **)error;
 
+/**
+ Eumlated triggering of the given low-level IOHID device event. The constants for possible events are defined
+ in https://unix.superglobalmegacorp.com/xnu/newsrc/iokit/IOKit/hidsystem/IOHIDUsageTables.h.html
+ Popular constants:
+ - kHIDPage_Consumer = 0x0C
+ - kHIDUsage_Csmr_VolumeIncrement  = 0xE9 (Volume Up)
+ - kHIDUsage_Csmr_VolumeDecrement  = 0xEA (Volume Down)
+ - kHIDUsage_Csmr_Menu = 0x40 (Home)
+ - kHIDUsage_Csmr_Power  = 0x30 (Power)
+ - kHIDUsage_Csmr_Snapshot  = 0x65 (Power + Home)
+
+ @param page The event page identifier
+ @param usage The event usage indentifier (usages are defined per-page)
+ @param duration The event duration in float seconds (XCTest uses 0.005 for a single press event)
+ @param error If there is an error, upon return contains an NSError object that describes the problem.
+ @return YES the event has successfully been triggered
+ */
+- (BOOL)fb_performIOHIDEventWithPage:(unsigned int)page
+                               usage:(unsigned int)usage
+                            duration:(NSTimeInterval)duration
+                               error:(NSError **)error;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -21,6 +21,7 @@
 #import "FBScreenshot.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIDevice.h"
+#import "XCDeviceEvent.h"
 
 static const NSTimeInterval FBHomeButtonCoolOffTime = 1.;
 static const NSTimeInterval FBScreenLockTimeout = 5.;
@@ -98,7 +99,8 @@ static bool fb_isLocked;
 
 - (NSData *)fb_screenshotWithError:(NSError*__autoreleasing*)error
 {
-  return [FBScreenshot takeWithQuality:FBConfiguration.screenshotQuality error:error];
+  return [FBScreenshot takeInOriginalResolutionWithQuality:FBConfiguration.screenshotQuality
+                                                     error:error];
 }
 
 - (BOOL)fb_fingerTouchShouldMatch:(BOOL)shouldMatch
@@ -281,4 +283,15 @@ static bool fb_isLocked;
 }
 #endif
 
+- (BOOL)fb_performIOHIDEventWithPage:(unsigned int)page
+                               usage:(unsigned int)usage
+                            duration:(NSTimeInterval)duration
+                               error:(NSError **)error
+{
+  XCDeviceEvent *event = [XCDeviceEvent deviceEventWithPage:page
+                                                      usage:usage
+                                                   duration:duration];
+  return [self performDeviceEvent:event error:error];
+}
+
 @end

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -34,6 +34,7 @@
 #import "XCUIElementQuery.h"
 #import "XCUIElementQuery+FBHelpers.h"
 #import "XCUIElement+FBUID.h"
+#import "XCUIScreen.h"
 
 #define DEFAULT_AX_TIMEOUT 60.
 
@@ -241,9 +242,15 @@
     }
   }
 #endif
-  return [FBScreenshot takeWithQuality:FBConfiguration.screenshotQuality
-                                  rect:elementRect
-                                 error:error];
+
+  // adjust element rect for the actual screen scale
+  XCUIScreen *mainScreen = XCUIScreen.mainScreen;
+  elementRect = CGRectMake(elementRect.origin.x * mainScreen.scale, elementRect.origin.y * mainScreen.scale,
+                           elementRect.size.width * mainScreen.scale, elementRect.size.height * mainScreen.scale);
+
+  return [FBScreenshot takeInOriginalResolutionWithQuality:FBConfiguration.screenshotQuality
+                                                      rect:elementRect
+                                                     error:error];
 }
 
 @end

package/WebDriverAgentLib/Commands/FBCustomCommands.m

@@ -56,6 +56,7 @@
     [[FBRoute GET:@"/wda/batteryInfo"] respondWithTarget:self action:@selector(handleGetBatteryInfo:)],
 #endif
     [[FBRoute POST:@"/wda/pressButton"] respondWithTarget:self action:@selector(handlePressButtonCommand:)],
+    [[FBRoute POST:@"/wda/performIoHidEvent"] respondWithTarget:self action:@selector(handlePeformIOHIDEvent:)],
     [[FBRoute POST:@"/wda/expectNotification"] respondWithTarget:self action:@selector(handleExpectNotification:)],
     [[FBRoute POST:@"/wda/siri/activate"] respondWithTarget:self action:@selector(handleActivateSiri:)],
     [[FBRoute POST:@"/wda/apps/launchUnattached"].withoutSession respondWithTarget:self action:@selector(handleLaunchUnattachedApp:)],
@@ -257,6 +258,22 @@
   return FBResponseWithOK();
 }
 
++ (id <FBResponsePayload>)handlePeformIOHIDEvent:(FBRouteRequest *)request
+{
+  NSNumber *page = request.arguments[@"page"];
+  NSNumber *usage = request.arguments[@"usage"];
+  NSNumber *duration = request.arguments[@"duration"];
+  NSError *error;
+  if (![XCUIDevice.sharedDevice fb_performIOHIDEventWithPage:page.unsignedIntValue
+                                                       usage:usage.unsignedIntValue
+                                                    duration:duration.doubleValue
+                                                       error:&error]) {
+    return FBResponseWithStatus([FBCommandStatus unknownErrorWithMessage:error.description
+                                                               traceback:nil]);
+  }
+  return FBResponseWithOK();
+}
+
 + (id <FBResponsePayload>)handleLaunchUnattachedApp:(FBRouteRequest *)request
 {
   NSString *bundle = (NSString *)request.arguments[@"bundleId"];

package/WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -97,6 +97,16 @@
   if (requirements[@"shouldUseSingletonTestManager"]) {
     [FBConfiguration setShouldUseSingletonTestManager:[requirements[@"shouldUseSingletonTestManager"] boolValue]];
   }
+  if (requirements[@"disableAutomaticScreenshots"]) {
+    if ([requirements[@"disableAutomaticScreenshots"] boolValue]) {
+      [FBConfiguration disableScreenshots];
+    } else {
+      [FBConfiguration enableScreenshots];
+    }
+  }
+  if (requirements[@"shouldTerminateApp"]) {
+    [FBConfiguration setShouldTerminateApp:[requirements[@"shouldTerminateApp"] boolValue]];
+  }
   NSNumber *delay = requirements[@"eventloopIdleDelaySec"];
   if ([delay doubleValue] > 0.0) {
     [XCUIApplicationProcessDelay setEventLoopHasIdledDelay:[delay doubleValue]];

package/WebDriverAgentLib/Routing/FBSession.m

@@ -131,7 +131,7 @@ static FBSession *_activeSession = nil;
     self.alertsMonitor = nil;
   }
 
-  if (self.testedApplicationBundleId) {
+  if (self.testedApplicationBundleId && [FBConfiguration shouldTerminateApp]) {
     [[self.applications objectForKey:self.testedApplicationBundleId] terminate];
   }
   _activeSession = nil;

package/WebDriverAgentLib/Utilities/FBConfiguration.h

@@ -30,6 +30,10 @@ extern NSString *const FBSnapshotMaxDepthKey;
 + (void)setShouldUseCompactResponses:(BOOL)value;
 + (BOOL)shouldUseCompactResponses;
 
+/*! If set to YES (which is the default), the app will be terminated at the end of the session, if a bundleId was specified */
++ (void)setShouldTerminateApp:(BOOL)value;
++ (BOOL)shouldTerminateApp;
+
 /*! If shouldUseCompactResponses == NO, is the comma-separated list of fields to return with each element. Defaults to "type,label". */
 + (void)setElementResponseAttributes:(NSString *)value;
 + (NSString *)elementResponseAttributes;
@@ -43,9 +47,12 @@ extern NSString *const FBSnapshotMaxDepthKey;
 /*! Disables attribute key path analysis, which will cause XCTest on Xcode 9.x to ignore some elements */
 + (void)disableAttributeKeyPathAnalysis;
 
-/*! Disables XCTest from automated screenshots taking */
+/*! Disables XCTest automated screenshots taking */
 + (void)disableScreenshots;
 
+/*! Enables XCTest automated screenshots taking */
++ (void)enableScreenshots;
+
 /* The maximum typing frequency for all typing activities */
 + (void)setMaxTypingFrequency:(NSUInteger)value;
 + (NSUInteger)maxTypingFrequency;

package/WebDriverAgentLib/Utilities/FBConfiguration.m

@@ -31,6 +31,7 @@ static NSString *const axSettingsClassName = @"AXSettings";
 static BOOL FBShouldUseTestManagerForVisibilityDetection = NO;
 static BOOL FBShouldUseSingletonTestManager = YES;
 static BOOL FBShouldUseCompactResponses = YES;
+static BOOL FBShouldTerminateApp = YES;
 static NSString *FBElementResponseAttributes = @"type,label";
 static NSUInteger FBMaxTypingFrequency = 60;
 static NSUInteger FBMjpegServerScreenshotQuality = 25;
@@ -89,6 +90,11 @@ static UIInterfaceOrientation FBScreenshotOrientation = UIInterfaceOrientationUn
   [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"DisableScreenshots"];
 }
 
++ (void)enableScreenshots
+{
+  [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"DisableScreenshots"];
+}
+
 + (NSRange)bindingPortRange
 {
   // 'WebDriverAgent --port 8080' can be passed via the arguments to the process
@@ -153,6 +159,16 @@ static UIInterfaceOrientation FBScreenshotOrientation = UIInterfaceOrientationUn
   return FBShouldUseCompactResponses;
 }
 
++ (void)setShouldTerminateApp:(BOOL)value
+{
+  FBShouldTerminateApp = value;
+}
+
++ (BOOL)shouldTerminateApp
+{
+  return FBShouldTerminateApp;
+}
+
 + (void)setElementResponseAttributes:(NSString *)value
 {
   FBElementResponseAttributes = value;

package/WebDriverAgentLib/Utilities/FBImageIOScaler.h

@@ -42,7 +42,9 @@ extern const CGFloat FBMaxCompressionQuality;
 
  @param image The source image data
  @param uti Either kUTTypePNG or kUTTypeJPEG
- @param rect The cropping rectangle. Could be CGRectNull to avoid cropping
+ @param rect The cropping rectange for the screenshot. The value is expected to be non-scaled one
+            since it happens after scaling/orientation change.
+            CGRectNull could be used to take a screenshot of the full screen.
  @param scalingFactor Scaling factor in range 0.01..1.0. A value of 1.0 won't perform scaling at all
  @param compressionQuality the compression quality in range 0.0..1.0 (0.0 for max. compression and 1.0 for lossless compression).
  Only works if UTI is set to kUTTypeJPEG

package/WebDriverAgentLib/Utilities/FBScreenshot.h

@@ -19,26 +19,27 @@ NS_ASSUME_NONNULL_BEGIN
 + (BOOL)isNewScreenshotAPISupported;
 
 /**
- Retrieves scaled screenshot of the whole screen
+ Retrieves non-scaled screenshot of the whole screen
 
  @param quality The number in range 0-2, where 2 (JPG) is the lowest and 0 (PNG) is the highest quality.
  @param error If there is an error, upon return contains an NSError object that describes the problem.
  @return Device screenshot as PNG- or JPG-encoded data or nil in case of failure
  */
-+ (nullable NSData *)takeWithQuality:(NSUInteger)quality
-                               error:(NSError **)error;
++ (nullable NSData *)takeInOriginalResolutionWithQuality:(NSUInteger)quality
+                                                   error:(NSError **)error;
 
 /**
- Retrieves scaled screenshot of the particular screen rectangle
+ Retrieves non-scaled screenshot of the particular screen rectangle
 
  @param quality The number in range 0-2, where 2 (JPG) is the lowest and 0 (PNG) is the highest quality.
- @param rect The bounding rectange for the screenshot. CGRectNull could be used to take a screenshot of the full screen
+ @param rect The bounding rectange for the screenshot. The value is expected be non-scaled one.
+             CGRectNull could be used to take a screenshot of the full screen.
  @param error If there is an error, upon return contains an NSError object that describes the problem.
  @return Device screenshot as PNG- or JPG-encoded data or nil in case of failure
  */
-+ (nullable NSData *)takeWithQuality:(NSUInteger)quality
-                                rect:(CGRect)rect
-                               error:(NSError **)error;
++ (nullable NSData *)takeInOriginalResolutionWithQuality:(NSUInteger)quality
+                                                    rect:(CGRect)rect
+                                                   error:(NSError **)error;
 
 /**
  Retrieves non-scaled screenshot of the whole screen

package/WebDriverAgentLib/Utilities/FBScreenshot.m

@@ -21,6 +21,7 @@
 #import "XCUIScreen.h"
 
 static const NSTimeInterval SCREENSHOT_TIMEOUT = 20.;
+static const CGFloat SCREENSHOT_SCALE = 1.0;  // Screenshot API should keep the original screen scale
 static const CGFloat HIGH_QUALITY = 0.8;
 static const CGFloat LOW_QUALITY = 0.25;
 
@@ -64,14 +65,14 @@ NSString *formatTimeInterval(NSTimeInterval interval) {
   }
 }
 
-+ (NSData *)takeWithQuality:(NSUInteger)quality
-                       rect:(CGRect)rect
-                      error:(NSError **)error
++ (NSData *)takeInOriginalResolutionWithQuality:(NSUInteger)quality
+                                           rect:(CGRect)rect
+                                          error:(NSError **)error
 {
   if ([self.class isNewScreenshotAPISupported]) {
     XCUIScreen *mainScreen = XCUIScreen.mainScreen;
     return [self.class takeWithScreenID:mainScreen.displayID
-                                  scale:mainScreen.scale
+                                  scale:SCREENSHOT_SCALE
                      compressionQuality:[self.class compressionQualityWithQuality:FBConfiguration.screenshotQuality]
                                    rect:rect
                               sourceUTI:[self.class imageUtiWithQuality:FBConfiguration.screenshotQuality]
@@ -84,13 +85,13 @@ NSString *formatTimeInterval(NSTimeInterval interval) {
   return nil;
 }
 
-+ (NSData *)takeWithQuality:(NSUInteger)quality
-                      error:(NSError **)error
++ (NSData *)takeInOriginalResolutionWithQuality:(NSUInteger)quality
+                                          error:(NSError **)error
 {
   if ([self.class isNewScreenshotAPISupported]) {
     XCUIScreen *mainScreen = XCUIScreen.mainScreen;
     return [self.class takeWithScreenID:mainScreen.displayID
-                                  scale:mainScreen.scale
+                                  scale:SCREENSHOT_SCALE
                      compressionQuality:[self.class compressionQualityWithQuality:FBConfiguration.screenshotQuality]
                                    rect:CGRectNull
                               sourceUTI:[self.class imageUtiWithQuality:FBConfiguration.screenshotQuality]

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -58,6 +58,10 @@
 
 @end
 
+@interface FBAccessibleAttribute : FBElementAttribute
+
+@end
+
 @interface FBDimensionAttribute : FBElementAttribute
 
 @end
@@ -460,6 +464,7 @@ static NSString *const FBAbstractMethodInvocationException = @"AbstractMethodInv
            FBLabelAttribute.class,
            FBEnabledAttribute.class,
            FBVisibleAttribute.class,
+           FBAccessibleAttribute.class,
 #if TARGET_OS_TV
            FBFocusedAttribute.class,
 #endif
@@ -563,6 +568,20 @@ static NSString *const FBAbstractMethodInvocationException = @"AbstractMethodInv
 
 @end
 
+@implementation FBAccessibleAttribute
+
++ (NSString *)name
+{
+  return @"accessible";
+}
+
++ (NSString *)valueForElement:(id<FBElement>)element
+{
+  return element.wdAccessible ? @"true" : @"false";
+}
+
+@end
+
 #if TARGET_OS_TV
 
 @implementation FBFocusedAttribute

package/WebDriverAgentRunner/UITestingUITests.m

@@ -25,7 +25,11 @@
   [FBDebugLogDelegateDecorator decorateXCTestLogger];
   [FBConfiguration disableRemoteQueryEvaluation];
   [FBConfiguration configureDefaultKeyboardPreferences];
-  [FBConfiguration disableScreenshots];
+  if (NSProcessInfo.processInfo.environment[@"ENABLE_AUTOMATIC_SCREENSHOTS"]) {
+    [FBConfiguration enableScreenshots];
+  } else {
+    [FBConfiguration disableScreenshots];
+  }
   [super setUp];
 }
 

package/WebDriverAgentTests/IntegrationTests/FBElementScreenshotTests.m

@@ -12,6 +12,7 @@
 #import "FBIntegrationTestCase.h"
 #import "XCUIDevice+FBRotation.h"
 #import "XCUIElement+FBUtilities.h"
+#import "XCUIScreen.h"
 
 @interface FBElementScreenshotTests : FBIntegrationTestCase
 @end
@@ -48,6 +49,15 @@
   UIImage *image = [UIImage imageWithData:screenshotData];
   XCTAssertNotNil(image);
   XCTAssertTrue(image.size.width > image.size.height);
+
+  XCUIScreen *mainScreen = XCUIScreen.mainScreen;
+  UIImage *buttonScreenshot = button.screenshot.image;
+  XCTAssertEqualWithAccuracy(buttonScreenshot.size.height * mainScreen.scale,
+                             image.size.height,
+                             FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(buttonScreenshot.size.width * mainScreen.scale,
+                             image.size.width,
+                             FLT_EPSILON);
 }
 
 @end

package/WebDriverAgentTests/IntegrationTests/FBXPathIntegrationTests.m

@@ -54,7 +54,7 @@
   XCElementSnapshot *snapshot = self.destinationSnapshot;
   NSString *xmlStr = [FBXPath xmlStringWithRootElement:snapshot excludingAttributes:nil];
   XCTAssertNotNil(xmlStr);
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\"/>\n", snapshot.wdType, snapshot.wdType, snapshot.wdName, snapshot.wdLabel, snapshot.wdEnabled ? @"true" : @"false", snapshot.wdVisible ? @"true" : @"false", [snapshot.wdRect[@"x"] stringValue], [snapshot.wdRect[@"y"] stringValue], [snapshot.wdRect[@"width"] stringValue], [snapshot.wdRect[@"height"] stringValue], snapshot.wdIndex];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\"/>\n", snapshot.wdType, snapshot.wdType, snapshot.wdName, snapshot.wdLabel, snapshot.wdEnabled ? @"true" : @"false", snapshot.wdVisible ? @"true" : @"false", snapshot.wdAccessible ? @"true" : @"false", [snapshot.wdRect[@"x"] stringValue], [snapshot.wdRect[@"y"] stringValue], [snapshot.wdRect[@"width"] stringValue], [snapshot.wdRect[@"height"] stringValue], snapshot.wdIndex];
   XCTAssertEqualObjects(xmlStr, expectedXml);
 }
 
@@ -63,7 +63,7 @@
   XCElementSnapshot *snapshot = self.destinationSnapshot;
   NSString *xmlStr = [FBXPath xmlStringWithRootElement:snapshot excludingAttributes:@[@"visible", @"enabled", @"index", @"blabla"]];
   XCTAssertNotNil(xmlStr);
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" name=\"%@\" label=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\"/>\n", snapshot.wdType, snapshot.wdType, snapshot.wdName, snapshot.wdLabel, [snapshot.wdRect[@"x"] stringValue], [snapshot.wdRect[@"y"] stringValue], [snapshot.wdRect[@"width"] stringValue], [snapshot.wdRect[@"height"] stringValue]];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" name=\"%@\" label=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\"/>\n", snapshot.wdType, snapshot.wdType, snapshot.wdName, snapshot.wdLabel, snapshot.wdAccessible ? @"true" : @"false", [snapshot.wdRect[@"x"] stringValue], [snapshot.wdRect[@"y"] stringValue], [snapshot.wdRect[@"width"] stringValue], [snapshot.wdRect[@"height"] stringValue]];
   XCTAssertEqualObjects(xmlStr, expectedXml);
 }
 

package/WebDriverAgentTests/IntegrationTests/XCUIDeviceHelperTests.m

@@ -16,6 +16,7 @@
 #import "FBTestMacros.h"
 #import "XCUIDevice+FBHelpers.h"
 #import "XCUIDevice+FBRotation.h"
+#import "XCUIScreen.h"
 
 @interface XCUIDeviceHelperTests : FBIntegrationTestCase
 @end
@@ -33,11 +34,24 @@
 
 - (void)testScreenshot
 {
+  [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:UIDeviceOrientationPortrait];
   NSError *error = nil;
   NSData *screenshotData = [[XCUIDevice sharedDevice] fb_screenshotWithError:&error];
-  XCTAssertNotNil([UIImage imageWithData:screenshotData]);
+  XCTAssertNotNil(screenshotData);
   XCTAssertNil(error);
   XCTAssertTrue(FBIsPngImage(screenshotData));
+
+  UIImage *screenshot = [UIImage imageWithData:screenshotData];
+  XCTAssertNotNil(screenshot);
+
+  XCUIScreen *mainScreen = XCUIScreen.mainScreen;
+  UIImage *screenshotExact = ((XCUIScreenshot *)mainScreen.screenshot).image;
+  XCTAssertEqualWithAccuracy(screenshotExact.size.height * mainScreen.scale,
+                             screenshot.size.height,
+                             FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(screenshotExact.size.width * mainScreen.scale,
+                             screenshot.size.width,
+                             FLT_EPSILON);
 }
 
 - (void)testLandscapeScreenshot
@@ -48,9 +62,19 @@
   XCTAssertNotNil(screenshotData);
   XCTAssertTrue(FBIsPngImage(screenshotData));
   XCTAssertNil(error);
-  UIImage *image = [UIImage imageWithData:screenshotData];
-  XCTAssertNotNil(image);
-  XCTAssertTrue(image.size.width > image.size.height);
+
+  UIImage *screenshot = [UIImage imageWithData:screenshotData];
+  XCTAssertNotNil(screenshot);
+  XCTAssertTrue(screenshot.size.width > screenshot.size.height);
+
+  XCUIScreen *mainScreen = XCUIScreen.mainScreen;
+  UIImage *screenshotExact = ((XCUIScreenshot *)mainScreen.screenshot).image;
+  XCTAssertEqualWithAccuracy(screenshotExact.size.height * mainScreen.scale,
+                             screenshot.size.height,
+                             FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(screenshotExact.size.width * mainScreen.scale,
+                             screenshot.size.width,
+                             FLT_EPSILON);
 }
 
 - (void)testWifiAddress
@@ -106,4 +130,16 @@
   XCTAssertNil(error);
 }
 
+- (void)testLongPressHomeButton
+{
+  NSError *error;
+  // kHIDPage_Consumer = 0x0C
+  // kHIDUsage_Csmr_Menu = 0x40
+  XCTAssertTrue([XCUIDevice.sharedDevice fb_performIOHIDEventWithPage:0x0C
+                                                                usage:0x40
+                                                             duration:1.0
+                                                                error:&error]);
+  XCTAssertNil(error);
+}
+
 @end

package/WebDriverAgentTests/UnitTests/FBXPathTests.m

@@ -51,8 +51,8 @@
   NSString *resultXml = [self xmlStringWithElement:element
                                         xpathQuery:nil
                                excludingAttributes:nil];
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" value=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\" private_indexPath=\"top\"/>\n",
-                           element.wdType, element.wdType, element.wdValue, element.wdName, element.wdLabel, element.wdEnabled ? @"true" : @"false", element.wdVisible ? @"true" : @"false", element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" value=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\" private_indexPath=\"top\"/>\n",
+                           element.wdType, element.wdType, element.wdValue, element.wdName, element.wdLabel, element.wdEnabled ? @"true" : @"false", element.wdVisible ? @"true" : @"false", element.wdAccessible ? @"true" : @"false", element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex];
   XCTAssertTrue([resultXml isEqualToString: expectedXml]);
 }
 
@@ -62,8 +62,8 @@
   NSString *resultXml = [self xmlStringWithElement:element
                                         xpathQuery:nil
                                excludingAttributes:@[@"type", @"visible", @"value", @"index"]];
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ name=\"%@\" label=\"%@\" enabled=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" private_indexPath=\"top\"/>\n",
-                           element.wdType, element.wdName, element.wdLabel,  element.wdEnabled ? @"true" : @"false", element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"]];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ name=\"%@\" label=\"%@\" enabled=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" private_indexPath=\"top\"/>\n",
+                           element.wdType, element.wdName, element.wdLabel,  element.wdEnabled ? @"true" : @"false", element.wdAccessible ? @"true" : @"false", element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"]];
   XCTAssertEqualObjects(resultXml, expectedXml);
 }
 
@@ -73,8 +73,8 @@
   NSString *resultXml = [self xmlStringWithElement:element
                                         xpathQuery:[NSString stringWithFormat:@"//%@[@*]", element.wdType]
                                excludingAttributes:@[@"visible"]];
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" value=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\" private_indexPath=\"top\"/>\n",
-                           element.wdType, element.wdType, element.wdValue, element.wdName, element.wdLabel,  element.wdEnabled ? @"true" : @"false", element.wdVisible ? @"true" : @"false", element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" value=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\" private_indexPath=\"top\"/>\n",
+                           element.wdType, element.wdType, element.wdValue, element.wdName, element.wdLabel,  element.wdEnabled ? @"true" : @"false", element.wdVisible ? @"true" : @"false", element.wdAccessible ? @"true" : @"false", element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex];
   XCTAssertTrue([resultXml isEqualToString: expectedXml]);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "3.5.0",
+  "version": "3.8.0",
   "description": "Package bundling WebDriverAgent",
   "main": "build/index.js",
   "scripts": {
@@ -54,7 +54,7 @@
     "ios-uicatalog": "^3.5.0",
     "mocha": "^8.0.1",
     "pre-commit": "^1.2.2",
-    "sinon": "^9.0.2",
+    "sinon": "^10.0.0",
     "wd": "^1.11.4"
   },
   "dependencies": {