Fix crash on /enabled and /selected (#353)

appium · Dec 14, 2018 · 94bece3 · 94bece3
1 parent bb340f5
commit 94bece3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...sso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetEnabled.java b/...sso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetEnabled.java
@@ -16,6 +16,8 @@
 
 package io.appium.espressoserver.lib.handlers;
 
+import junit.framework.AssertionFailedError;
+
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.ViewInteraction;
 
@@ -34,7 +36,7 @@ public Boolean handle(AppiumParams params) throws AppiumException {
         try {
             viewInteraction.check(matches(isEnabled()));
             return true;
-        } catch (NoMatchingViewException e) {
+        } catch (NoMatchingViewException | AssertionFailedError e) {
             return false;
         }
     }

diff --git a/...so-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetSelected.java b/...so-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetSelected.java
@@ -16,6 +16,8 @@
 
 package io.appium.espressoserver.lib.handlers;
 
+import junit.framework.AssertionFailedError;
+
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.ViewInteraction;
 
@@ -34,7 +36,7 @@ public Boolean handle(AppiumParams params) throws AppiumException {
         try {
             viewInteraction.check(matches(isSelected()));
             return true;
-        } catch (NoMatchingViewException e) {
+        } catch (NoMatchingViewException | AssertionFailedError e) {
             return false;
         }
     }