Have tryTest{} work with throwables

Test: NetworkStaticLibTests Change-Id: I9ee52e7d34866c82e169bbecbca3f928bfd79993
2021-11-24 17:34:53 +09:00
parent 2918ada958
commit 28348e43ae
1 changed files with 2 additions and 2 deletions
--- a/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
+++ b/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
@@ -84,7 +84,7 @@ inline class TryExpr<T>(val result: Result<T>) {
    inline infix fun cleanup(block: () -> Unit): T {
        try {
            block()
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
            val originalException = result.exceptionOrNull()
            if (null == originalException) {
                throw e
@@ -101,7 +101,7 @@ inline class TryExpr<T>(val result: Result<T>) {
 fun <T> tryTest(block: () -> T) = TryExpr(
        try {
            Result.success(block())
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
            Result.failure(e)
        })