appium-webdriveragent 3.13.2 → 3.15.0

package/WebDriverAgent.xcodeproj/xcuserdata/{elf.xcuserdatad → kazuaki.xcuserdatad}/xcschemes/xcschememanagement.plist

@@ -4,55 +4,78 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
+		<key>IntegrationApp.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
 		<key>IntegrationApp.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>5</integer>
 		</dict>
 		<key>IntegrationTests_1.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>6</integer>
 		</dict>
 		<key>IntegrationTests_2.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>7</integer>
 		</dict>
 		<key>IntegrationTests_3.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>8</integer>
 		</dict>
-		<key>WebDriverAgentLib copy.xcscheme_^#shared#^_</key>
+		<key>WebDriverAgentLib.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>0</integer>
 		</dict>
-		<key>WebDriverAgentLib.xcscheme_^#shared#^_</key>
+		<key>WebDriverAgentLib_tvOS copy.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>10</integer>
 		</dict>
 		<key>WebDriverAgentLib_tvOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>3</integer>
+		</dict>
+		<key>WebDriverAgentLib_watchOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>10</integer>
 		</dict>
 		<key>WebDriverAgentRunner-nodebug.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>2</integer>
 		</dict>
 		<key>WebDriverAgentRunner.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>1</integer>
 		</dict>
 		<key>WebDriverAgentRunner_tvOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>4</integer>
+		</dict>
+		<key>WebDriverAgentRunner_watchOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>9</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>72F9A2AB26B5121A00A27636</key>
+		<dict>
+			<key>primary</key>
+			<true/>
 		</dict>
 	</dict>
 </dict>

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -121,10 +121,7 @@ static NSString* const FBUnknownBundleId = @"unknown";
   info[@"name"] = FBValueOrNull(snapshot.wdName);
   info[@"value"] = FBValueOrNull(snapshot.wdValue);
   info[@"label"] = FBValueOrNull(snapshot.wdLabel);
-  // It is mandatory to replace all Infinity values with zeroes to avoid JSON parsing
-  // exceptions like https://github.com/facebook/WebDriverAgent/issues/639#issuecomment-314421206
-  // caused by broken element dimensions returned by XCTest
-  info[@"rect"] = FBwdRectNoInf(snapshot.wdRect);
+  info[@"rect"] = snapshot.wdRect;
   info[@"frame"] = NSStringFromCGRect(snapshot.wdFrame);
   info[@"isEnabled"] = [@([snapshot isWDEnabled]) stringValue];
   info[@"isVisible"] = [@([snapshot isWDVisible]) stringValue];

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m

@@ -22,6 +22,8 @@
 #import "FBElementUtils.h"
 #import "XCTestPrivateSymbols.h"
 
+#define BROKEN_RECT CGRectMake(-1, -1, 0, 0)
+
 @implementation XCUIElement (WebDriverAttributesForwarding)
 
 - (XCElementSnapshot *)fb_snapshotForAttributeName:(NSString *)name
@@ -129,7 +131,14 @@
 
 - (CGRect)wdFrame
 {
-  return CGRectIntegral(self.frame);
+  CGRect frame = self.frame;
+  // It is mandatory to replace all Infinity values with numbers to avoid JSON parsing
+  // exceptions like https://github.com/facebook/WebDriverAgent/issues/639#issuecomment-314421206
+  // caused by broken element dimensions returned by XCTest
+  return (isinf(frame.size.width) || isinf(frame.size.height)
+          || isinf(frame.origin.x) || isinf(frame.origin.y))
+    ? CGRectIntegral(BROKEN_RECT)
+    : CGRectIntegral(frame);
 }
 
 - (BOOL)isWDVisible

package/WebDriverAgentLib/Commands/FBCustomCommands.m

@@ -380,7 +380,8 @@
   // https://developer.apple.com/documentation/foundation/nslocale/1414388-autoupdatingcurrentlocale
   NSString *currentLocale = [[NSLocale autoupdatingCurrentLocale] localeIdentifier];
 
