instrument: add helper method for snackbar checking

2 files changed, 34 insertions, 16 deletions

diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/actions/CustomMatchers.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/actions/CustomMatchers.java
new file mode 100644
index 000000000..29e875b95
--- /dev/null
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/actions/CustomMatchers.java
@@ -0,0 +1,27 @@
+package org.sufficientlysecure.keychain.actions;
+
+
+import android.support.annotation.ColorRes;
+import android.support.test.espresso.matcher.BoundedMatcher;
+import android.view.View;
+
+import com.nispok.snackbar.Snackbar;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+
+public abstract class CustomMatchers {
+
+    public static Matcher<View> withSnackbarLineColor(@ColorRes final int colorRes) {
+        return new BoundedMatcher<View, Snackbar>(Snackbar.class) {
+            public void describeTo(Description description) {
+                description.appendText("with color resource id: " + colorRes);
+            }
+
+            @Override
+            public boolean matchesSafely(Snackbar snackbar) {
+                return snackbar.getResources().getColor(colorRes) == snackbar.getLineColor();
+            }
+        };
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
index 8c554dbde..7dfd56430 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
@@ -38,25 +38,16 @@ import org.sufficientlysecure.keychain.util.FabContainer;
 public class Notify {
 
     public static enum Style {
-        OK, WARN, ERROR;
+        OK (R.color.android_green_light), WARN(R.color.android_orange_light), ERROR(R.color.android_red_light);
 
-        public void applyToBar(Snackbar bar) {
+        public final int mLineColor;
 
-            switch (this) {
-                case OK:
-                    // bar.actionColorResource(R.color.android_green_light);
-                    bar.lineColorResource(R.color.android_green_light);
-                    break;
-                case WARN:
-                    // bar.textColorResource(R.color.android_orange_light);
-                    bar.lineColorResource(R.color.android_orange_light);
-                    break;
-                case ERROR:
-                    // bar.textColorResource(R.color.android_red_light);
-                    bar.lineColorResource(R.color.android_red_light);
-                    break;
-            }
+        Style(int color) {
+            mLineColor = color;
+        }
 
+        public void applyToBar(Snackbar bar) {
+            bar.lineColorResource(mLineColor);
         }
     }