instrument: check for encrypt/sign status icons

1 files changed, 13 insertions, 17 deletions

diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/CustomMatchers.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/CustomMatchers.java
index abfe4d04d..6713cd237 100644
--- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/CustomMatchers.java
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/matcher/CustomMatchers.java
@@ -19,43 +19,26 @@
 package org.sufficientlysecure.keychain.matcher;
 
 
-import java.util.EnumSet;
-
 import android.support.annotation.ColorRes;
 import android.support.annotation.IdRes;
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.ViewInteraction;
-import android.support.test.espresso.assertion.ViewAssertions;
 import android.support.test.espresso.matcher.BoundedMatcher;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ViewAnimator;
 
 import com.nispok.snackbar.Snackbar;
-import org.hamcrest.CoreMatchers;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
-import org.sufficientlysecure.keychain.EncryptKeyCompletionViewTest;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.ui.DecryptListFragment;
-import org.sufficientlysecure.keychain.ui.DecryptListFragment.ViewHolder;
 import org.sufficientlysecure.keychain.ui.adapter.KeyAdapter.KeyItem;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withChild;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withParent;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static android.support.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.not;
 import static org.sufficientlysecure.keychain.matcher.DrawableMatcher.withDrawable;
@@ -63,6 +46,19 @@ import static org.sufficientlysecure.keychain.matcher.DrawableMatcher.withDrawab
 
 public abstract class CustomMatchers {
 
+    public static Matcher<View> withDisplayedChild(final int child) {
+        return new BoundedMatcher<View, ViewAnimator>(ViewAnimator.class) {
+            public void describeTo(Description description) {
+                description.appendText("with displayed child: " + child);
+            }
+
+            @Override
+            public boolean matchesSafely(ViewAnimator viewAnimator) {
+                return viewAnimator.getDisplayedChild() == child;
+            }
+        };
+    }
+
     public static Matcher<View> withSnackbarLineColor(@ColorRes final int colorRes) {
         return new BoundedMatcher<View, Snackbar>(Snackbar.class) {
             public void describeTo(Description description) {