appium-espresso-driver 2.13.10 → 2.14.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.14.0](https://github.com/appium/appium-espresso-driver/compare/v2.13.11...v2.14.0) (2023-01-13)
+
+
+### Features
+
+* Add compose element screenshot ([#847](https://github.com/appium/appium-espresso-driver/issues/847)) ([95bded7](https://github.com/appium/appium-espresso-driver/commit/95bded7e1816eb42ded501efcbca24b07b283f35))
+
+## [2.13.11](https://github.com/appium/appium-espresso-driver/compare/v2.13.10...v2.13.11) (2023-01-13)
+
+
+### Miscellaneous Chores
+
+* **deps-dev:** bump rimraf from 3.0.2 to 4.0.4 ([#848](https://github.com/appium/appium-espresso-driver/issues/848)) ([cf06466](https://github.com/appium/appium-espresso-driver/commit/cf064663eea2b3ffd7a02e2ba5dec3bffb4f9e53))
+
 ## [2.13.10](https://github.com/appium/appium-espresso-driver/compare/v2.13.9...v2.13.10) (2023-01-12)
 
 

package/README.md

@@ -202,6 +202,7 @@ In order to change between subdrivers use the [driver](#settings-api) setting. S
 - getPageSource: The returned page source is retrieved from Compose and all elements there contain [Compose-specific](#compose-element-attributes) attributes.
 - click, isDisplayed, isEnabled, clear, getText, sendKeys, getElementRect, getValue, isSelected: These commands should properly support compose elements.
 - getAttribute: Accepts and returns Compose-specific element attributes. See [Compose Element Attributes](#compose-element-attributes) for the full list of supported Compose element attributes.
+- getElementScreenshot: Fetches a screenshot of the given Compose element. Available since driver version *2.14.0*
 
 Calling other driver element-specific APIs not listed above would most likely throw an exception as Compose and Espresso elements are being stored in completely separated internal caches and must not be mixed.
 

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/ElementScreenshot.kt

@@ -16,16 +16,17 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
-import io.appium.espressoserver.lib.helpers.ScreenshotsHelper
+import io.appium.espressoserver.lib.helpers.getNodeInteractionById
+import io.appium.espressoserver.lib.helpers.takeComposeNodeScreenshot
+import io.appium.espressoserver.lib.helpers.takeEspressoViewScreenshot
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.EspressoElement
 
 class ElementScreenshot : RequestHandler<AppiumParams, String> {
 
-    @Throws(AppiumException::class)
-    override fun handleInternal(params: AppiumParams): String {
-        val view = EspressoElement.getCachedViewStateById(params.elementId).view
-        return ScreenshotsHelper(view).screenshot
-    }
+    override fun handleEspresso(params: AppiumParams): String =
+        takeEspressoViewScreenshot(EspressoElement.getCachedViewStateById(params.elementId).view)
+
+    override fun handleCompose(params: AppiumParams): String =
+        takeComposeNodeScreenshot(getNodeInteractionById(params.elementId!!))
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/ScreenshotHandler.kt

@@ -16,14 +16,9 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
-import io.appium.espressoserver.lib.helpers.ScreenshotsHelper
+import io.appium.espressoserver.lib.helpers.takeScreenshot
 import io.appium.espressoserver.lib.model.AppiumParams
 
 class ScreenshotHandler : RequestHandler<AppiumParams, String> {
-
-    @Throws(AppiumException::class)
-    override fun handleInternal(params: AppiumParams): String {
-        return ScreenshotsHelper().screenshot
-    }
+    override fun handleInternal(params: AppiumParams): String = takeScreenshot()
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/exceptions/ScreenCaptureException.kt

@@ -19,7 +19,11 @@ package io.appium.espressoserver.lib.handlers.exceptions
 import fi.iki.elonen.NanoHTTPD
 
 
-class ScreenCaptureException(reason: String) : AppiumException(reason) {
+class ScreenCaptureException : AppiumException {
+    constructor(reason: String) : super(reason)
+
+    constructor(reason: String, e: Throwable) : super(reason, e)
+
     override fun error(): String {
         return "unable to capture screen"
     }

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

@@ -0,0 +1,59 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.appium.espressoserver.lib.helpers
+
+import android.graphics.Bitmap
+import android.util.Base64
+import android.view.View
+import androidx.compose.ui.graphics.asAndroidBitmap
+import androidx.compose.ui.test.SemanticsNodeInteraction
+import androidx.compose.ui.test.captureToImage
+
+import java.io.ByteArrayOutputStream
+import androidx.test.runner.screenshot.Screenshot
+import io.appium.espressoserver.lib.handlers.exceptions.ScreenCaptureException
+
+private fun encodeBitmap(bitmap: Bitmap?, targetNameSupplier: () -> String): String {
+    if (bitmap == null || bitmap.height == 0 || bitmap.width == 0) {
+        throw ScreenCaptureException("Cannot capture a shot of the ${targetNameSupplier()}. " +
+                "Make sure none of the currently visible " +
+                "views have FLAG_SECURE set and that it is possible to take a screenshot manually")
+    }
+    val outputStream = ByteArrayOutputStream()
+    bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream)
+    return Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP)
+}
+
+fun takeScreenshot(): String {
+    return encodeBitmap(Screenshot.capture().bitmap) { "current screen" }
+}
+
+fun takeEspressoViewScreenshot(view: View): String =
+    try {
+        encodeBitmap(Screenshot.capture(view).bitmap) { view.javaClass.name }
+    } catch (e: RuntimeException) {
+        throw ScreenCaptureException("Cannot take a screenshot of a view", e)
+    }
+
+fun takeComposeNodeScreenshot(nodeInteraction: SemanticsNodeInteraction): String =
+    try {
+        encodeBitmap(
+            nodeInteraction.captureToImage().asAndroidBitmap()
+        ) { nodeInteraction.fetchSemanticsNode().toString() }
+    } catch (e: RuntimeException) {
+        throw ScreenCaptureException("Cannot take a screenshot of a node", e)
+    }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-espresso-driver",
-  "version": "2.13.10",
+  "version": "2.14.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-espresso-driver",
-      "version": "2.13.10",
+      "version": "2.14.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.4.3",
@@ -46,7 +46,7 @@
         "lint-staged": "^13.0.3",
         "mocha": "^10.0.0",
         "pre-commit": "^1.2.2",
-        "rimraf": "^3.0.2",
+        "rimraf": "^4.0.4",
         "semantic-release": "^19.0.2",
         "sinon": "^15.0.0",
         "webdriverio": "^8.0.2",
@@ -250,6 +250,55 @@
         "node": ">=10"
       }
     },
+    "node_modules/@appium/support/node_modules/rimraf": {
+      "version": "3.0.2",
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@appium/support/node_modules/rimraf/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@appium/support/node_modules/rimraf/node_modules/glob": {
+      "version": "7.2.3",
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@appium/support/node_modules/rimraf/node_modules/minimatch": {
+      "version": "3.1.2",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/@appium/support/node_modules/semver": {
       "version": "7.3.8",
       "license": "ISC",
@@ -1189,7 +1238,7 @@
       "license": "MIT"
     },
     "node_modules/appium-adb": {
-      "version": "9.10.21",
+      "version": "9.10.22",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/support": "^3.0.0",
@@ -1246,7 +1295,7 @@
       "license": "ISC"
     },
     "node_modules/appium-android-driver": {
-      "version": "5.8.7",
+      "version": "5.8.8",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
@@ -1312,7 +1361,7 @@
       "license": "ISC"
     },
     "node_modules/appium-chromedriver": {
-      "version": "5.2.13",
+      "version": "5.2.14",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -3795,19 +3844,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "funding": [
@@ -4725,6 +4761,38 @@
             "brace-expansion": "^2.0.1"
           }
         },
+        "rimraf": {
+          "version": "3.0.2",
+          "requires": {
+            "glob": "^7.1.3"
+          },
+          "dependencies": {
+            "brace-expansion": {
+              "version": "1.1.11",
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "glob": {
+              "version": "7.2.3",
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "minimatch": {
+              "version": "3.1.2",
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            }
+          }
+        },
         "semver": {
           "version": "7.3.8",
           "requires": {
@@ -5368,7 +5436,7 @@
       "version": "1.1.0"
     },
     "appium-adb": {
-      "version": "9.10.21",
+      "version": "9.10.22",
       "requires": {
         "@appium/support": "^3.0.0",
         "@babel/runtime": "^7.0.0",
@@ -5408,7 +5476,7 @@
       }
     },
     "appium-android-driver": {
-      "version": "5.8.7",
+      "version": "5.8.8",
       "requires": {
         "@babel/runtime": "^7.0.0",
         "appium-adb": "^9.10.9",
@@ -5454,7 +5522,7 @@
       }
     },
     "appium-chromedriver": {
-      "version": "5.2.13",
+      "version": "5.2.14",
       "requires": {
         "@appium/base-driver": "^9.1.0",
         "@appium/support": "^3.0.0",
@@ -7058,12 +7126,6 @@
         "signal-exit": "^3.0.2"
       }
     },
-    "rimraf": {
-      "version": "3.0.2",
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
     "safe-buffer": {
       "version": "5.2.1"
     },

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "2.13.10",
+  "version": "2.14.0",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -121,7 +121,7 @@
     "lint-staged": "^13.0.3",
     "mocha": "^10.0.0",
     "pre-commit": "^1.2.2",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.0.4",
     "semantic-release": "^19.0.2",
     "sinon": "^15.0.0",
     "webdriverio": "^8.0.2",

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

@@ -1,59 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.appium.espressoserver.lib.helpers
-
-import android.graphics.Bitmap
-import android.util.Base64
-import android.view.View
-
-import java.io.ByteArrayOutputStream
-import androidx.test.runner.screenshot.Screenshot
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
-import io.appium.espressoserver.lib.handlers.exceptions.ElementNotVisibleException
-import io.appium.espressoserver.lib.handlers.exceptions.ScreenCaptureException
-import io.appium.espressoserver.lib.model.ViewElement
-
-class ScreenshotsHelper @JvmOverloads constructor(private val view: View? = null) {
-
-    /**
-     * Makes a screenshot of the particular view.
-     *
-     * @return the screenshot of the view as base-64 encoded string.
-     * @throws ElementNotVisibleException if the view has no visible area.
-     * @throws ScreenCaptureException if it is impossible to take a screenshot.
-     */
-    val screenshot: String
-        @Throws(AppiumException::class)
-        get() {
-            if (view != null && ViewElement(view).bounds.isEmpty) {
-                throw ElementNotVisibleException(
-                        String.format("Cannot get a screenshot of the invisible %s", view.javaClass.name))
-            }
-
-            val screenCap = if (view == null) Screenshot.capture() else Screenshot.capture(view)
-            val bitmapScreenCap = screenCap.bitmap
-            if (bitmapScreenCap == null || bitmapScreenCap.height == 0 || bitmapScreenCap.width == 0) {
-                throw ScreenCaptureException("Cannot capture a shot of the " +
-                        "${if (view == null) "current screen" else view.javaClass.name}. " +
-                        "Make sure none of the currently visible " +
-                        "views have FLAG_SECURE set and that it is possible to take a screenshot manually")
-            }
-            val outputStream = ByteArrayOutputStream()
-            bitmapScreenCap.compress(Bitmap.CompressFormat.PNG, 100, outputStream)
-            return Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP)
-        }
-}