appium-webdriveragent 4.4.3 → 4.6.0

package/PrivateHeaders/XCTest/XCUICoordinate.h

@@ -31,6 +31,8 @@
 - (void)pressForDuration:(double)arg1;
 - (void)doubleTap;
 - (void)tap;
+- (void)pressWithPressure:(double)arg1 duration:(double)arg2;
+- (void)forcePress;
 
 @end
 #endif

package/PrivateHeaders/XCTest/XCUIDevice.h

@@ -24,5 +24,7 @@
 - (void)pressLockButton;
 - (void)holdHomeButtonForDuration:(double)arg1;
 - (void)_silentPressButton:(long long)arg1;
+// Since Xcode 11
+- (_Bool)supportsPressureInteraction;
 
 @end

package/PrivateHeaders/XCTest/XCUIElement.h

@@ -43,6 +43,8 @@
 - (id)_highestNonWindowAncestorOfElement:(id)arg1 notSharedWithElement:(id)arg2;
 - (id)_pointsInFrame:(CGRect)arg1 numberOfTouches:(unsigned long long)arg2;
 - (CGPoint)_hitPointByAttemptingToScrollToVisibleSnapshot:(id)arg1;
+// Since 11.3
+- (void)pressWithPressure:(double)arg1 duration:(double)arg2;
 - (void)forcePress;
 - (void)tapWithNumberOfTaps:(unsigned long long)arg1 numberOfTouches:(unsigned long long)arg2;
 - (void)twoFingerTap;

package/README.md

@@ -51,3 +51,4 @@ projects has been integrated directly in the WebDriverAgent source tree.
 You can find the source files and their licenses in the `WebDriverAgentLib/Vendor` directory.
 
 Have fun!
+

package/Scripts/build-webdriveragent.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const os = require('os');
 const { asyncify } = require('asyncbox');
-const { logger, fs, mkdirp, zip } = require('@appium/support');
+const { logger, fs, mkdirp, zip } = require('appium/support');
 const { exec } = require('teen_process');
 const xcode = require('appium-xcode');
 

package/Scripts/fetch-prebuilt-wda.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const axios = require('axios');
 const { asyncify } = require('asyncbox');
-const { logger, fs, mkdirp, net } = require('@appium/support');
+const { logger, fs, mkdirp, net } = require('appium/support');
 const _ = require('lodash');
 const B = require('bluebird');
 

package/WebDriverAgent.xcodeproj/xcuserdata/elf.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "2F0174F2-ED3F-4D11-9A17-7C590053D796"
+   type = "1"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            uuid = "471ECA8C-2C53-4C59-88DB-1C1CB3D61601"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            breakpointStackSelectionBehavior = "1"
+            scope = "1"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C2E06865-6A52-4686-9771-279AF13ABF8A"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m"
+            timestampString = "0"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "264"
+            endingLineNumber = "264">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "54216FE6-E240-47F1-88D3-D450CF0AF44E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "WebDriverAgentLib/Categories/XCUIElement+FBResolve.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "37"
+            endingLineNumber = "37"
+            landmarkName = "-fb_stableInstance"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "54216FE6-E240-47F1-88D3-D450CF0AF44E - b09f4ce1ce926e6"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[XCUIElement(FBResolve) fb_stableInstance]"
+                  moduleName = "WebDriverAgentLib"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/elf/code/WebDriverAgent/WebDriverAgentLib/Categories/XCUIElement+FBResolve.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "37"
+                  endingLineNumber = "37"
+                  offsetFromSymbolStart = "19">
+               </Location>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  usesParentBreakpointCondition = "Yes"
+                  offsetFromSymbolStart = "0">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D3009B57-42BC-4905-99BC-70232544FAFB"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "WebDriverAgentTests/IntegrationTests/FBAlertTests.m"
+            startingColumnNumber = "5"
+            endingColumnNumber = "64"
+            startingLineNumber = "32"
+            endingLineNumber = "32"
+            landmarkName = "-setUp"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>

