appium-espresso-driver 2.13.2 → 2.13.4

package/CHANGELOG.md

@@ -0,0 +1,25 @@
+## [2.13.4](https://github.com/appium/appium-espresso-driver/compare/v2.13.3...v2.13.4) (2022-11-06)
+
+## [1.0.0-beta.3](https://github.com/appium/appium-espresso-driver/compare/v1.0.0-beta.2...v1.0.0-beta.3) (2017-06-16)
+
+### Changes
+* Fix: 	Throws exception if element is stale (#56)
+* Feature: Add text attribute to source xml (#52)
+* Feature: Implemented the /element/:elementId/text endpoint (#53)
+* Feature: Can match list of XPaths instead of just one (#54) 
+* Feature: Added handler for /elements endpoint (#55)
+
+
+## [1.0.0-beta.2](https://github.com/appium/appium-espresso-driver/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2017-06-09)
+
+### Changes
+* Fix: Sanitize XML inputs. Bad characters and tag names were breaking the XML (#50)
+
+## [1.0.0-beta.1](https://github.com/appium/appium-espresso-driver/compare/7a309d3...v1.0.0-beta.1) (2017-06-08)
+
+### Changes
+* Feature: Implemented NanoHTTPD Java server that runs inside of Android and follows the MJSONWP standard
+* Feature: Implemented NodeJS driver that launches the Java server and proxies requests to that server
+* Feature: Can locate elements with the selector strategies xpath, class, id, text, accessibility id
+* Feature: Created /session, /status, /source, /screenshot, /back endpoints
+* Feature: Added handling for every MJSONWP endpoint, return NotYetImplemented for unimplemented handlers

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/helpers/ComposeNodeFinder.kt

@@ -26,6 +26,7 @@ import io.appium.espressoserver.lib.handlers.exceptions.StaleElementException
 import io.appium.espressoserver.lib.model.Locator
 import io.appium.espressoserver.lib.model.SourceDocument
 import io.appium.espressoserver.lib.model.AttributesEnum
+import io.appium.espressoserver.lib.model.compileXpathExpression
 import io.appium.espressoserver.lib.viewmatcher.fetchIncludedAttributes
 
 /**
@@ -63,9 +64,12 @@ fun semanticsMatcherForLocator(locator: Locator): SemanticsMatcher =
     }
 
 private fun hasXpath(locator: Locator): SemanticsMatcher {
+    val xpath = locator.value!!
+    val expression = compileXpathExpression(xpath)
+    val attributes = fetchIncludedAttributes(xpath)
     val matchingIds = SourceDocument(
-        locator.elementId?.let { getSemanticsNode(it) }, fetchIncludedAttributes(locator.value!!)
-    ).matchingNodeIds(locator.value!!, AttributesEnum.RESOURCE_ID.toString())
+        locator.elementId?.let { getSemanticsNode(it) }, attributes
+    ).findMatchingNodeIds(expression, AttributesEnum.RESOURCE_ID.toString())
 
     return SemanticsMatcher("Matches Xpath ${locator.value}") {
         matchingIds.contains(it.id)

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/model/SourceDocument.kt

@@ -80,6 +80,12 @@ private fun toXmlNodeName(className: String?): String {
     return fixedName
 }
 
+fun compileXpathExpression(selector: String): XPathExpression =
+    try {
+        XPATH.compile(selector)
+    } catch (xe: XPathExpressionException) {
+        throw XPathLookupException(selector, xe.message!!)
+    }
 
 class SourceDocument constructor(
     private val root: Any? = null,
@@ -324,8 +330,8 @@ class SourceDocument constructor(
         throw AppiumException(lastError!!)
     }
 
-    private fun rootSemanticNodes(): List<SemanticsNode> {
-        return try {
+    private fun rootSemanticNodes(): List<SemanticsNode> =
+        try {
             listOf(EspressoServerRunnerTest.composeTestRule.onRoot(useUnmergedTree = true).fetchSemanticsNode())
         } catch (e: AssertionError) {
 //            Ideally there should be on `root` node but on some cases e.g:overlays screen, there can be more than 1 root.
@@ -337,7 +343,6 @@ class SourceDocument constructor(
             } as SelectionResult
             result.selectedNodes
         }
-    }
 
     private fun performCleanup() {
         tmpXmlName?.let {
@@ -346,8 +351,8 @@ class SourceDocument constructor(
         }
     }
 
-    fun toXMLString(): String {
-        return RESOURCES_GUARD.withPermit({
+    fun toXMLString(): String =
+        RESOURCES_GUARD.withPermit({
             toStream().use { xmlStream ->
                 val sb = StringBuilder()
                 val reader = BufferedReader(InputStreamReader(xmlStream, XML_ENCODING))
@@ -359,24 +364,17 @@ class SourceDocument constructor(
                 sb.toString()
             }
         }, { performCleanup() })
-    }
 
-    fun findViewsByXPath(xpathSelector: String): List<View> =
-        matchingNodeIds(xpathSelector, VIEW_INDEX).map { viewMap.get(it) }
+    fun findViewsByXPath(expression: XPathExpression): List<View> =
+        findMatchingNodeIds(expression, VIEW_INDEX).map { viewMap.get(it) }
 
-    fun matchingNodeIds(xpathSelector: String, attributeName: String): List<Int> {
-        val expr = try {
-            XPATH.compile(xpathSelector)
-        } catch (xe: XPathExpressionException) {
-            throw XPathLookupException(xpathSelector, xe.message!!)
-        }
-        return RESOURCES_GUARD.withPermit({
+    fun findMatchingNodeIds(expression: XPathExpression, attributeName: String): List<Int> =
+        RESOURCES_GUARD.withPermit({
             toStream().use { xmlStream ->
-                val list = expr.evaluate(InputSource(xmlStream), XPathConstants.NODESET) as NodeList
+                val list = expression.evaluate(InputSource(xmlStream), XPathConstants.NODESET) as NodeList
                 (0 until list.length).map { index ->
                     list.item(index).attributes.getNamedItem(attributeName).nodeValue.toInt()
                 }
             }
         }, { performCleanup() })
-    }
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/viewmatcher/WithXPath.kt

@@ -16,12 +16,15 @@
 package io.appium.espressoserver.lib.viewmatcher
 
 import android.view.View
+import io.appium.espressoserver.lib.helpers.extensions.withPermit
 import io.appium.espressoserver.lib.model.SourceDocument
 import io.appium.espressoserver.lib.model.AttributesEnum
 import io.appium.espressoserver.lib.model.EspressoAttributes
+import io.appium.espressoserver.lib.model.compileXpathExpression
 import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.TypeSafeMatcher
+import java.util.concurrent.Semaphore
 
 fun fetchIncludedAttributes(xpath: String): Set<AttributesEnum>? {
     if (xpath.contains("@*")) {
@@ -37,13 +40,24 @@ fun fetchIncludedAttributes(xpath: String): Set<AttributesEnum>? {
 }
 
 fun withXPath(root: View?, xpath: String, index: Int? = null): Matcher<View> {
+    val expression = compileXpathExpression(xpath)
+    val attributes = fetchIncludedAttributes(xpath)
     val matchedXPathViews = mutableListOf<View>()
+    var didLookup = false
+    val lookupGuard = Semaphore(1)
     return object : TypeSafeMatcher<View>() {
         override fun matchesSafely(item: View): Boolean {
+            lookupGuard.withPermit {
+                if (!didLookup) {
+                    matchedXPathViews.addAll(
+                        SourceDocument(root ?: item.rootView, attributes).findViewsByXPath(expression)
+                    )
+                    didLookup = true
+                }
+            }
+
             if (matchedXPathViews.isEmpty()) {
-                matchedXPathViews.addAll(
-                    SourceDocument(root ?: item.rootView, fetchIncludedAttributes(xpath)).findViewsByXPath(xpath)
-                )
+                return false
             }
 
             return if (index != null) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-espresso-driver",
-  "version": "2.13.2",
+  "version": "2.13.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-espresso-driver",
-      "version": "2.13.2",
+      "version": "2.13.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.4.3",
@@ -28,6 +28,7 @@
         "@babel/plugin-transform-runtime": "^7.18.10",
         "@babel/preset-env": "^7.18.10",
         "@babel/register": "^7.18.9",
+        "@semantic-release/changelog": "^6.0.1",
         "@semantic-release/git": "^10.0.1",
         "@xmldom/xmldom": "^0.x",
         "android-apidemos": "^4.1.1",
@@ -92,6 +93,11 @@
         "npm": ">=8"
       }
     },
+    "node_modules/@appium/base-driver/node_modules/async-lock": {
+      "version": "1.3.2",
+      "extraneous": true,
+      "license": "MIT"
+    },
     "node_modules/@appium/base-plugin": {
       "version": "1.10.5",
       "extraneous": true,
@@ -304,7 +310,7 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.20.0",
+      "version": "7.20.2",
       "extraneous": true,
       "license": "MIT",
       "bin": {
@@ -315,7 +321,7 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.20.0",
+      "version": "7.20.1",
       "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.13.10"
@@ -1000,7 +1006,7 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.11.7",
+      "version": "18.11.9",
       "license": "MIT"
     },
     "node_modules/@types/normalize-package-data": {
@@ -1116,7 +1122,7 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.3",
+      "version": "0.8.6",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -1466,7 +1472,7 @@
       "license": "MIT"
     },
     "node_modules/async-lock": {
-      "version": "1.3.2",
+      "version": "1.4.0",
       "license": "MIT"
     },
     "node_modules/asyncbox": {
@@ -2755,7 +2761,7 @@
       }
     },
     "node_modules/io.appium.settings": {
-      "version": "4.2.2",
+      "version": "4.2.3",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=14",
@@ -3356,7 +3362,7 @@
       }
     },
     "node_modules/marked": {
-      "version": "4.1.1",
+      "version": "4.2.2",
       "extraneous": true,
       "license": "MIT",
       "bin": {
@@ -5227,6 +5233,12 @@
         "source-map-support": "0.5.21",
         "type-fest": "3.1.0",
         "validate.js": "0.13.1"
+      },
+      "dependencies": {
+        "async-lock": {
+          "version": "1.3.2",
+          "extraneous": true
+        }
       }
     },
     "@appium/base-plugin": {
@@ -5383,11 +5395,11 @@
       }
     },
     "@babel/parser": {
-      "version": "7.20.0",
+      "version": "7.20.2",
       "extraneous": true
     },
     "@babel/runtime": {
-      "version": "7.20.0",
+      "version": "7.20.1",
       "requires": {
         "regenerator-runtime": "^0.13.10"
       }
@@ -5863,7 +5875,7 @@
       }
     },
     "@types/node": {
-      "version": "18.11.7"
+      "version": "18.11.9"
     },
     "@types/normalize-package-data": {
       "version": "2.4.1"
@@ -5949,7 +5961,7 @@
       }
     },
     "@xmldom/xmldom": {
-      "version": "0.8.3"
+      "version": "0.8.6"
     },
     "accepts": {
       "version": "1.3.8",
@@ -6200,7 +6212,7 @@
       "version": "3.2.4"
     },
     "async-lock": {
-      "version": "1.3.2"
+      "version": "1.4.0"
     },
     "asyncbox": {
       "version": "2.9.2",
@@ -7035,7 +7047,7 @@
       }
     },
     "io.appium.settings": {
-      "version": "4.2.2"
+      "version": "4.2.3"
     },
     "ipaddr.js": {
       "version": "1.9.1",
@@ -7425,7 +7437,7 @@
       "requires": {}
     },
     "marked": {
-      "version": "4.1.1",
+      "version": "4.2.2",
       "extraneous": true
     },
     "mdurl": {

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "2.13.2",
+  "version": "2.13.4",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -57,7 +57,8 @@
     "espresso-server/build.gradle.kts",
     "espresso-server/settings.gradle.kts",
     "espresso-server/lint.xml",
-    "!.DS_Store"
+    "!.DS_Store",
+    "CHANGELOG.md"
   ],
   "dependencies": {
     "@babel/runtime": "^7.4.3",
@@ -103,6 +104,7 @@
     "@babel/preset-env": "^7.18.10",
     "@babel/register": "^7.18.9",
     "@semantic-release/git": "^10.0.1",
+    "@semantic-release/changelog": "^6.0.1",
     "@xmldom/xmldom": "^0.x",
     "babel-plugin-source-map-support": "^2.2.0",
     "android-apidemos": "^4.1.1",