appium-webdriveragent 5.0.0 → 5.1.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [5.1.0](https://github.com/appium/WebDriverAgent/compare/v5.0.0...v5.1.0) (2023-05-14)
+
+
+### Features
+
+* Add a possibility to provide a target picker value ([#699](https://github.com/appium/WebDriverAgent/issues/699)) ([fc76aee](https://github.com/appium/WebDriverAgent/commit/fc76aeecb087429974b7b52b725173186e6f0246))
+
+
+### Code Refactoring
+
+* Remove obsolete coordinate calculation workarounds needed for older xCode SDKs ([#698](https://github.com/appium/WebDriverAgent/issues/698)) ([025b42c](https://github.com/appium/WebDriverAgent/commit/025b42c8a34ff0beba4379f4cb0c1d79d2b222ed))
+
 ## [5.0.0](https://github.com/appium/WebDriverAgent/compare/v4.15.1...v5.0.0) (2023-05-14)
 
 

package/WebDriverAgent.xcodeproj/project.pbxproj

@@ -86,7 +86,6 @@
 		641EE6042240C5CA00173FCB /* NSString+FBXMLSafeString.m in Sources */ = {isa = PBXBuildFile; fileRef = 716E0BCD1E917E810087A825 /* NSString+FBXMLSafeString.m */; };
 		641EE6052240C5CA00173FCB /* FBUnknownCommands.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7651CAEDF0C008C271F /* FBUnknownCommands.m */; };
 		641EE6062240C5CA00173FCB /* FBOrientationCommands.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB75D1CAEDF0C008C271F /* FBOrientationCommands.m */; };
-		641EE6072240C5CA00173FCB /* XCUICoordinate+FBFix.m in Sources */ = {isa = PBXBuildFile; fileRef = EEC9EED520064FAA00BC0D5B /* XCUICoordinate+FBFix.m */; };
 		641EE6082240C5CA00173FCB /* FBRuntimeUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9AB7921CAEDF0C008C271F /* FBRuntimeUtils.m */; };
 		641EE6092240C5CA00173FCB /* XCUIElement+FBUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = EEE376401D59F81400ED88DD /* XCUIElement+FBUtilities.m */; };
 		641EE60A2240C5CA00173FCB /* FBLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76A41CF7A43900275851 /* FBLogger.m */; };
@@ -160,7 +159,6 @@
 		641EE65B2240C5CA00173FCB /* XCUIElementHitPointCoordinate.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35AD011E3B77D600A02D78 /* XCUIElementHitPointCoordinate.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		641EE65C2240C5CA00173FCB /* XCTDarwinNotificationExpectation.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35ACCE1E3B77D600A02D78 /* XCTDarwinNotificationExpectation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		641EE65D2240C5CA00173FCB /* XCTRunnerAutomationSession.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35ACEE1E3B77D600A02D78 /* XCTRunnerAutomationSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		641EE65E2240C5CA00173FCB /* XCUICoordinate+FBFix.h in Headers */ = {isa = PBXBuildFile; fileRef = EEC9EED420064FAA00BC0D5B /* XCUICoordinate+FBFix.h */; };
 		641EE65F2240C5CA00173FCB /* XCSourceCodeTreeNodeEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = EE35ACC61E3B77D600A02D78 /* XCSourceCodeTreeNodeEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		641EE6602240C5CA00173FCB /* XCUIElement+FBIsVisible.h in Headers */ = {isa = PBXBuildFile; fileRef = EE9AB7471CAEDF0C008C271F /* XCUIElement+FBIsVisible.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		641EE6612240C5CA00173FCB /* XCUIElement+FBTap.h in Headers */ = {isa = PBXBuildFile; fileRef = EE9AB74B1CAEDF0C008C271F /* XCUIElement+FBTap.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -456,7 +454,6 @@
 		71A7EAF91E224648001DA4F2 /* FBClassChainQueryParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A7EAF71E224648001DA4F2 /* FBClassChainQueryParser.h */; };
 		71A7EAFA1E224648001DA4F2 /* FBClassChainQueryParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A7EAF81E224648001DA4F2 /* FBClassChainQueryParser.m */; };
 		71A7EAFC1E229302001DA4F2 /* FBClassChainTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A7EAFB1E229302001DA4F2 /* FBClassChainTests.m */; };
-		71AB82B21FDAE8C000D1D7C3 /* FBElementScreenshotTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AB82B11FDAE8C000D1D7C3 /* FBElementScreenshotTests.m */; };
 		71ACF5B8242F2FDC00F0AAD4 /* FBSafariAlertTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 71ACF5B7242F2FDC00F0AAD4 /* FBSafariAlertTests.m */; };
 		71B155DA23070ECF00646AFB /* FBHTTPStatusCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = 71B155D923070ECF00646AFB /* FBHTTPStatusCodes.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		71B155DC230711E900646AFB /* FBCommandStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B155DB230711E900646AFB /* FBCommandStatus.m */; };
@@ -785,9 +782,6 @@
 		EE9B76AA1CF7A43900275851 /* FBMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = EE9B76A51CF7A43900275851 /* FBMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EEBBD48B1D47746D00656A81 /* XCUIElement+FBFind.h in Headers */ = {isa = PBXBuildFile; fileRef = EEBBD4891D47746D00656A81 /* XCUIElement+FBFind.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EEBBD48C1D47746D00656A81 /* XCUIElement+FBFind.m in Sources */ = {isa = PBXBuildFile; fileRef = EEBBD48A1D47746D00656A81 /* XCUIElement+FBFind.m */; };
-		EEC9EED620064FAA00BC0D5B /* XCUICoordinate+FBFix.h in Headers */ = {isa = PBXBuildFile; fileRef = EEC9EED420064FAA00BC0D5B /* XCUICoordinate+FBFix.h */; };
-		EEC9EED720064FAA00BC0D5B /* XCUICoordinate+FBFix.m in Sources */ = {isa = PBXBuildFile; fileRef = EEC9EED520064FAA00BC0D5B /* XCUICoordinate+FBFix.m */; };
-		EEC9EED920077D8E00BC0D5B /* XCUICoordinateFix.m in Sources */ = {isa = PBXBuildFile; fileRef = EEC9EED820077D8E00BC0D5B /* XCUICoordinateFix.m */; };
 		EEDFE1211D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = EEDFE11F1D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EEDFE1221D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = EEDFE1201D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.m */; };
 		EEE16E971D33A25500172525 /* FBConfigurationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EEE16E961D33A25500172525 /* FBConfigurationTests.m */; };
