fix catch block

QAutomatron · Jul 7, 2020 · 70a27ed · 70a27ed
1 parent 88b4a57
commit 70a27ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'digital.wup.android-maven-publish' version '3.6.3'
 }
 
-version = "0.6.5"
+version = "0.6.6"
 
 android {
     compileSdkVersion 29

diff --git a/library/src/main/java/com/qautomatron/kopi/library/wait/ViewMatcherWaiter.kt b/library/src/main/java/com/qautomatron/kopi/library/wait/ViewMatcherWaiter.kt
@@ -46,13 +46,10 @@ class ViewMatcherWaiter constructor(val viewMatcher: Matcher<View>, val inRoot:
                 return try {
                     onView(viewMatcher).inRoot(inRoot).check(matches(viewChecker))
                     true
-                } catch (e: Exception) {
-                    when(e) {
-                        is AssertionError, is NoMatchingViewException -> {
-                            return false
-                        }
-                        else -> throw e
-                    }
+                } catch (e: AssertionError) {
+                    false
+                } catch (e: NoMatchingViewException) {
+                    false
                 }
             }
         })
@@ -70,13 +67,10 @@ class ViewMatcherWaiter constructor(val viewMatcher: Matcher<View>, val inRoot:
                 return try {
                     onView(viewMatcher).inRoot(inRoot).check(viewAssertion)
                     true
-                } catch (e: Exception) {
-                    when(e) {
-                        is AssertionError, is NoMatchingViewException -> {
-                            return false
-                        }
-                        else -> throw e
-                    }
+                } catch (e: AssertionError) {
+                    false
+                } catch (e: NoMatchingViewException) {
+                    false
                 }
             }
         })