appium-webdriveragent 4.7.0 → 4.8.2

package/WebDriverAgentTests/UnitTests/FBXPathTests.m

@@ -12,6 +12,8 @@
 #import "FBXPath.h"
 #import "FBXPath-Private.h"
 #import "XCUIElementDouble.h"
+#import "XCElementSnapshotDouble.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 
 @interface FBXPathTests : XCTestCase
 @end
@@ -30,11 +32,11 @@
   xmlChar *xmlbuff;
   int rc = xmlTextWriterStartDocument(writer, NULL, "UTF-8", NULL);
   if (rc >= 0) {
-    rc = [FBXPath xmlRepresentationWithRootElement:(XCElementSnapshot *)element
-                                                writer:writer
-                                          elementStore:elementStore
-                                                 query:query
-                                   excludingAttributes:excludedAttributes];
+    rc = [FBXPath xmlRepresentationWithRootElement:element
+                                            writer:writer
+                                      elementStore:elementStore
+                                             query:query
+                               excludingAttributes:excludedAttributes];
     if (rc >= 0) {
       rc = xmlTextWriterEndDocument(writer);
     }
@@ -55,7 +57,8 @@
 
 - (void)testDefaultXPathPresentation
 {
-  XCUIElementDouble *element = [XCUIElementDouble new];
+  XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
+  id<FBElement> element = (id<FBElement>)[FBXCElementSnapshotWrapper ensureWrapped:(id)snapshot];
   NSString *resultXml = [self xmlStringWithElement:element
                                         xpathQuery:nil
                                excludingAttributes:nil];
@@ -66,7 +69,8 @@
 
 - (void)testtXPathPresentationWithSomeAttributesExcluded
 {
-  XCUIElementDouble *element = [XCUIElementDouble new];
+  XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
+  id<FBElement> element = (id<FBElement>)[FBXCElementSnapshotWrapper ensureWrapped:(id)snapshot];
   NSString *resultXml = [self xmlStringWithElement:element
                                         xpathQuery:nil
                                excludingAttributes:@[@"type", @"visible", @"value", @"index"]];
@@ -77,8 +81,9 @@
 
 - (void)testXPathPresentationBasedOnQueryMatchingAllAttributes
 {
-  XCUIElementDouble *element = [XCUIElementDouble new];
-  element.wdValue = @"йоло<>&\"";
+  XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
+  snapshot.value = @"йоло<>&\"";
+  id<FBElement> element = (id<FBElement>)[FBXCElementSnapshotWrapper ensureWrapped:(id)snapshot];
   NSString *resultXml = [self xmlStringWithElement:element
                                         xpathQuery:[NSString stringWithFormat:@"//%@[@*]", element.wdType]
                                excludingAttributes:@[@"visible"]];
@@ -89,7 +94,8 @@
 
 - (void)testXPathPresentationBasedOnQueryMatchingSomeAttributes
 {
-  XCUIElementDouble *element = [XCUIElementDouble new];
+  XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
+  id<FBElement> element = (id<FBElement>)[FBXCElementSnapshotWrapper ensureWrapped:(id)snapshot];
   NSString *resultXml = [self xmlStringWithElement:element
                                         xpathQuery:[NSString stringWithFormat:@"//%@[@%@ and contains(@%@, 'blabla')]", element.wdType, @"value", @"name"]
                                excludingAttributes:nil];
@@ -104,11 +110,12 @@
 
   xmlTextWriterPtr writer = xmlNewTextWriterDoc(&doc, 0);
   NSMutableDictionary *elementStore = [NSMutableDictionary dictionary];
-  XCUIElementDouble *root = [XCUIElementDouble new];
+  XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
+  id<FBElement> root = (id<FBElement>)[FBXCElementSnapshotWrapper ensureWrapped:(id)snapshot];
   NSString *query = [NSString stringWithFormat:@"//%@", root.wdType];
   int rc = xmlTextWriterStartDocument(writer, NULL, "UTF-8", NULL);
   if (rc >= 0) {
-    rc = [FBXPath xmlRepresentationWithRootElement:(XCElementSnapshot *)root
+    rc = [FBXPath xmlRepresentationWithRootElement:root
                                             writer:writer
                                       elementStore:elementStore
                                              query:query
@@ -130,7 +137,8 @@
     XCTAssertNotEqual(NULL, queryResult);
   }
 
-  NSArray *matchingSnapshots = [FBXPath collectMatchingSnapshots:queryResult->nodesetval elementStore:elementStore];
+  NSArray *matchingSnapshots = [FBXPath collectMatchingSnapshots:queryResult->nodesetval
+                                                    elementStore:elementStore];
   xmlXPathFreeObject(queryResult);
   xmlFreeTextWriter(writer);
   xmlFreeDoc(doc);

package/WebDriverAgentTests/UnitTests/NSPredicateFBFormatTests.m

@@ -9,7 +9,6 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FBPredicate.h"
 #import "NSPredicate+FBFormat.h"
 
 @interface NSPredicateFBFormatTests : XCTestCase
@@ -37,7 +36,7 @@
 
 - (void)testFormattingForComplexExpression
 {
-  NSPredicate *expr = [NSPredicate predicateWithFormat:@"visible == 1 AND type == 'blabla'"];
+  NSPredicate *expr = [NSPredicate predicateWithFormat:@"visible == 1 AND NOT (type == 'blabla' OR NOT (label IN {'3', '4'}))"];
   XCTAssertNotNil([NSPredicate fb_formatSearchPredicate:expr]);
 }
 
@@ -65,10 +64,10 @@
   XCTAssertThrows([NSPredicate fb_formatSearchPredicate:expr]);
 }
 
-- (void)testFormattingFBPredicate
+- (void)testBlockPredicateCreation
 {
-  NSPredicate *predicate = [FBPredicate predicateWithFormat:@"visible == 1"];
-  XCTAssertNotNil([NSPredicate fb_formatSearchPredicate:predicate]);
+  NSPredicate *expr = [NSPredicate predicateWithFormat:@"rect.x == '0'"];
+  XCTAssertNotNil([NSPredicate fb_snapshotBlockPredicateWithPredicate:expr]);
 }
 
 @end

package/package.json

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

package/WebDriverAgentLib/Categories/XCAccessibilityElement+FBComparison.h

@@ -1,27 +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 "XCAccessibilityElement.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface XCAccessibilityElement (FBComparison)
-
-/**
- Compares two XCAccessibilityElement instances
-
- @param other the other element instance
- @return YES if both elements are equal
- */
-- (BOOL)fb_isEqualToElement:(nullable XCAccessibilityElement *)other;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCElementSnapshot+FBHitPoint.m

@@ -1,29 +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 "XCElementSnapshot+FBHitPoint.h"
-
-#import "FBLogger.h"
-#import "XCUIHitPointResult.h"
-#import "XCElementSnapshot+FBHelpers.h"
-
-@implementation XCElementSnapshot (FBHitPoint)
-
-- (NSValue *)fb_hitPoint
-{
-  NSError *error;
-  XCUIHitPointResult *result = [self hitPoint:&error];
-  if (nil != error) {
-    [FBLogger logFmt:@"Failed to fetch hit point for %@ - %@", self.fb_description, error.localizedDescription];
-    return nil;
-  }
-  return [NSValue valueWithCGPoint:result.hitPoint];
-}
-
-@end

package/WebDriverAgentLib/Utilities/FBPredicate.h

@@ -1,28 +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 <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- HACK!!!
- This is hacky predicate that will force XCTest to evaluate whole XCElementSnapshot.
- Of course we should aim not to use this, but it buys us some time.
-*/
-@interface FBPredicate : NSPredicate
-
-+ (NSPredicate *)predicateWithFormat:(NSString *)predicateFormat,  ...;
-
-/*! Predicate string attached to original predicate to force resolve it in XCTest */
-+ (NSString *)forceResolvePredicateString;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/FBPredicate.m

@@ -1,29 +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 "FBPredicate.h"
-
-@implementation FBPredicate
-
-+ (NSPredicate *)predicateWithFormat:(NSString *)predicateFormat,  ...
-{
-  va_list args;
-  va_start(args, predicateFormat);
-  NSPredicate *predicate = [NSPredicate predicateWithFormat:predicateFormat arguments:args];
-  va_end(args);
-  NSPredicate *hackPredicate = [NSPredicate predicateWithFormat:self.forceResolvePredicateString];
-  return [NSCompoundPredicate andPredicateWithSubpredicates:@[predicate, hackPredicate]];
-}
-
-+ (NSString *)forceResolvePredicateString
-{
-  return @"1 == 1 or identifier == 0 or frame == 0 or value == 0 or title == 0 or label == 0 or elementType == 0 or enabled == 0 or placeholderValue == 0 or selected == 0";
-}
-
-@end