-  return FBResponseWithObject(@{
+  NSMutableDictionary *deviceInfo = [NSMutableDictionary dictionaryWithDictionary:
+  @{
     @"currentLocale": currentLocale,
     @"timeZone": self.timeZone,
     @"name": UIDevice.currentDevice.name,
@@ -394,7 +395,14 @@
 #else
     @"isSimulator": @(NO),
 #endif
-  });
+  }];
+
+  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"11.0")) {
+    // https://developer.apple.com/documentation/foundation/nsprocessinfothermalstate
+    deviceInfo[@"thermalState"] = @(NSProcessInfo.processInfo.thermalState);
+  }
+
+  return FBResponseWithObject(deviceInfo);
 }
 
 /**

package/WebDriverAgentLib/Routing/FBElement.h

@@ -17,10 +17,10 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @protocol FBElement <NSObject>
 
-/*! Element's frame in CGRect format */
+/*! Element's frame in normalized (rounded dimensions without Infinity values) CGRect format */
 @property (nonatomic, readonly, assign) CGRect wdFrame;
 
-/*! Element's frame in NSDictionary format */
+/*! Element's wsFrame in NSDictionary format */
 @property (nonatomic, readonly, copy) NSDictionary *wdRect;
 
 /*! Element's name */

package/WebDriverAgentLib/Routing/FBResponsePayload.m