@@ -1043,7 +1037,6 @@
 		71A7EAF71E224648001DA4F2 /* FBClassChainQueryParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBClassChainQueryParser.h; sourceTree = "<group>"; };
 		71A7EAF81E224648001DA4F2 /* FBClassChainQueryParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBClassChainQueryParser.m; sourceTree = "<group>"; };
 		71A7EAFB1E229302001DA4F2 /* FBClassChainTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBClassChainTests.m; sourceTree = "<group>"; };
-		71AB82B11FDAE8C000D1D7C3 /* FBElementScreenshotTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBElementScreenshotTests.m; sourceTree = "<group>"; };
 		71ACF5B7242F2FDC00F0AAD4 /* FBSafariAlertTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBSafariAlertTests.m; sourceTree = "<group>"; };
 		71B155D923070ECF00646AFB /* FBHTTPStatusCodes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FBHTTPStatusCodes.h; sourceTree = "<group>"; };
 		71B155DB230711E900646AFB /* FBCommandStatus.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBCommandStatus.m; sourceTree = "<group>"; };
@@ -1353,9 +1346,6 @@
 		EEC088E41CB56AC000B65968 /* FBElementCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBElementCache.m; sourceTree = "<group>"; };
 		EEC088E61CB56DA400B65968 /* FBExceptionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBExceptionHandler.h; sourceTree = "<group>"; };
 		EEC088E71CB56DA400B65968 /* FBExceptionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBExceptionHandler.m; sourceTree = "<group>"; };
-		EEC9EED420064FAA00BC0D5B /* XCUICoordinate+FBFix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "XCUICoordinate+FBFix.h"; sourceTree = "<group>"; };
-		EEC9EED520064FAA00BC0D5B /* XCUICoordinate+FBFix.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "XCUICoordinate+FBFix.m"; sourceTree = "<group>"; };
-		EEC9EED820077D8E00BC0D5B /* XCUICoordinateFix.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XCUICoordinateFix.m; sourceTree = "<group>"; };
 		EEDBEBBA1CB2681900A790A2 /* WebDriverAgent.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = WebDriverAgent.bundle; sourceTree = "<group>"; };
 		EEDFE11F1D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCUIDevice+FBHealthCheck.h"; sourceTree = "<group>"; };
 		EEDFE1201D9C06F800E6FFE5 /* XCUIDevice+FBHealthCheck.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCUIDevice+FBHealthCheck.m"; sourceTree = "<group>"; };
@@ -1737,8 +1727,6 @@
 				716C9DFF27315EFF005AD475 /* XCUIApplication+FBUIInterruptions.m */,
 				71D475C02538F5A8008D9401 /* XCUIApplicationProcess+FBQuiescence.h */,
 				71D475C12538F5A8008D9401 /* XCUIApplicationProcess+FBQuiescence.m */,
-				EEC9EED420064FAA00BC0D5B /* XCUICoordinate+FBFix.h */,
-				EEC9EED520064FAA00BC0D5B /* XCUICoordinate+FBFix.m */,
 				719CD8FA2126C88B00C7D0C2 /* XCUIApplication+FBAlert.h */,
 				719CD8FB2126C88B00C7D0C2 /* XCUIApplication+FBAlert.m */,
 				71BD20711F86116100B36EC2 /* XCUIApplication+FBTouchAction.h */,
@@ -1985,7 +1973,6 @@
 				719A97AB1F88E7370063B4BD /* FBAppiumMultiTouchActionsIntegrationTests.m */,
 				719CD8FE2126C90200C7D0C2 /* FBAutoAlertsHandlerTests.m */,
 				EE26409C1D0EBA25009BE6B0 /* FBElementAttributeTests.m */,
-				71AB82B11FDAE8C000D1D7C3 /* FBElementScreenshotTests.m */,
 				71F5BE33252E5B2200EE9EBA /* FBElementSwipingTests.m */,
 				EE006EAC1EB99B15006900A4 /* FBElementVisibilityTests.m */,
 				EE6A89361D0B35920083E92B /* FBFailureProofTestCaseTests.m */,
@@ -2045,7 +2032,6 @@
 				EE9B76581CF7987300275851 /* Info.plist */,
 				7139145B1DF01A12005896C2 /* NSExpressionFBFormatTests.m */,
 				71A224E71DE326C500844D55 /* NSPredicateFBFormatTests.m */,
-				EEC9EED820077D8E00BC0D5B /* XCUICoordinateFix.m */,
 				713914591DF01989005896C2 /* XCUIElementHelpersTests.m */,
 			);
 			path = UnitTests;
@@ -2311,7 +2297,6 @@
 				641EE65B2240C5CA00173FCB /* XCUIElementHitPointCoordinate.h in Headers */,
 				641EE65C2240C5CA00173FCB /* XCTDarwinNotificationExpectation.h in Headers */,
 				641EE65D2240C5CA00173FCB /* XCTRunnerAutomationSession.h in Headers */,
-				641EE65E2240C5CA00173FCB /* XCUICoordinate+FBFix.h in Headers */,
 				641EE65F2240C5CA00173FCB /* XCSourceCodeTreeNodeEnumerator.h in Headers */,
 				641EE6602240C5CA00173FCB /* XCUIElement+FBIsVisible.h in Headers */,
 				641EE6612240C5CA00173FCB /* XCUIElement+FBTap.h in Headers */,
@@ -2548,7 +2533,6 @@
 				EE35AD3F1E3B77D600A02D78 /* XCTDarwinNotificationExpectation.h in Headers */,
 				EE35AD5F1E3B77D600A02D78 /* XCTRunnerAutomationSession.h in Headers */,
 				71C9EAAC25E8415A00470CD8 /* FBScreenshot.h in Headers */,
-				EEC9EED620064FAA00BC0D5B /* XCUICoordinate+FBFix.h in Headers */,
 				EE35AD371E3B77D600A02D78 /* XCSourceCodeTreeNodeEnumerator.h in Headers */,
 				EE158AB01CBD456F00A3E3F0 /* XCUIElement+FBIsVisible.h in Headers */,
 				71414ED42670A1EE003A8C5D /* LRUCache.h in Headers */,
@@ -3141,7 +3125,6 @@
 				641EE6052240C5CA00173FCB /* FBUnknownCommands.m in Sources */,
 				641EE6062240C5CA00173FCB /* FBOrientationCommands.m in Sources */,
 				641EE7092240CDEB00173FCB /* XCUIElement+FBTVFocuse.m in Sources */,
-				641EE6072240C5CA00173FCB /* XCUICoordinate+FBFix.m in Sources */,
 				641EE6082240C5CA00173FCB /* FBRuntimeUtils.m in Sources */,
 				641EE6092240C5CA00173FCB /* XCUIElement+FBUtilities.m in Sources */,
 				641EE60A2240C5CA00173FCB /* FBLogger.m in Sources */,
@@ -3259,7 +3242,6 @@
 				EE158AC51CBD456F00A3E3F0 /* FBOrientationCommands.m in Sources */,
 				71D475C42538F5A8008D9401 /* XCUIApplicationProcess+FBQuiescence.m in Sources */,
 				641EE7082240CDEB00173FCB /* XCUIElement+FBTVFocuse.m in Sources */,
-				EEC9EED720064FAA00BC0D5B /* XCUICoordinate+FBFix.m in Sources */,
 				71E75E6F254824230099FC87 /* XCUIElementQuery+FBHelpers.m in Sources */,
 				71D04DCA25356C43008A052C /* XCUIElement+FBCaching.m in Sources */,
 				EE158AEB1CBD456F00A3E3F0 /* FBRuntimeUtils.m in Sources */,
@@ -3330,7 +3312,6 @@
 				715AFAC41FFA2AAF0053896D /* FBScreenTests.m in Sources */,
 				EE22021E1ECC618900A29571 /* FBTapTest.m in Sources */,
 				71930C472066434000D3AFEC /* FBPasteboardTests.m in Sources */,
-				71AB82B21FDAE8C000D1D7C3 /* FBElementScreenshotTests.m in Sources */,
 				7150FFF722476B3A00B2EE28 /* FBForceTouchTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3382,7 +3363,6 @@
 				ADBC39981D07842800327304 /* XCUIElementDouble.m in Sources */,
 				7139145A1DF01989005896C2 /* XCUIElementHelpersTests.m in Sources */,
 				EE6A89261D0B19E60083E92B /* FBSessionTests.m in Sources */,
-				EEC9EED920077D8E00BC0D5B /* XCUICoordinateFix.m in Sources */,
 				71A7EAFC1E229302001DA4F2 /* FBClassChainTests.m in Sources */,
 				EE18883D1DA663EB00307AA8 /* FBMathUtilsTests.m in Sources */,
 			);

package/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m

@@ -186,18 +186,6 @@
   }
   CGPoint midPoint = CGPointMake(visibleRect.origin.x + visibleRect.size.width / 2,
                                  visibleRect.origin.y + visibleRect.size.height / 2);