package/WebDriverAgent.xcodeproj/xcuserdata/elf.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>IntegrationApp.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>IntegrationTests_1.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>IntegrationTests_2.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>IntegrationTests_3.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>WebDriverAgentLib copy.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>9</integer>
+		</dict>
+		<key>WebDriverAgentLib.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>4</integer>
+		</dict>
+		<key>WebDriverAgentLib_tvOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
+		<key>WebDriverAgentRunner-nodebug.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>7</integer>
+		</dict>
+		<key>WebDriverAgentRunner.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>6</integer>
+		</dict>
+		<key>WebDriverAgentRunner_tvOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>8</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.h

@@ -11,29 +11,29 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface XCUIElement (FBForceTouch)
+#if !TARGET_OS_TV
 
-/**
- Waits for element to become stable (not move) and performs sync force touch on element
- 
- @param error If there is an error, upon return contains an NSError object that describes the problem.
- @param pressure The pressure of the force touch – valid values are [0, touch.maximumPossibleForce]
- @param duration The duration of the gesture in float seconds
- @return YES if the operation succeeds, otherwise NO.
- */
-- (BOOL)fb_forceTouchWithPressure:(double)pressure duration:(double)duration error:(NSError **)error;
+@interface XCUIElement (FBForceTouch)
 
 /**
- Waits for element to become stable (not move) and performs sync force touch on element
+ Performs force touch on element
  
- @param relativeCoordinate hit point coordinate relative to the current element position
+ @param relativeCoordinate hit point coordinate relative to the current element position.
+ nil value means to use the default element hit point
  @param pressure The pressure of the force touch – valid values are [0, touch.maximumPossibleForce]
+ nil value would use the default pressure value
  @param duration The duration of the gesture in float seconds
+ nil value would use the default duration value
  @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_forceTouchCoordinate:(CGPoint)relativeCoordinate pressure:(double)pressure duration:(double)duration error:(NSError **)error;
+- (BOOL)fb_forceTouchCoordinate:(nullable NSValue *)relativeCoordinate
+                       pressure:(nullable NSNumber *)pressure
+                       duration:(nullable NSNumber *)duration
+                          error:(NSError **)error;
 
 @end
 
+#endif
+
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCUIElement+FBForceTouch.m

@@ -9,56 +9,45 @@
 
 #import "XCUIElement+FBForceTouch.h"
 
-#import "XCUIApplication+FBTouchAction.h"
+#if !TARGET_OS_TV
+
+#import "FBErrorBuilder.h"
+#import "XCUICoordinate.h"
+#import "XCUIDevice.h"
 
 @implementation XCUIElement (FBForceTouch)
 
-- (BOOL)fb_forceTouchWithPressure:(double)pressure duration:(double)duration error:(NSError **)error
+- (BOOL)fb_forceTouchCoordinate:(NSValue *)relativeCoordinate
+                       pressure:(NSNumber *)pressure
+                       duration:(NSNumber *)duration
+                          error:(NSError **)error
 {
-  NSArray<NSDictionary<NSString *, id> *> *gesture =
-  @[@{
-      @"action": @"press",
-      @"options": @{
-          @"element": self,
-          @"pressure": @(pressure)
-          }
-      },
-    @{
-      @"action": @"wait",
-      @"options": @{
-          @"ms": @(duration * 1000)
-          }
-      },
-    @{
-      @"action": @"release"
-      }
-    ];
-  return [self.application fb_performAppiumTouchActions:gesture elementCache:nil error:error];
-}
+  if (![XCUIDevice sharedDevice].supportsPressureInteraction) {
+    return [[[FBErrorBuilder builder]
+             withDescriptionFormat:@"Force press is not supported on this device"]
+            buildError:error];
+  }
 
-- (BOOL)fb_forceTouchCoordinate:(CGPoint)relativeCoordinate pressure:(double)pressure duration:(double)duration error:(NSError **)error
-{
-  NSArray<NSDictionary<NSString *, id> *> *gesture =
-  @[@{
-      @"action": @"press",
-      @"options": @{
-          @"element": self,
-          @"x": @(relativeCoordinate.x),
-          @"y": @(relativeCoordinate.y),
-          @"pressure": @(pressure)
-          }
-      },
-    @{
-      @"action": @"wait",
-      @"options": @{
-          @"ms": @(duration * 1000)
-          }
-      },
-    @{
-      @"action": @"release"
-      }
-    ];
-  return [self.application fb_performAppiumTouchActions:gesture elementCache:nil error:error];
+  if (nil == relativeCoordinate) {
+    if (nil == pressure || nil == duration) {
+      [self forcePress];
+    } else {
+      [self pressWithPressure:[pressure doubleValue] duration:[duration doubleValue]];
+    }
+  } else {
+    CGSize size = self.frame.size;
+    CGVector offset = CGVectorMake(size.width > 0 ? relativeCoordinate.CGPointValue.x / size.width : 0,
+                                   size.height > 0 ? relativeCoordinate.CGPointValue.y / size.height : 0);
+    XCUICoordinate *hitPoint = [self coordinateWithNormalizedOffset:offset];
+    if (nil == pressure || nil == duration) {
+      [hitPoint forcePress];
+    } else {
+      [hitPoint pressWithPressure:[pressure doubleValue] duration:[duration doubleValue]];
+    }
+  }
+  return YES;
 }
 
 @end
+
+#endif

package/WebDriverAgentLib/Commands/FBElementCommands.m

@@ -85,14 +85,15 @@
     [[FBRoute POST:@"/wda/element/:uuid/touchAndHold"] respondWithTarget:self action:@selector(handleTouchAndHold:)],
     [[FBRoute POST:@"/wda/element/:uuid/scroll"] respondWithTarget:self action:@selector(handleScroll:)],
     [[FBRoute POST:@"/wda/element/:uuid/dragfromtoforduration"] respondWithTarget:self action:@selector(handleDrag:)],
+    [[FBRoute POST:@"/wda/element/:uuid/forceTouch"] respondWithTarget:self action:@selector(handleForceTouch:)],
     [[FBRoute POST:@"/wda/dragfromtoforduration"] respondWithTarget:self action:@selector(handleDragCoordinate:)],
     [[FBRoute POST:@"/wda/tap/:uuid"] respondWithTarget:self action:@selector(handleTap:)],
     [[FBRoute POST:@"/wda/touchAndHold"] respondWithTarget:self action:@selector(handleTouchAndHoldCoordinate:)],
     [[FBRoute POST:@"/wda/doubleTap"] respondWithTarget:self action:@selector(handleDoubleTapCoordinate:)],
     [[FBRoute POST:@"/wda/pickerwheel/:uuid/select"] respondWithTarget:self action:@selector(handleWheelSelect:)],
+    [[FBRoute POST:@"/wda/forceTouch"] respondWithTarget:self action:@selector(handleForceTouch:)],
 #endif
     [[FBRoute POST:@"/wda/keys"] respondWithTarget:self action:@selector(handleKeys:)],
-    [[FBRoute POST:@"/wda/element/:uuid/forceTouch"] respondWithTarget:self action:@selector(handleForceTouch:)],
   ];
 }
 
@@ -291,7 +292,8 @@
 + (id<FBResponsePayload>)handleDoubleTapCoordinate:(FBRouteRequest *)request
 {
   CGPoint doubleTapPoint = CGPointMake((CGFloat)[request.arguments[@"x"] doubleValue], (CGFloat)[request.arguments[@"y"] doubleValue]);
-  XCUICoordinate *doubleTapCoordinate = [self.class gestureCoordinateWithCoordinate:doubleTapPoint application:request.session.activeApplication shouldApplyOrientationWorkaround:isSDKVersionLessThan(@"11.0")];
+  XCUICoordinate *doubleTapCoordinate = [self.class gestureCoordinateWithCoordinate:doubleTapPoint
+                                                                        application:request.session.activeApplication];
   [doubleTapCoordinate doubleTap];
   return FBResponseWithOK();
 }
@@ -328,7 +330,8 @@
 + (id<FBResponsePayload>)handleTouchAndHoldCoordinate:(FBRouteRequest *)request
 {
   CGPoint touchPoint = CGPointMake((CGFloat)[request.arguments[@"x"] doubleValue], (CGFloat)[request.arguments[@"y"] doubleValue]);
-  XCUICoordinate *pressCoordinate = [self.class gestureCoordinateWithCoordinate:touchPoint application:request.session.activeApplication shouldApplyOrientationWorkaround:isSDKVersionLessThan(@"11.0")];
+  XCUICoordinate *pressCoordinate = [self.class gestureCoordinateWithCoordinate:touchPoint
+                                                                    application:request.session.activeApplication];
   [pressCoordinate pressForDuration:[request.arguments[@"duration"] doubleValue]];
   return FBResponseWithOK();
 }
@@ -386,8 +389,10 @@
   CGPoint startPoint = CGPointMake((CGFloat)[request.arguments[@"fromX"] doubleValue], (CGFloat)[request.arguments[@"fromY"] doubleValue]);
   CGPoint endPoint = CGPointMake((CGFloat)[request.arguments[@"toX"] doubleValue], (CGFloat)[request.arguments[@"toY"] doubleValue]);
   NSTimeInterval duration = [request.arguments[@"duration"] doubleValue];
-  XCUICoordinate *endCoordinate = [self.class gestureCoordinateWithCoordinate:endPoint application:session.activeApplication shouldApplyOrientationWorkaround:isSDKVersionLessThan(@"11.0")];
-  XCUICoordinate *startCoordinate = [self.class gestureCoordinateWithCoordinate:startPoint application:session.activeApplication shouldApplyOrientationWorkaround:isSDKVersionLessThan(@"11.0")];
+  XCUICoordinate *endCoordinate = [self.class gestureCoordinateWithCoordinate:endPoint
+                                                                  application:session.activeApplication];
+  XCUICoordinate *startCoordinate = [self.class gestureCoordinateWithCoordinate:startPoint
+                                                                    application:session.activeApplication];
   [startCoordinate pressForDuration:duration thenDragToCoordinate:endCoordinate];
   return FBResponseWithOK();
 }
@@ -401,9 +406,10 @@
   CGPoint startPoint = CGPointMake((CGFloat)(frame.origin.x + [request.arguments[@"fromX"] doubleValue]), (CGFloat)(frame.origin.y + [request.arguments[@"fromY"] doubleValue]));
   CGPoint endPoint = CGPointMake((CGFloat)(frame.origin.x + [request.arguments[@"toX"] doubleValue]), (CGFloat)(frame.origin.y + [request.arguments[@"toY"] doubleValue]));
   NSTimeInterval duration = [request.arguments[@"duration"] doubleValue];
-  BOOL shouldApplyOrientationWorkaround = isSDKVersionGreaterThanOrEqualTo(@"10.0") && isSDKVersionLessThan(@"11.0");
-  XCUICoordinate *endCoordinate = [self.class gestureCoordinateWithCoordinate:endPoint application:session.activeApplication shouldApplyOrientationWorkaround:shouldApplyOrientationWorkaround];
-  XCUICoordinate *startCoordinate = [self.class gestureCoordinateWithCoordinate:startPoint application:session.activeApplication shouldApplyOrientationWorkaround:shouldApplyOrientationWorkaround];
+  XCUICoordinate *endCoordinate = [self.class gestureCoordinateWithCoordinate:endPoint
+                                                                  application:session.activeApplication];
+  XCUICoordinate *startCoordinate = [self.class gestureCoordinateWithCoordinate:startPoint
+                                                                    application:session.activeApplication];
   [startCoordinate pressForDuration:duration thenDragToCoordinate:endCoordinate];
   return FBResponseWithOK();
 }
@@ -439,8 +445,7 @@
     }
   } else {
     XCUICoordinate *tapCoordinate = [self.class gestureCoordinateWithCoordinate:tapPoint
-                                                                    application:request.session.activeApplication
-                                               shouldApplyOrientationWorkaround:isSDKVersionLessThan(@"11.0")];
+                                                                    application:request.session.activeApplication];
     [tapCoordinate tap];
   }
   return FBResponseWithOK();
@@ -465,27 +470,34 @@
   [element rotate:rotation withVelocity:velocity];
   return FBResponseWithOK();
 }
-#endif
 
 + (id<FBResponsePayload>)handleForceTouch:(FBRouteRequest *)request
 {
-  FBElementCache *elementCache = request.session.elementCache;
-  XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  double pressure = [request.arguments[@"pressure"] doubleValue];
-  double duration = [request.arguments[@"duration"] doubleValue];
-  NSError *error;
-  if (nil != request.arguments[@"x"] && nil != request.arguments[@"y"]) {
-    CGPoint forceTouchPoint = CGPointMake((CGFloat)[request.arguments[@"x"] doubleValue], (CGFloat)[request.arguments[@"y"] doubleValue]);
-    if (![element fb_forceTouchCoordinate:forceTouchPoint pressure:pressure duration:duration error:&error]) {
-      return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description traceback:nil]);
-    }
+  XCUIElement *element = nil;
+  if (nil == request.parameters[@"uuid"]) {
+    element = [FBApplication fb_activeApplication];
   } else {
-    if (![element fb_forceTouchWithPressure:pressure duration:duration error:&error]) {
-      return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description traceback:nil]);
-    }
+    FBElementCache *elementCache = request.session.elementCache;
+    element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
   }
-  return FBResponseWithOK();
+  NSNumber *pressure = request.arguments[@"pressure"];
+  NSNumber *duration = request.arguments[@"duration"];
+  NSNumber *x = request.arguments[@"x"];
+  NSNumber *y = request.arguments[@"y"];
+  NSValue *hitPoint = (nil == x || nil == y)
+    ? nil
+    : [NSValue valueWithCGPoint:CGPointMake((CGFloat)[x doubleValue], (CGFloat)[y doubleValue])];
+  NSError *error;
+  BOOL didSucceed = [element fb_forceTouchCoordinate:hitPoint
+                                            pressure:pressure
+                                            duration:duration
+                                               error:&error];
+  return didSucceed
+    ? FBResponseWithOK()
+    : FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description
+                                                                    traceback:nil]);
 }
+#endif
 
 + (id<FBResponsePayload>)handleKeys:(FBRouteRequest *)request
 {
@@ -574,7 +586,8 @@ static const CGFloat DEFAULT_OFFSET = (CGFloat)0.2;
     return FBResponseWithStatus([FBCommandStatus elementNotVisibleErrorWithMessage:@"Can't scroll to element that does not exist" traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
   }
   if (![element fb_scrollToVisibleWithError:&error]) {
-    return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
+    return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description
+                                                                           traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
   }
   return FBResponseWithOK();
 }
@@ -584,21 +597,12 @@ static const CGFloat DEFAULT_OFFSET = (CGFloat)0.2;
 
  @param coordinate absolute screen coordinates
  @param application the instance of current application under test
- @shouldApplyOrientationWorkaround whether to apply orientation workaround. This is to
- handle XCTest bug where it does not translate screen coordinates for elements if
- screen orientation is different from the default one (which is portrait).
- Different iOS version have different behavior, for example iOS 9.3 returns correct
- coordinates for elements in landscape, but iOS 10.0+ returns inverted coordinates as if
- the current screen orientation would be portrait.
  @return translated gesture coordinates ready to be passed to XCUICoordinate methods
  */