@@ -107,7 +107,7 @@ inline NSDictionary *FBDictionaryResponseWithElement(XCUIElement *element, BOOL
       } else if ([field isEqualToString:@"text"]) {
         dictionary[field] = FBFirstNonEmptyValue(snapshot.wdValue, snapshot.wdLabel) ?: [NSNull null];
       } else if ([field isEqualToString:@"rect"]) {
-        dictionary[field] = FBwdRectNoInf(snapshot.wdRect);
+        dictionary[field] = snapshot.wdRect;
       } else if ([field isEqualToString:@"enabled"]) {
         dictionary[field] = @(snapshot.wdEnabled);
       } else if ([field isEqualToString:@"displayed"]) {

package/WebDriverAgentLib/Utilities/FBMathUtils.h

@@ -41,6 +41,3 @@ CGPoint FBInvertOffsetForOrientation(CGPoint offset, UIInterfaceOrientation orie
 /*! Inverts size if necessary to match current screen orientation */
 CGSize FBAdjustDimensionsForApplication(CGSize actualSize, UIInterfaceOrientation orientation);
 #endif
-
-/*! Replaces the wdRect dictionary passed as the argument with zero-size wdRect if any of its attributes equal to Infinity */
-NSDictionary<NSString *, NSNumber *> *FBwdRectNoInf(NSDictionary<NSString *, NSNumber *> *wdRect);

package/WebDriverAgentLib/Utilities/FBMathUtils.m

@@ -91,16 +91,3 @@ CGSize FBAdjustDimensionsForApplication(CGSize actualSize, UIInterfaceOrientatio
   return actualSize;
 }
 #endif
-
-NSDictionary<NSString *, NSNumber *> *FBwdRectNoInf(NSDictionary<NSString *, NSNumber *> *wdRect)
-{
-  NSMutableDictionary<NSString *, NSNumber *> *result = wdRect.mutableCopy;
-  if (isinf(result[@"x"].doubleValue) || isinf(result[@"y"].doubleValue) ||
-      isinf(result[@"width"].doubleValue) || isinf(result[@"height"].doubleValue)) {
-    [result setObject:@-1 forKey:@"x"];
-    [result setObject:@-1 forKey:@"y"];
-    [result setObject:@0 forKey:@"width"];
-    [result setObject:@0 forKey:@"height"];
-  }
-  return result.copy;
-}

package/WebDriverAgentLib/Vendor/CocoaAsyncSocket/GCDAsyncSocket.h

@@ -309,12 +309,6 @@ typedef NS_ERROR_ENUM(GCDAsyncSocketErrorDomain, GCDAsyncSocketError) {
  */
 - (BOOL)connectToUrl:(NSURL *)url withTimeout:(NSTimeInterval)timeout error:(NSError **)errPtr;
 
-/**
- * Iterates over the given NetService's addresses in order, and invokes connectToAddress:error:. Stops at the
- * first invocation that succeeds and returns YES; otherwise returns NO.
- */
-- (BOOL)connectToNetService:(NSNetService *)netService error:(NSError **)errPtr;
-
 #pragma mark Disconnecting
 
 /**

package/WebDriverAgentLib/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m

@@ -2581,21 +2581,6 @@ enum GCDAsyncSocketConfig
 	return result;
 }
 
-- (BOOL)connectToNetService:(NSNetService *)netService error:(NSError **)errPtr
-{
-	NSArray* addresses = [netService addresses];
-	for (NSData* address in addresses)
-	{
-		BOOL result = [self connectToAddress:address error:errPtr];
-		if (result)
-		{
-			return YES;
-		}
-	}
-	
-	return NO;
-}
-
 - (void)lookup:(int)aStateIndex didSucceedWithAddress4:(NSData *)address4 address6:(NSData *)address6
 {
 	LogTrace();

package/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPServer.h

@@ -4,17 +4,9 @@
 @class WebSocket;
 
 #if TARGET_OS_IPHONE
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 40000 // iPhone 4.0
-#define IMPLEMENTED_PROTOCOLS <NSNetServiceDelegate>
+#define IMPLEMENTED_PROTOCOLS
 #else
-#define IMPLEMENTED_PROTOCOLS 
-#endif
-#else
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 // Mac OS X 10.6
-#define IMPLEMENTED_PROTOCOLS <NSNetServiceDelegate>
-#else
-#define IMPLEMENTED_PROTOCOLS 
-#endif
+#define IMPLEMENTED_PROTOCOLS
 #endif
 
 
@@ -34,15 +26,7 @@
   Class connectionClass;
   NSString *interface;
   UInt16 port;
-  
-  // NSNetService and related variables
-  NSNetService *netService;
-  NSString *domain;
-  NSString *type;
-  NSString *name;
-  NSString *publishedName;
-  NSDictionary *txtRecordDictionary;
-  
+
   // Connection management
   NSMutableArray *connections;
   NSLock *connectionsLock;
@@ -106,64 +90,6 @@
 - (UInt16)listeningPort;
 - (void)setPort:(UInt16)value;
 
-/**
- * Bonjour domain for publishing the service.
- * The default value is "local.".
- * 
- * Note: Bonjour publishing requires you set a type.
- * 
- * If you change the domain property after the bonjour service has already been published (server already started),
- * you'll need to invoke the republishBonjour method to update the broadcasted bonjour service.
- **/
-- (NSString *)domain;
-- (void)setDomain:(NSString *)value;
-
-/**
- * Bonjour name for publishing the service.
- * The default value is "".
- * 
- * If using an empty string ("") for the service name when registering,
- * the system will automatically use the "Computer Name".
- * Using an empty string will also handle name conflicts
- * by automatically appending a digit to the end of the name.
- * 
- * Note: Bonjour publishing requires you set a type.
- * 
- * If you change the name after the bonjour service has already been published (server already started),
- * you'll need to invoke the republishBonjour method to update the broadcasted bonjour service.
- * 
- * The publishedName method will always return the actual name that was published via the bonjour service.
- * If the service is not running this method returns nil.
- **/
-- (NSString *)name;
-- (NSString *)publishedName;
-- (void)setName:(NSString *)value;
-
-/**
- * Bonjour type for publishing the service.
- * The default value is nil.
- * The service will not be published via bonjour unless the type is set.
- * 
- * If you wish to publish the service as a traditional HTTP server, you should set the type to be "_http._tcp.".
- * 
- * If you change the type after the bonjour service has already been published (server already started),
- * you'll need to invoke the republishBonjour method to update the broadcasted bonjour service.
- **/
-- (NSString *)type;
-- (void)setType:(NSString *)value;
-
-/**
- * Republishes the service via bonjour if the server is running.
- * If the service was not previously published, this method will publish it (if the server is running).
- **/
-- (void)republishBonjour;
-
-/**
- * 
- **/
-- (NSDictionary *)TXTRecordDictionary;
-- (void)setTXTRecordDictionary:(NSDictionary *)dict;
-
 /**
  * Attempts to starts the server on the configured port, interface, etc.
  *