-#if !TARGET_OS_TV // TV has no orientation, so it does not need to coordinate
-  id<FBXCElementSnapshot> appElement = ancestors.count > 0 ? [ancestors lastObject] : self;
-  CGRect appFrame = appElement.frame;
-  CGRect windowFrame = nil == parentWindow ? selfFrame : parentWindow.frame;
-  if ((appFrame.size.height > appFrame.size.width && windowFrame.size.height < windowFrame.size.width) ||
-      (appFrame.size.height < appFrame.size.width && windowFrame.size.height > windowFrame.size.width)) {
-    // This is the indication of the fact that transformation is broken and coordinates should be
-    // recalculated manually.
-    // However, upside-down case cannot be covered this way, which is not important for Appium
-    midPoint = FBInvertPointForApplication(midPoint, appFrame.size, FBApplication.fb_activeApplication.interfaceOrientation);
-  }
-#endif
   id<FBXCAccessibilityElement> hitElement = [FBActiveAppDetectionPoint axElementWithPoint:midPoint];
   if (nil != hitElement) {
     if (FBIsAXElementEqualToOther(self.accessibilityElement, hitElement)) {

package/WebDriverAgentLib/Categories/XCUIElement+FBPickerWheel.m

@@ -12,9 +12,7 @@
 #import "FBRunLoopSpinner.h"
 #import "FBXCElementSnapshot.h"
 #import "FBXCodeCompatibility.h"
-#import "XCUIApplication+FBTouchAction.h"
 #import "XCUICoordinate.h"
-#import "XCUICoordinate+FBFix.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIElement+FBResolve.h"
 
@@ -31,16 +29,6 @@ static const NSTimeInterval VALUE_CHANGE_TIMEOUT = 2;
   NSString *previousValue = snapshot.value;
   XCUICoordinate *startCoord = [self coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.5)];
   XCUICoordinate *endCoord = [startCoord coordinateWithOffset:CGVectorMake(0.0, relativeHeightOffset * snapshot.frame.size.height)];
-  CGPoint tapPoint = endCoord.fb_screenPoint;
-  NSArray<NSDictionary<NSString *, id> *> *gesture =
-  @[@{
-      @"action": @"tap",
-      @"options": @{
-          @"x": @(tapPoint.x),
-          @"y": @(tapPoint.y),
-          }
-      }
-    ];
   // If picker value is reflected in its accessiblity id
   // then fetching of the next snapshot may fail with StaleElementReferenceError
   // because we bound elements by their accessbility ids by default.
@@ -48,9 +36,7 @@ static const NSTimeInterval VALUE_CHANGE_TIMEOUT = 2;
   // unique element identifier (UID), so it could be found next time even if its
   // id is different from the initial one. See https://github.com/appium/appium/issues/17569
   XCUIElement *stableInstance = self.fb_stableInstance;
-  if (![self.application fb_performAppiumTouchActions:gesture elementCache:nil error:error]) {
-    return NO;
-  }
+  [endCoord tap];
   return [[[[FBRunLoopSpinner new]
      timeout:VALUE_CHANGE_TIMEOUT]
     timeoutErrorMessage:[NSString stringWithFormat:@"Picker wheel value has not been changed after %@ seconds timeout", @(VALUE_CHANGE_TIMEOUT)]]

package/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m

@@ -16,11 +16,9 @@
 #import "FBXCodeCompatibility.h"
 #import "FBXCElementSnapshotWrapper.h"
 #import "FBXCElementSnapshotWrapper+Helpers.h"
-#import "XCUIApplication+FBTouchAction.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIApplication.h"
 #import "XCUICoordinate.h"
-#import "XCUICoordinate+FBFix.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBUtilities.h"
@@ -28,7 +26,8 @@
 
 const CGFloat FBFuzzyPointThreshold = 20.f; //Smallest determined value that is not interpreted as touch
 const CGFloat FBScrollToVisibleNormalizedDistance = .5f;
-const CGFloat FBTouchEventDelay = 1.f;
+const CGFloat FBTouchEventDelay = 0.5f;
+const CGFloat FBTouchVelocity = 300; // pixels per sec
 const CGFloat FBScrollTouchProportion = 0.75f;
 
 #if !TARGET_OS_TV
@@ -321,45 +320,16 @@ const CGFloat FBScrollTouchProportion = 0.75f;
 
   XCUICoordinate *appCoordinate = [[XCUICoordinate alloc] initWithElement:application normalizedOffset:CGVectorMake(0.0, 0.0)];
   XCUICoordinate *startCoordinate = [[XCUICoordinate alloc] initWithCoordinate:appCoordinate pointsOffset:hitpointOffset];
-  CGPoint startPoint = startCoordinate.fb_screenPoint;
   XCUICoordinate *endCoordinate = [[XCUICoordinate alloc] initWithCoordinate:startCoordinate pointsOffset:vector];
-  CGPoint endPoint = endCoordinate.fb_screenPoint;
 
-  if (FBPointFuzzyEqualToPoint(startPoint, endPoint, FBFuzzyPointThreshold)) {
+  if (FBPointFuzzyEqualToPoint(startCoordinate.screenPoint, endCoordinate.screenPoint, FBFuzzyPointThreshold)) {
     return YES;
   }
 
-  NSArray<NSDictionary<NSString *, id> *> *gesture =
-  @[@{
-      @"action": @"press",
-      @"options": @{
-        @"x": @(startPoint.x),
-        @"y": @(startPoint.y),
-      }
-    },
-    @{
-      @"action": @"wait",
-      @"options": @{
-        @"ms": @(FBTouchEventDelay * 1000),
-      }
-    },
-    @{
-      @"action": @"moveTo",
-      @"options": @{
-        @"x": @(endPoint.x),
-        @"y": @(endPoint.y),
-      }
-    },
-    @{
-      @"action": @"release"
-    }
-  ];
-  if (![application fb_performAppiumTouchActions:gesture
-                                    elementCache:nil
-                                           error:error]) {
-    return NO;
-  }
-
+  [startCoordinate pressForDuration:FBTouchEventDelay
+               thenDragToCoordinate:endCoordinate
+                       withVelocity:FBTouchVelocity
+                thenHoldForDuration:FBTouchEventDelay];
   return YES;
 }
 

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.h

@@ -98,13 +98,6 @@ NS_ASSUME_NONNULL_BEGIN
 */
 - (void)fb_waitUntilStableWithTimeout:(NSTimeInterval)timeout;
 
-/**
- Returns screenshot of the particular element
- @param error If there is an error, upon return contains an NSError object that describes the problem.
- @return Element screenshot as PNG-encoded data or nil in case of failure
- */
-- (nullable NSData *)fb_screenshotWithError:(NSError*__autoreleasing*)error;
-
 @end
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -197,53 +197,4 @@
   FBConfiguration.waitForIdleTimeout = previousTimeout;
 }
 
-- (NSData *)fb_screenshotWithError:(NSError **)error
-{
-  id<FBXCElementSnapshot> selfSnapshot = self.fb_isResolvedFromCache.boolValue
-    ? self.lastSnapshot
-    : self.fb_takeSnapshot;
-  if (CGRectIsEmpty(selfSnapshot.frame)) {
-    if (error) {
-      *error = [[FBErrorBuilder.builder withDescription:@"Cannot get a screenshot of zero-sized element"] build];
-    }
-    return nil;
-  }
-
-  CGRect elementRect = selfSnapshot.frame;
-#if !TARGET_OS_TV
-  UIInterfaceOrientation orientation = self.application.interfaceOrientation;
-  if (orientation == UIInterfaceOrientationLandscapeLeft || orientation == UIInterfaceOrientationLandscapeRight) {
-    // Workaround XCTest bug when element frame is returned as in portrait mode even if the screenshot is rotated
-    NSArray<id<FBXCElementSnapshot>> *ancestors = [FBXCElementSnapshotWrapper ensureWrapped:selfSnapshot].fb_ancestors;
-    id<FBXCElementSnapshot> parentWindow = nil;
-    if (1 == ancestors.count) {
-      parentWindow = selfSnapshot;
-    } else if (ancestors.count > 1) {
-      parentWindow = [ancestors objectAtIndex:ancestors.count - 2];
-    }
-    if (nil != parentWindow) {
-      CGRect appFrame = ancestors.lastObject.frame;
-      CGRect parentWindowFrame = parentWindow.frame;
-      if (CGRectEqualToRect(appFrame, parentWindowFrame)
-          || (appFrame.size.width > appFrame.size.height && parentWindowFrame.size.width > parentWindowFrame.size.height)
-          || (appFrame.size.width < appFrame.size.height && parentWindowFrame.size.width < parentWindowFrame.size.height)) {
-          CGPoint fixedOrigin = orientation == UIInterfaceOrientationLandscapeLeft ?
-          CGPointMake(appFrame.size.height - elementRect.origin.y - elementRect.size.height, elementRect.origin.x) :
-        CGPointMake(elementRect.origin.y, appFrame.size.width - elementRect.origin.x - elementRect.size.width);
-        elementRect = CGRectMake(fixedOrigin.x, fixedOrigin.y, elementRect.size.height, elementRect.size.width);
-      }
-    }
-  }
-#endif
-
-  // 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/FBElementCommands.m

@@ -594,10 +594,10 @@
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  NSError *error;
-  NSData *screenshotData = [element fb_screenshotWithError:&error];
+  NSData *screenshotData = [element.screenshot PNGRepresentation];
   if (nil == screenshotData) {
-    return FBResponseWithStatus([FBCommandStatus unableToCaptureScreenErrorWithMessage:error.description
+    NSString *errMsg = [NSString stringWithFormat:@"Cannot take a screenshot of %@", element.description];
+    return FBResponseWithStatus([FBCommandStatus unableToCaptureScreenErrorWithMessage:errMsg
                                                                              traceback:nil]);
   }
   NSString *screenshot = [screenshotData base64EncodedStringWithOptions:0];
@@ -606,36 +606,54 @@
 
 
 #if !TARGET_OS_TV
-static const CGFloat DEFAULT_OFFSET = (CGFloat)0.2;
+static const CGFloat DEFAULT_PICKER_OFFSET = (CGFloat)0.2;
+static const NSInteger DEFAULT_MAX_PICKER_ATTEMPTS = 25;
+
 
 + (id<FBResponsePayload>)handleWheelSelect:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
   if ([element.lastSnapshot elementType] != XCUIElementTypePickerWheel) {
-    return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:[NSString stringWithFormat:@"The element is expected to be a valid Picker Wheel control. '%@' was given instead", element.wdType] traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
+    NSString *errMsg = [NSString stringWithFormat:@"The element is expected to be a valid Picker Wheel control. '%@' was given instead", element.wdType];
+    return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:errMsg
+                                                                       traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
   }
   NSString* order = [request.arguments[@"order"] lowercaseString];
-  CGFloat offset = DEFAULT_OFFSET;
+  CGFloat offset = DEFAULT_PICKER_OFFSET;
   if (request.arguments[@"offset"]) {
     offset = (CGFloat)[request.arguments[@"offset"] doubleValue];
     if (offset <= 0.0 || offset > 0.5) {
-      return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:[NSString stringWithFormat:@"'offset' value is expected to be in range (0.0, 0.5]. '%@' was given instead", request.arguments[@"offset"]] traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
+      NSString *errMsg = [NSString stringWithFormat:@"'offset' value is expected to be in range (0.0, 0.5]. '%@' was given instead", request.arguments[@"offset"]];
+      return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:errMsg
+                                                                         traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
     }
   }
-  BOOL isSuccessful = false;
-  NSError *error;
-  if ([order isEqualToString:@"next"]) {
-    isSuccessful = [element fb_selectNextOptionWithOffset:offset error:&error];
-  } else if ([order isEqualToString:@"previous"]) {
-    isSuccessful = [element fb_selectPreviousOptionWithOffset:offset error:&error];
-  } else {
-    return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:[NSString stringWithFormat:@"Only 'previous' and 'next' order values are supported. '%@' was given instead", request.arguments[@"order"]] traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
-  }
-  if (!isSuccessful) {
-    return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description traceback:nil]);
+  NSNumber *maxAttempts = request.arguments[@"maxAttempts"] ?: @(DEFAULT_MAX_PICKER_ATTEMPTS);
+  NSString *expectedValue = request.arguments[@"value"];
+  NSInteger attempt = 0;
+  while (attempt < [maxAttempts integerValue]) {
+    BOOL isSuccessful = false;
+    NSError *error;
+    if ([order isEqualToString:@"next"]) {
+      isSuccessful = [element fb_selectNextOptionWithOffset:offset error:&error];
+    } else if ([order isEqualToString:@"previous"]) {
+      isSuccessful = [element fb_selectPreviousOptionWithOffset:offset error:&error];
+    } else {
+      NSString *errMsg = [NSString stringWithFormat:@"Only 'previous' and 'next' order values are supported. '%@' was given instead", request.arguments[@"order"]];
+      return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:errMsg
+                                                                         traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
+    }
+    if (!isSuccessful) {
+      return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:error.description traceback:nil]);
+    }
+    if (nil == expectedValue || [element.wdValue isEqualToString:expectedValue]) {
+      return FBResponseWithOK();
+    }
+    attempt++;
   }
-  return FBResponseWithOK();
+  NSString *errMsg = [NSString stringWithFormat:@"Cannot select the expected picker wheel value '%@' after %ld attempts", expectedValue, attempt];
+  return FBResponseWithStatus([FBCommandStatus invalidElementStateErrorWithMessage:errMsg traceback:nil]);
 }
 
 #pragma mark - Helpers

