appium-webdriveragent 3.15.0 → 3.17.0

package/WebDriverAgentTests/UnitTests/FBXPathTests.m

@@ -28,18 +28,24 @@
   NSMutableDictionary *elementStore = [NSMutableDictionary dictionary];
   int buffersize;
   xmlChar *xmlbuff;
-  int rc = [FBXPath xmlRepresentationWithRootElement:(XCElementSnapshot *)element
-                                              writer:writer
-                                        elementStore:elementStore
-                                               query:query
-                                 excludingAttributes:excludedAttributes];
-  if (0 == rc) {
+  int rc = xmlTextWriterStartDocument(writer, NULL, "UTF-8", NULL);
+  if (rc >= 0) {
+    rc = [FBXPath xmlRepresentationWithRootElement:(XCElementSnapshot *)element
+                                                writer:writer
+                                          elementStore:elementStore
+                                                 query:query
+                                   excludingAttributes:excludedAttributes];
+    if (rc >= 0) {
+      rc = xmlTextWriterEndDocument(writer);
+    }
+  }
+  if (rc >= 0) {
     xmlDocDumpFormatMemory(doc, &xmlbuff, &buffersize, 1);
   }
   xmlFreeTextWriter(writer);
   xmlFreeDoc(doc);
   
-  XCTAssertEqual(rc, 0);
+  XCTAssertTrue(rc >= 0);
   XCTAssertEqual(1, [elementStore count]);
 
   NSString *result = [NSString stringWithCString:(const char *)xmlbuff encoding:NSUTF8StringEncoding];
@@ -72,12 +78,13 @@
 - (void)testXPathPresentationBasedOnQueryMatchingAllAttributes
 {
   XCUIElementDouble *element = [XCUIElementDouble new];
+  element.wdValue = @"йоло<>&\"";
   NSString *resultXml = [self xmlStringWithElement:element
                                         xpathQuery:[NSString stringWithFormat:@"//%@[@*]", element.wdType]
                                excludingAttributes:@[@"visible"]];
   NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" value=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\" private_indexPath=\"top\"/>\n",
-                           element.wdType, element.wdType, element.wdValue, element.wdName, element.wdLabel,  element.wdEnabled ? @"true" : @"false", element.wdVisible ? @"true" : @"false", element.wdAccessible ? @"true" : @"false", element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex];
-  XCTAssertTrue([resultXml isEqualToString: expectedXml]);
+                           element.wdType, element.wdType, @"йоло&lt;&gt;&amp;&quot;", element.wdName, element.wdLabel,  element.wdEnabled ? @"true" : @"false", element.wdVisible ? @"true" : @"false", element.wdAccessible ? @"true" : @"false", element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex];
+  XCTAssertTrue([resultXml isEqualToString:expectedXml]);
 }
 
 - (void)testXPathPresentationBasedOnQueryMatchingSomeAttributes
@@ -99,15 +106,21 @@
   NSMutableDictionary *elementStore = [NSMutableDictionary dictionary];
   XCUIElementDouble *root = [XCUIElementDouble new];
   NSString *query = [NSString stringWithFormat:@"//%@", root.wdType];
-  int rc = [FBXPath xmlRepresentationWithRootElement:(XCElementSnapshot *)root
-                                              writer:writer
-                                        elementStore:elementStore
-                                               query:query
-                                 excludingAttributes:nil];
+  int rc = xmlTextWriterStartDocument(writer, NULL, "UTF-8", NULL);
+  if (rc >= 0) {
+    rc = [FBXPath xmlRepresentationWithRootElement:(XCElementSnapshot *)root
+                                            writer:writer
+                                      elementStore:elementStore
+                                             query:query
+                               excludingAttributes:nil];
+    if (rc >= 0) {
+      rc = xmlTextWriterEndDocument(writer);
+    }
+  }
   if (rc < 0) {
     xmlFreeTextWriter(writer);
     xmlFreeDoc(doc);
-    XCTAssertEqual(rc, 0);
+    XCTFail(@"Unable to create the source XML document");
   }
 
   xmlXPathObjectPtr queryResult = [FBXPath evaluate:query document:doc];

package/package.json

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