-+ (XCUICoordinate *)gestureCoordinateWithCoordinate:(CGPoint)coordinate application:(XCUIApplication *)application shouldApplyOrientationWorkaround:(BOOL)shouldApplyOrientationWorkaround
++ (XCUICoordinate *)gestureCoordinateWithCoordinate:(CGPoint)coordinate
+                                        application:(XCUIApplication *)application
 {
   CGPoint point = coordinate;
-  if (shouldApplyOrientationWorkaround) {
-    point = FBInvertPointForApplication(coordinate, application.frame.size, application.interfaceOrientation);
-  }
-
   /**
    If SDK >= 11, the tap coordinate based on application is not correct when
    the application orientation is landscape and
@@ -632,10 +636,13 @@ static const CGFloat DEFAULT_OFFSET = (CGFloat)0.2;
  @param element the element in the current application under test
  @return translated gesture coordinates ready to be passed to XCUICoordinate methods
  */
-+ (XCUICoordinate *)gestureCoordinateWithCoordinate:(CGPoint)coordinate element:(XCUIElement *)element
++ (XCUICoordinate *)gestureCoordinateWithCoordinate:(CGPoint)coordinate
+                                            element:(XCUIElement *)element
 {
-  XCUICoordinate *appCoordinate = [[XCUICoordinate alloc] initWithElement:element normalizedOffset:CGVectorMake(0, 0)];
-  return [[XCUICoordinate alloc] initWithCoordinate:appCoordinate pointsOffset:CGVectorMake(coordinate.x, coordinate.y)];
+  XCUICoordinate *appCoordinate = [[XCUICoordinate alloc] initWithElement:element
+                                                         normalizedOffset:CGVectorMake(0, 0)];
+  return [[XCUICoordinate alloc] initWithCoordinate:appCoordinate
+                                       pointsOffset:CGVectorMake(coordinate.x, coordinate.y)];
 }
 #endif
 

package/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m

@@ -21,6 +21,7 @@
 #import "FBXCTestDaemonsProxy.h"
 #import "XCElementSnapshot+FBHelpers.h"
 #import "XCUIApplication+FBHelpers.h"
+#import "XCUIDevice.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBUtilities.h"
@@ -218,12 +219,28 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
       return @[];
     }
   }