package/WebDriverAgentLib/Utilities/FBAppiumActionsSynthesizer.m

@@ -80,7 +80,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
 
 - (nullable instancetype)initWithActionItem:(NSDictionary<NSString *, id> *)item
                                 application:(XCUIApplication *)application
-                                 atPosition:(nullable NSValue *)atPosition
+                                 atPosition:(nullable XCUICoordinate *)atPosition
                                      offset:(double)offset
                                       error:(NSError **)error
 {
@@ -90,14 +90,14 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     self.application = application;
     self.offset = offset;
     id options = [item objectForKey:FB_OPTIONS_KEY];
-    if (atPosition) {
-      self.atPosition = [atPosition CGPointValue];
+    if (nil != atPosition) {
+      self.atPosition = (id) atPosition;
     } else {
-      NSValue *result = [self coordinatesWithOptions:options error:error];
+      XCUICoordinate *result = [self coordinatesWithOptions:options error:error];
       if (nil == result) {
         return nil;
       }
-      self.atPosition = [result CGPointValue];
+      self.atPosition = result;
     }
     self.duration = [self durationWithOptions:options];
     if (self.duration < 0) {
@@ -124,7 +124,8 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     0.0;
 }
 
-- (nullable NSValue *)coordinatesWithOptions:(nullable NSDictionary<NSString *, id> *)options error:(NSError **)error
+- (nullable XCUICoordinate *)coordinatesWithOptions:(nullable NSDictionary<NSString *, id> *)options
+                                              error:(NSError **)error
 {
   if (![options isKindOfClass:NSDictionary.class]) {
     NSString *description = [NSString stringWithFormat:@"'%@' key is mandatory for '%@' action", FB_OPTIONS_KEY, self.class.actionName];
@@ -169,7 +170,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
   NSTimeInterval currentOffset = FBMillisToSeconds(self.offset);
   NSMutableArray<XCPointerEventPath *> *result = [NSMutableArray array];
   XCPointerEventPath *currentPath = [[XCPointerEventPath alloc]
-                                     initForTouchAtPoint:self.atPosition
+                                     initForTouchAtPoint:self.atPosition.screenPoint
                                      offset:currentOffset];
   [result addObject:currentPath];
   currentOffset += FBMillisToSeconds(FB_TAP_DURATION_MS);
@@ -180,7 +181,8 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     NSNumber *tapCount = [options objectForKey:FB_OPTION_COUNT] ?: @1;
     for (NSInteger times = 1; times < tapCount.integerValue; ++times) {
       currentOffset += FBMillisToSeconds(FB_INTERTAP_MIN_DURATION_MS);
-      XCPointerEventPath *nextPath = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition offset:currentOffset];
+      XCPointerEventPath *nextPath = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
+                                                                              offset:currentOffset];
       [result addObject:nextPath];
       currentOffset += FBMillisToSeconds(FB_TAP_DURATION_MS);
       [nextPath liftUpAtOffset:currentOffset];
@@ -204,7 +206,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
 
 - (nullable instancetype)initWithActionItem:(NSDictionary<NSString *, id> *)item
                                 application:(XCUIApplication *)application
-                                 atPosition:(nullable NSValue *)atPosition
+                                 atPosition:(nullable XCUICoordinate *)atPosition
                                      offset:(double)offset
                                       error:(NSError **)error
 {
@@ -239,7 +241,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
                                             error:(NSError **)error
 {
   XCPointerEventPath *result = [[XCPointerEventPath alloc]
-                                initForTouchAtPoint:self.atPosition
+                                initForTouchAtPoint:self.atPosition.screenPoint
                                 offset:FBMillisToSeconds(self.offset)];
   if (nil != self.pressure && nil != result.pointerEvents.lastObject) {
     XCPointerEvent *pointerEvent = (XCPointerEvent *)result.pointerEvents.lastObject;
@@ -272,7 +274,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
                                  currentItemIndex:(NSUInteger)currentItemIndex
                                             error:(NSError **)error
 {
-  return @[[[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition
+  return @[[[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
                                                     offset:FBMillisToSeconds(self.offset)]];
 }
 
@@ -312,7 +314,8 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     }
   }
   NSTimeInterval currentOffset = FBMillisToSeconds(self.offset + self.duration);
-  XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition offset:currentOffset];
+  XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
+                                                                        offset:currentOffset];
   if (currentItemIndex == allItems.count - 1) {
     [result liftUpAtOffset:currentOffset];
   }
@@ -353,7 +356,8 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     return nil;
   }
 
-  [eventPath moveToPoint:self.atPosition atOffset:FBMillisToSeconds(self.offset)];
+  [eventPath moveToPoint:self.atPosition.screenPoint
+                atOffset:FBMillisToSeconds(self.offset)];
   return @[];
 }
 
@@ -509,7 +513,11 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
         return nil;
       }
       FBAppiumGestureItem *lastItem = [chain.items lastObject];
-      gestureItem = [[gestureItemClass alloc] initWithActionItem:actionItem application:self.application atPosition:[NSValue valueWithCGPoint:lastItem.atPosition] offset:chain.durationOffset error:error];
+      gestureItem = [[gestureItemClass alloc] initWithActionItem:actionItem
+                                                     application:self.application
+                                                      atPosition:lastItem.atPosition
+                                                          offset:chain.durationOffset
+                                                           error:error];
     }
     if (nil == gestureItem) {
       return nil;
@@ -527,7 +535,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
   BOOL isMultiTouch = [self.actions.firstObject isKindOfClass:NSArray.class];
   eventRecord = [[XCSynthesizedEventRecord alloc]
                  initWithName:(isMultiTouch ? @"Multi-Finger Touch Action" : @"Single-Finger Touch Action")
-                 interfaceOrientation:[FBXCTestDaemonsProxy orientationWithApplication:self.application]];
+                 interfaceOrientation:self.application.interfaceOrientation];
   for (NSArray<NSDictionary<NSString *, id> *> *action in (isMultiTouch ? self.actions : @[self.actions])) {
     NSArray<NSDictionary<NSString *, id> *> *preprocessedAction = [self preprocessAction:action];
     NSArray<XCPointerEventPath *> *eventPaths = [self eventPathsWithAction:preprocessedAction error:error];

package/WebDriverAgentLib/Utilities/FBBaseActionsSynthesizer.h

@@ -51,19 +51,10 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FBBaseGestureItem : FBBaseActionItem
 
 /*! Absolute position on the screen where the gesure should be performed */
-@property (nonatomic) CGPoint atPosition;
+@property (nonatomic) XCUICoordinate *atPosition;
 /*! Gesture duration in milliseconds */
 @property (nonatomic) double duration;
 
-/**
- Returns fixed hit point coordinates for the case when XCTest fails to transform element snaapshot properly on screen rotation.
-
- @param hitPoint The initial hitpoint coordinates
- @param snapshot Element's snapshot instance
- @return The fixed hit point coordinates, if there is a need to fix them, or the unchanged hit point value
- */
-- (CGPoint)fixedHitPointWith:(CGPoint)hitPoint forSnapshot:(id<FBXCElementSnapshot>)snapshot;
-
 /**
  Calculate absolute gesture position on the screen based on provided element and positionOffset values.
 
@@ -72,9 +63,9 @@ NS_ASSUME_NONNULL_BEGIN
  @param error If there is an error, upon return contains an NSError object that describes the problem
  @return Adbsolute gesture position on the screen or nil if the calculation fails (for example, the element is invisible)
  */
-- (nullable NSValue *)hitpointWithElement:(nullable XCUIElement *)element
-                           positionOffset:(nullable NSValue *)positionOffset
-                                    error:(NSError **)error;
+- (nullable XCUICoordinate *)hitpointWithElement:(nullable XCUIElement *)element
+                                  positionOffset:(nullable NSValue *)positionOffset
+                                           error:(NSError **)error;
 
 @end
 

package/WebDriverAgentLib/Utilities/FBBaseActionsSynthesizer.m

@@ -31,7 +31,10 @@
   return nil;
 }
 
-- (NSArray<XCPointerEventPath *> *)addToEventPath:(XCPointerEventPath *)eventPath allItems:(NSArray *)allItems currentItemIndex:(NSUInteger)currentItemIndex error:(NSError **)error
+- (NSArray<XCPointerEventPath *> *)addToEventPath:(XCPointerEventPath *)eventPath
+                                         allItems:(NSArray *)allItems
+                                 currentItemIndex:(NSUInteger)currentItemIndex
+                                            error:(NSError **)error
 {
   @throw [[FBErrorBuilder.builder withDescription:@"Override this method in subclasses"] build];
   return nil;
@@ -41,66 +44,40 @@
 
 @implementation FBBaseGestureItem
 
-- (CGPoint)fixedHitPointWith:(CGPoint)hitPoint forSnapshot:(id<FBXCElementSnapshot>)snapshot
+- (nullable XCUICoordinate *)hitpointWithElement:(nullable XCUIElement *)element
+                                  positionOffset:(nullable NSValue *)positionOffset
+                                           error:(NSError **)error
 {
-  UIInterfaceOrientation interfaceOrientation = self.application.interfaceOrientation;
-  if (interfaceOrientation == UIInterfaceOrientationPortrait) {
-    // There is no need to recalculate anything for portrait orientation
-    return hitPoint;
-  }
-  // For Xcode11+ it is always necessary to adjust the tap point coordinates
-  return FBInvertPointForApplication(hitPoint, self.application.frame.size, interfaceOrientation);
-}
-
-- (nullable NSValue *)hitpointWithElement:(nullable XCUIElement *)element positionOffset:(nullable NSValue *)positionOffset error:(NSError **)error
-{
-  CGPoint hitPoint;
   if (nil == element) {
+    CGVector offset = CGVectorMake(positionOffset.CGPointValue.x, positionOffset.CGPointValue.y);
     // Only absolute offset is defined
-    hitPoint = [positionOffset CGPointValue];
-    /*
-     Since iOS 10.0 XCTest has a bug when it always returns portrait coordinates for UI elements
-     even if the device is not in portait mode. That is why we need to recalculate them manually
-     based on the current orientation value
-     */
-    hitPoint = FBInvertPointForApplication(hitPoint, self.application.frame.size, self.application.interfaceOrientation);
-  } else {
-    // The offset relative to the element is defined
-
-    id<FBXCElementSnapshot> snapshot = element.fb_isResolvedFromCache.boolValue
-      ? element.lastSnapshot
-      : element.fb_takeSnapshot;
-    if (nil == positionOffset) {
-      NSValue *hitPointValue = [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_hitPoint;
-      if (nil != hitPointValue) {
-        // short circuit element hitpoint
-        return hitPointValue;
-      }
-      [FBLogger logFmt:@"Will use the frame of '%@' for hit point calculation instead", element.debugDescription];
-    }
-    CGRect visibleFrame = snapshot.visibleFrame;
-    CGRect frame = CGRectIsEmpty(visibleFrame) ? element.frame : visibleFrame;
-    if (CGRectIsEmpty(frame)) {
-      [FBLogger log:self.application.fb_descriptionRepresentation];
-      NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable", element.description];
-      if (error) {
-        *error = [[FBErrorBuilder.builder withDescription:description] build];
-      }
-      return nil;
+    return [[self.application coordinateWithNormalizedOffset:CGVectorMake(0, 0)] coordinateWithOffset:offset];
+  }
+
+  // The offset relative to the element is defined
+  if (nil == positionOffset) {
+    if (element.hittable) {
+      // short circuit element hitpoint
+      return element.hitPointCoordinate;
     }
-    if (nil == positionOffset) {
-      hitPoint = CGPointMake(frame.origin.x + frame.size.width / 2,
-                             frame.origin.y + frame.size.height / 2);
-    } else {
-      CGPoint origin = frame.origin;
-      hitPoint = CGPointMake(origin.x, origin.y);
-      CGPoint offsetValue = [positionOffset CGPointValue];
-      hitPoint = CGPointMake(hitPoint.x + offsetValue.x, hitPoint.y + offsetValue.y);
-      // TODO: Shall we throw an exception if hitPoint is out of the element frame?
+    [FBLogger logFmt:@"Will use the frame of '%@' for hit point calculation instead", element.debugDescription];
+  }
+  if (CGRectIsEmpty(element.frame)) {
+    [FBLogger log:self.application.fb_descriptionRepresentation];
+    NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable",
+                             element.description];
+    if (error) {
+      *error = [[FBErrorBuilder.builder withDescription:description] build];
     }
-    hitPoint = [self fixedHitPointWith:hitPoint forSnapshot:snapshot];
+    return nil;
+  }
+  if (nil == positionOffset) {
+    return [element coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.5)];
   }
-  return [NSValue valueWithCGPoint:hitPoint];
+
+  CGVector offset = CGVectorMake(positionOffset.CGPointValue.x, positionOffset.CGPointValue.y);
+  // TODO: Shall we throw an exception if hitPoint is out of the element frame?
+  return [[element coordinateWithNormalizedOffset:CGVectorMake(0, 0)] coordinateWithOffset:offset];
 }
 
 @end
@@ -161,7 +138,10 @@
 
 @implementation FBBaseActionsSynthesizer
 
-- (instancetype)initWithActions:(NSArray *)actions forApplication:(XCUIApplication *)application elementCache:(nullable FBElementCache *)elementCache error:(NSError **)error
+- (instancetype)initWithActions:(NSArray *)actions
+                 forApplication:(XCUIApplication *)application
+                   elementCache:(nullable FBElementCache *)elementCache
+                          error:(NSError **)error
 {
   self = [super init];
   if (self) {

package/WebDriverAgentLib/Utilities/FBMathUtils.h

@@ -32,12 +32,6 @@ BOOL FBSizeFuzzyEqualToSize(CGSize size1, CGSize size2, CGFloat threshold);
 BOOL FBRectFuzzyEqualToRect(CGRect rect1, CGRect rect2, CGFloat threshold);
 
 #if !TARGET_OS_TV
-/*! Inverts point if necessary to match location on screen */
-CGPoint FBInvertPointForApplication(CGPoint point, CGSize screenSize, UIInterfaceOrientation orientation);
-
-/*! Inverts offset if necessary to match screen orientation */
-CGPoint FBInvertOffsetForOrientation(CGPoint offset, UIInterfaceOrientation orientation);
-
 /*! Inverts size if necessary to match current screen orientation */
 CGSize FBAdjustDimensionsForApplication(CGSize actualSize, UIInterfaceOrientation orientation);
 #endif

package/WebDriverAgentLib/Utilities/FBMathUtils.m

@@ -46,35 +46,6 @@ BOOL FBRectFuzzyEqualToRect(CGRect rect1, CGRect rect2, CGFloat threshold)
 }
 
 #if !TARGET_OS_TV
-CGPoint FBInvertPointForApplication(CGPoint point, CGSize screenSize, UIInterfaceOrientation orientation)
-{
-  switch (orientation) {
-    case UIInterfaceOrientationUnknown:
-    case UIInterfaceOrientationPortrait:
-      return point;
-    case UIInterfaceOrientationPortraitUpsideDown:
-      return CGPointMake(screenSize.width - point.x, screenSize.height - point.y);
-    case UIInterfaceOrientationLandscapeLeft:
-      return CGPointMake(point.y, MAX(screenSize.width, screenSize.height) - point.x);
-    case UIInterfaceOrientationLandscapeRight:
-      return CGPointMake(MIN(screenSize.width, screenSize.height) - point.y, point.x);
-  }
-}
-
-CGPoint FBInvertOffsetForOrientation(CGPoint offset, UIInterfaceOrientation orientation)
-{
-  switch (orientation) {
-    case UIInterfaceOrientationUnknown:
-    case UIInterfaceOrientationPortrait:
-      return offset;
-    case UIInterfaceOrientationPortraitUpsideDown:
-      return CGPointMake(-offset.x, -offset.y);
-    case UIInterfaceOrientationLandscapeLeft:
-      return CGPointMake(offset.y, -offset.x);
-    case UIInterfaceOrientationLandscapeRight:
-      return CGPointMake(-offset.y, offset.x);
-  }
-}
 
 CGSize FBAdjustDimensionsForApplication(CGSize actualSize, UIInterfaceOrientation orientation)
 {

package/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m

@@ -133,16 +133,16 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
       return nil;
     }
     self.duration = durationObj.doubleValue;
-    NSValue *position = [self positionWithError:error];
+    XCUICoordinate *position = [self positionWithError:error];
     if (nil == position) {
       return nil;
     }
-    self.atPosition = [position CGPointValue];
+    self.atPosition = position;
   }
   return self;
 }
 
-- (nullable NSValue *)positionWithError:(NSError **)error
+- (nullable XCUICoordinate *)positionWithError:(NSError **)error
 {
   if (nil == self.previousItem) {
     NSString *errorDescription = [NSString stringWithFormat:@"The '%@' action item must be preceded by %@ item", self.actionItem, FB_ACTION_ITEM_TYPE_POINTER_MOVE];
@@ -151,39 +151,32 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
     }
     return nil;
   }
-  return [NSValue valueWithCGPoint:self.previousItem.atPosition];
+  return self.previousItem.atPosition;
 }
 
-- (nullable NSValue *)hitpointWithElement:(nullable XCUIElement *)element
-                           positionOffset:(nullable NSValue *)positionOffset
-                                    error:(NSError **)error
+- (nullable XCUICoordinate *)hitpointWithElement:(nullable XCUIElement *)element
+                                  positionOffset:(nullable NSValue *)positionOffset
+                                           error:(NSError **)error
 {
   if (nil == element || nil == positionOffset) {
     return [super hitpointWithElement:element positionOffset:positionOffset error:error];
   }
 
   // An offset relative to the element is defined
-  id<FBXCElementSnapshot> snapshot = element.fb_isResolvedFromCache.boolValue
-    ? element.lastSnapshot
-    : element.fb_takeSnapshot;
-  CGRect frame = snapshot.frame;
-  if (CGRectIsEmpty(frame)) {
+  if (CGRectIsEmpty(element.frame)) {
     [FBLogger log:self.application.fb_descriptionRepresentation];
-    NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable", [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_description];
+    NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable",
+                             element.description];
     if (error) {
       *error = [[FBErrorBuilder.builder withDescription:description] build];
     }
     return nil;
   }
-  CGRect visibleFrame = snapshot.visibleFrame;
-  frame = CGRectIsEmpty(visibleFrame) ? frame : visibleFrame;
+
   // W3C standard requires that relative element coordinates start at the center of the element's rectangle
-  CGPoint hitPoint = CGPointMake(frame.origin.x + frame.size.width / 2, frame.origin.y + frame.size.height / 2);
-  CGPoint offsetValue = [positionOffset CGPointValue];
-  hitPoint = CGPointMake(hitPoint.x + offsetValue.x, hitPoint.y + offsetValue.y);
+  CGVector offset = CGVectorMake(positionOffset.CGPointValue.x, positionOffset.CGPointValue.y);
   // TODO: Shall we throw an exception if hitPoint is out of the element frame?
-  hitPoint = [self fixedHitPointWith:hitPoint forSnapshot:snapshot];
-  return [NSValue valueWithCGPoint:hitPoint];
+  return [[element coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.5)] coordinateWithOffset:offset];
 }
 
 @end
@@ -220,7 +213,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
     }
   }
   if (nil == self.pressure) {
-    XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition
+    XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
                                                                           offset:FBMillisToSeconds(self.offset)];
     return @[result];
   }
@@ -247,7 +240,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
 
 @implementation FBPointerMoveItem
 
-- (nullable NSValue *)positionWithError:(NSError **)error
+- (nullable XCUICoordinate *)positionWithError:(NSError **)error
 {
   static NSArray<NSString *> *supportedOriginTypes;
   static dispatch_once_t onceToken;
@@ -295,10 +288,9 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
     }
     return nil;
   }
-  CGPoint recentPosition = self.previousItem.atPosition;
-  CGPoint offsetRelativeToRecentPosition = (nil == x && nil == y) ? CGPointMake(0.0, 0.0) : CGPointMake(x.floatValue, y.floatValue);
-  offsetRelativeToRecentPosition = FBInvertOffsetForOrientation(offsetRelativeToRecentPosition, self.application.interfaceOrientation);
-  return [NSValue valueWithCGPoint:CGPointMake(recentPosition.x + offsetRelativeToRecentPosition.x, recentPosition.y + offsetRelativeToRecentPosition.y)];
+  XCUICoordinate *recentPosition = self.previousItem.atPosition;
+  CGVector offsetRelativeToRecentPosition = (nil == x && nil == y) ? CGVectorMake(0, 0) : CGVectorMake(x.floatValue, y.floatValue);
+  return [recentPosition coordinateWithOffset:offsetRelativeToRecentPosition];
 }
 
 + (NSString *)actionName