-  XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition offset:FBMillisToSeconds(self.offset)];
-  if (nil != self.pressure && nil != result.pointerEvents.lastObject) {
-    XCPointerEvent *pointerEvent = (XCPointerEvent *)result.pointerEvents.lastObject;
-    pointerEvent.pressure = self.pressure.doubleValue;
+  if (nil == self.pressure) {
+    XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition
+                                                                          offset:FBMillisToSeconds(self.offset)];
+    return @[result];
   }
-  return @[result];
+
+  if (nil == eventPath) {
+    NSString *description = [NSString stringWithFormat:@"'%@' action with pressure must be preceeded with at least one '%@' action without this option", self.class.actionName, self.class.actionName];
+    if (error) {
+      *error = [[FBErrorBuilder.builder withDescription:description] build];
+    }
+    return nil;
+  }
+  if (![XCUIDevice sharedDevice].supportsPressureInteraction) {
+    if (error) {
+      *error = [[FBErrorBuilder.builder withDescription:@"This device does not support force press interactions"] build];
+    }
+    return nil;
+  }
+  [eventPath pressDownWithPressure:self.pressure.doubleValue
+                          atOffset:FBMillisToSeconds(self.offset)];
+  return @[];
 }
 
 @end

package/WebDriverAgentTests/IntegrationTests/FBAppiumTouchActionsIntegrationTests.m