@@ -312,9 +304,11 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
                                             error:(NSError **)error
 {
   if (nil == eventPath) {
-    return @[[[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition offset:FBMillisToSeconds(self.offset + self.duration)]];
+    return @[[[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
+                                                      offset:FBMillisToSeconds(self.offset + self.duration)]];
   }
-  [eventPath moveToPoint:self.atPosition atOffset:FBMillisToSeconds(self.offset + self.duration)];
+  [eventPath moveToPoint:self.atPosition.screenPoint
+                atOffset:FBMillisToSeconds(self.offset + self.duration)];
   return @[];
 }
 
@@ -888,7 +882,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
 {
   XCSynthesizedEventRecord *eventRecord = [[XCSynthesizedEventRecord alloc]
                                            initWithName:@"W3C Touch Action"
-                                           interfaceOrientation:[FBXCTestDaemonsProxy orientationWithApplication:self.application]];
+                                           interfaceOrientation:self.application.interfaceOrientation];
   NSMutableDictionary<NSString *, NSDictionary<NSString *, id> *> *actionsMapping = [NSMutableDictionary new];
   NSMutableArray<NSString *> *actionIds = [NSMutableArray new];
   for (NSDictionary<NSString *, id> *action in self.actions) {

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.h

@@ -23,10 +23,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (id<XCTestManager_ManagerInterface>)testRunnerProxy;
 
-#if !TARGET_OS_TV
-+ (UIInterfaceOrientation)orientationWithApplication:(XCUIApplication *)application;
-#endif
-
 + (BOOL)synthesizeEventWithRecord:(XCSynthesizedEventRecord *)record
                             error:(NSError *__autoreleasing*)error;
 

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.m

@@ -30,7 +30,6 @@ static dispatch_once_t onceTestRunnerDaemonClass;
 
 + (void)load
 {
-  // XCTRunnerDaemonSession class is only available since Xcode 8.3
   dispatch_once(&onceTestRunnerDaemonClass, ^{
     FBXCTRunnerDaemonSessionClass = objc_lookUpClass("XCTRunnerDaemonSession");
   });
@@ -60,17 +59,6 @@ static dispatch_once_t onceTestRunnerDaemonClass;
   return ((XCTRunnerDaemonSession *)[FBXCTRunnerDaemonSessionClass sharedSession]).daemonProxy;
 }
 
-#if !TARGET_OS_TV
-+ (UIInterfaceOrientation)orientationWithApplication:(XCUIApplication *)application
-{
-  if (nil == FBXCTRunnerDaemonSessionClass ||
-      [[FBXCTRunnerDaemonSessionClass sharedSession] useLegacyEventCoordinateTransformationPath]) {
-    return application.interfaceOrientation;
-  }
-  return UIInterfaceOrientationPortrait;
-}
-#endif
-
 + (BOOL)synthesizeEventWithRecord:(XCSynthesizedEventRecord *)record error:(NSError *__autoreleasing*)error
 {
   __block BOOL didSucceed = NO;

package/WebDriverAgentTests/IntegrationTests/FBAppiumTouchActionsIntegrationTests.m

@@ -194,14 +194,6 @@
 
 - (void)testDoubleTap
 {
-  if ([UIDevice.currentDevice userInterfaceIdiom] == UIUserInterfaceIdiomPad &&
-      SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
-    // "tap the element" does not work on iPadOS simulator after change the rotation in iOS 15
-    // while selecting the element worked. (I confirmed with getting an element screenshot that
-    // the FBShowAlertButtonName was actually selected after changing the orientation.)
-    return;
-  }
-
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"action": @"tap",
@@ -214,16 +206,8 @@
   [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")) {
-    // Does not work on iOS 15.0.
-    // The same action tap the FBShowAlertButtonName after rotating the screen
-    // worked with W3C actions. `.click` action did not work.
-    return;
-  }
-
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"action": @"press",

package/WebDriverAgentTests/IntegrationTests/FBW3CTouchActionsIntegrationTests.m

@@ -294,18 +294,8 @@
   [self verifyGesture:gesture orientation:UIDeviceOrientationPortrait];
 }
 
-// TODO: UIDeviceOrientationLandscapeLeft did not work in iOS 16 simumlator.
-// UIDeviceOrientationPortrait was ok.
 - (void)testDoubleTap
 {
-  if ([UIDevice.currentDevice userInterfaceIdiom] == UIUserInterfaceIdiomPad &&
-      SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
-    // "tap the element" does not work on iPadOS simulator after change the rotation in iOS 15
-    // while selecting the element worked. (I confirmed with getting an element screenshot that
-    // the FBShowAlertButtonName was actually selected after changing the orientation.)
-    return;
-  }
-
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"type": @"pointer",
@@ -326,17 +316,8 @@
   [self verifyGesture:gesture orientation:UIDeviceOrientationLandscapeLeft];
 }
 
-// TODO: UIDeviceOrientationLandscapeRight did not work in iOS 16 simumlator.
-// UIDeviceOrientationPortrait was ok.
 - (void)testLongPressWithCombinedPause
 {
-  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
-    // Xcode 13 x iOS 14 also does not work while Xcode 12.5 x iOS 14 worked.
-    // Skip this test for iOS 15 since iOS 15 works with Xcode 13 at least.
-    return;
-  }
-
-
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"type": @"pointer",

package/WebDriverAgentTests/UnitTests/FBMathUtilsTests.m

@@ -98,18 +98,6 @@
   XCTAssertFalse(FBRectFuzzyEqualToRect(referenceRect, CGRectMake(-1, -1, 1, 1), 1));
 }
 
-
-- (void)testPointInvertion
-{
-  const CGPoint testPoint = CGPointMake(1, 2);
-  const CGSize screenSize = CGSizeMake(10, 15);
-  const CGFloat t = FBDefaultFrameFuzzyThreshold;
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(CGPointMake(1, 2), FBInvertPointForApplication(testPoint, screenSize, UIInterfaceOrientationPortrait), t));
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(CGPointMake(9, 13), FBInvertPointForApplication(testPoint, screenSize, UIInterfaceOrientationPortraitUpsideDown), t));
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(CGPointMake(2, 14), FBInvertPointForApplication(testPoint, screenSize, UIInterfaceOrientationLandscapeLeft), t));
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(CGPointMake(8, 1), FBInvertPointForApplication(testPoint, screenSize, UIInterfaceOrientationLandscapeRight), t));
-}
-
 - (void)testSizeInversion
 {
   const CGSize screenSizePortrait = CGSizeMake(10, 15);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {

package/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.h

@@ -1,18 +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 <XCTest/XCTest.h>
-
-#if !TARGET_OS_TV
-@interface XCUICoordinate (FBFix)
-
-- (CGPoint)fb_screenPoint;
-
-@end
-#endif

package/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.m

@@ -1,46 +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 "XCUICoordinate+FBFix.h"
-
-#import "XCUICoordinate.h"
-#import "XCUIElement+FBUtilities.h"
-
-# if !TARGET_OS_TV
-@implementation XCUICoordinate (FBFix)
-
-- (CGPoint)fb_screenPoint
-{
-  CGPoint referencePoint = CGPointMake(0, 0);
-  NSValue *referencedElementFrame = nil;
-  if (self.element) {
-    CGRect elementFrame = self.element.frame;
-    if (self.referencedElement == self.element) {
-      referencedElementFrame = [NSValue valueWithCGRect:elementFrame];
-    }
-    referencePoint = CGPointMake(
-      CGRectGetMinX(elementFrame) + CGRectGetWidth(elementFrame) * self.normalizedOffset.dx,
-      CGRectGetMinY(elementFrame) + CGRectGetHeight(elementFrame) * self.normalizedOffset.dy);
-  } else if (self.coordinate) {
-    referencePoint = self.coordinate.fb_screenPoint;
-  }
-
-  CGPoint screenPoint = CGPointMake(
-    referencePoint.x + self.pointsOffset.dx,
-    referencePoint.y + self.pointsOffset.dy);
-  if (nil == referencedElementFrame) {
-    referencedElementFrame = [NSValue valueWithCGRect:self.referencedElement.frame];
-  }
-  return CGPointMake(
-    MIN(CGRectGetMaxX(referencedElementFrame.CGRectValue), screenPoint.x),
-    MIN(CGRectGetMaxY(referencedElementFrame.CGRectValue), screenPoint.y));
-}
-
-@end
-#endif

package/WebDriverAgentTests/IntegrationTests/FBElementScreenshotTests.m

@@ -1,52 +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 <XCTest/XCTest.h>
-
-#import "FBMacros.h"
-#import "FBIntegrationTestCase.h"
-#import "XCUIDevice+FBRotation.h"
-#import "XCUIElement+FBUtilities.h"
-#import "XCUIScreen.h"
-
-@interface FBElementScreenshotTests : FBIntegrationTestCase
-@end
-
-@implementation FBElementScreenshotTests
-
-- (void)setUp
-{
-  [super setUp];
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    [self launchApplication];
-    [self goToAlertsPage];
-  });
-}
-
-- (void)tearDown
-{
-  [self resetOrientation];
-  [super tearDown];
-}
-
-- (void)testElementScreenshot
-{
-  [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:UIDeviceOrientationLandscapeLeft];
-  XCUIElement *button = self.testedApplication.buttons[FBShowAlertButtonName];
-  NSError *error = nil;
-  NSData *screenshotData = [button fb_screenshotWithError:&error];
-  XCTAssertNotNil(screenshotData);
-  XCTAssertNil(error);
-  UIImage *image = [UIImage imageWithData:screenshotData];
-  XCTAssertNotNil(image);
-  XCTAssertTrue(image.size.width > image.size.height);
-}
-
-@end

package/WebDriverAgentTests/UnitTests/XCUICoordinateFix.m

@@ -1,63 +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 <XCTest/XCTest.h>
-
-#import "FBMathUtils.h"
-#import "XCUICoordinate.h"
-#import "XCUICoordinate+FBFix.h"
-#import "XCUIElementDouble.h"
-
-@interface XCUICoordinateFix : XCTestCase
-@property (nonatomic, strong, nullable) XCUIElement *mockElement;
-@property (nonatomic, strong, nullable) XCUICoordinate *defaultCoordinate;
-@end
-
-@implementation XCUICoordinateFix
-
-- (void)setUp
-{
-  [super setUp];
-  XCUIElementDouble *element = [XCUIElementDouble new];
-  element.frame = CGRectMake(1, 2, 9, 10);
-  self.mockElement = (XCUIElement *)element;
-  self.defaultCoordinate = [[XCUICoordinate alloc] initWithElement:self.mockElement normalizedOffset:CGVectorMake(0.0, 0.0)];
-}
-
-- (void)testCoordinateWithElement
-{
-  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithElement:self.mockElement normalizedOffset:CGVectorMake(0.0, 0.0)];
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(1, 2), 0.1));
-}
-
-- (void)testCoordinateWithElementWithOffset
-{
-  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithElement:self.mockElement normalizedOffset:CGVectorMake(0.5, 0.5)];
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(5.5, 7), 0.1));
-}
-
-- (void)testCoordinateWithCoordinate
-{
-  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithCoordinate:self.defaultCoordinate pointsOffset:CGVectorMake(0, 0)];
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(1, 2), 0.1));
-}
-
-- (void)testCoordinateWithCoordinateWithOffset
-{
-  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithCoordinate:self.defaultCoordinate pointsOffset:CGVectorMake(1, 2)];
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(2, 4), 0.1));
-}
-
-- (void)testCoordinateWithCoordinateWithOffsetOffBounds
-{
-  XCUICoordinate *coordinate = [[XCUICoordinate alloc] initWithCoordinate:self.defaultCoordinate pointsOffset:CGVectorMake(200, 200)];
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(coordinate.fb_screenPoint, CGPointMake(10, 12), 0.1));
-}
-
-@end