@@ -214,6 +214,7 @@
   [self verifyGesture:gesture orientation:UIDeviceOrientationLandscapeLeft];
 }
 
+// TODO: UIDeviceOrientationLandscapeRight is not so good in iOS 16? (Especially simulators)
 - (void)testPress
 {
   if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
@@ -284,35 +285,6 @@
   [self verifyGesture:gesture orientation:orientation];
 }
 
-- (void)testForcePress
-{
-  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
-    // Does not work on iOS 15.
-    return;
-  }
-  NSArray<NSDictionary<NSString *, id> *> *gesture =
-  @[@{
-      @"action": @"press",
-      @"options": @{
-          @"ELEMENT": self.testedApplication.buttons[FBShowAlertForceTouchButtonName],
-          @"x": @1,
-          @"y": @1,
-          @"pressure": @1
-          }
-      },
-    @{
-      @"action": @"wait",
-      @"options": @{
-          @"ms": @300
-          }
-      },
-    @{
-      @"action": @"release"
-      }
-    ];
-  [self verifyGesture:gesture orientation:UIDeviceOrientationPortrait];
-}
-
 @end
 
 

package/WebDriverAgentTests/IntegrationTests/FBElementScreenshotTests.m

@@ -9,6 +9,7 @@
 
 #import <XCTest/XCTest.h>
 
+#import "FBMacros.h"
 #import "FBIntegrationTestCase.h"
 #import "XCUIDevice+FBRotation.h"
 #import "XCUIElement+FBUtilities.h"
@@ -41,27 +42,11 @@
   XCUIElement *button = self.testedApplication.buttons[FBShowAlertButtonName];
   NSError *error = nil;
   NSData *screenshotData = [button fb_screenshotWithError:&error];
-  if (nil == screenshotData && [error.description containsString:@"available since Xcode9"]) {
-    return;
-  }
   XCTAssertNotNil(screenshotData);
   XCTAssertNil(error);
   UIImage *image = [UIImage imageWithData:screenshotData];
   XCTAssertNotNil(image);
   XCTAssertTrue(image.size.width > image.size.height);
-
-  XCUIScreen *mainScreen = XCUIScreen.mainScreen;
-  // Note about iPadOS 15.0 environment.
-  // The 'button.screenshot.image' (by XCTest) had a white image while 'image' had
-  // expected FBShowAlertButtonName area image by WebDriverAgent.
-  // It seems the native XCTest element screenshot has an issue on iPadOS.
-  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