From 704cb35d7eebda2e579b9b7f5f66e4fc4197b950 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Mon, 22 Dec 2014 23:52:34 +0100
Subject: [PATCH] Fix Espresso tests

---
 .../ConnectionSecurityHolderMatcher.java      | 28 +++++++++++++++++++
 .../pages/IncomingServerSettingsPage.java     |  6 ++--
 .../pages/OutgoingServerSettingsPage.java     |  6 ++--
 3 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 k9mail/src/androidTest/java/com/fsck/k9/activity/setup/ConnectionSecurityHolderMatcher.java

diff --git a/k9mail/src/androidTest/java/com/fsck/k9/activity/setup/ConnectionSecurityHolderMatcher.java b/k9mail/src/androidTest/java/com/fsck/k9/activity/setup/ConnectionSecurityHolderMatcher.java
new file mode 100644
index 000000000..258258c5f
--- /dev/null
+++ b/k9mail/src/androidTest/java/com/fsck/k9/activity/setup/ConnectionSecurityHolderMatcher.java
@@ -0,0 +1,28 @@
+package com.fsck.k9.activity.setup;
+
+
+import com.fsck.k9.mail.ConnectionSecurity;
+import com.google.android.apps.common.testing.ui.espresso.matcher.BoundedMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+
+import static com.google.android.apps.common.testing.testrunner.util.Checks.checkNotNull;
+
+
+public class ConnectionSecurityHolderMatcher {
+    public static Matcher<Object> is(final ConnectionSecurity connectionSecurity) {
+        checkNotNull(connectionSecurity);
+        return new BoundedMatcher<Object, ConnectionSecurityHolder>(ConnectionSecurityHolder.class) {
+            @Override
+            public boolean matchesSafely(ConnectionSecurityHolder connectionSecurityHolder) {
+                return connectionSecurityHolder.connectionSecurity == connectionSecurity;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("connection security is: ");
+                description.appendText(connectionSecurity.name());
+            }
+        };
+    }
+}
diff --git a/k9mail/src/androidTest/java/com/fsck/k9/endtoend/pages/IncomingServerSettingsPage.java b/k9mail/src/androidTest/java/com/fsck/k9/endtoend/pages/IncomingServerSettingsPage.java
index f0b07579c..814fefa7c 100644
--- a/k9mail/src/androidTest/java/com/fsck/k9/endtoend/pages/IncomingServerSettingsPage.java
+++ b/k9mail/src/androidTest/java/com/fsck/k9/endtoend/pages/IncomingServerSettingsPage.java
@@ -3,6 +3,7 @@ package com.fsck.k9.endtoend.pages;
 import com.fsck.k9.R;
 import com.fsck.k9.mail.ConnectionSecurity;
 
+import static com.fsck.k9.activity.setup.ConnectionSecurityHolderMatcher.is;
 import static com.google.android.apps.common.testing.ui.espresso.Espresso.onData;
 import static com.google.android.apps.common.testing.ui.espresso.Espresso.onView;
 import static com.google.android.apps.common.testing.ui.espresso.action.ViewActions.clearText;
@@ -13,9 +14,6 @@ import static com.google.android.apps.common.testing.ui.espresso.assertion.ViewA
 import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.isClickable;
 import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.withId;
 import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
 
 public class IncomingServerSettingsPage extends AbstractPage {
 
@@ -31,7 +29,7 @@ public class IncomingServerSettingsPage extends AbstractPage {
         onView(withId(R.id.account_security_type))
                 .perform(scrollTo())
                 .perform(click());
-        onData(allOf(is(instanceOf(ConnectionSecurity.class)), is(security))).perform(click());
+        onData(is(security)).perform(click());
         return this;
     }
 
diff --git a/k9mail/src/androidTest/java/com/fsck/k9/endtoend/pages/OutgoingServerSettingsPage.java b/k9mail/src/androidTest/java/com/fsck/k9/endtoend/pages/OutgoingServerSettingsPage.java
index 87ec9723f..9719c68f0 100644
--- a/k9mail/src/androidTest/java/com/fsck/k9/endtoend/pages/OutgoingServerSettingsPage.java
+++ b/k9mail/src/androidTest/java/com/fsck/k9/endtoend/pages/OutgoingServerSettingsPage.java
@@ -3,6 +3,7 @@ package com.fsck.k9.endtoend.pages;
 import com.fsck.k9.R;
 import com.fsck.k9.mail.ConnectionSecurity;
 
+import static com.fsck.k9.activity.setup.ConnectionSecurityHolderMatcher.is;
 import static com.google.android.apps.common.testing.ui.espresso.Espresso.onData;
 import static com.google.android.apps.common.testing.ui.espresso.Espresso.onView;
 import static com.google.android.apps.common.testing.ui.espresso.action.ViewActions.clearText;
@@ -10,9 +11,6 @@ import static com.google.android.apps.common.testing.ui.espresso.action.ViewActi
 import static com.google.android.apps.common.testing.ui.espresso.action.ViewActions.scrollTo;
 import static com.google.android.apps.common.testing.ui.espresso.action.ViewActions.typeText;
 import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.withId;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
 
 
 public class OutgoingServerSettingsPage extends AbstractPage {
@@ -30,7 +28,7 @@ public class OutgoingServerSettingsPage extends AbstractPage {
         onView(withId(R.id.account_security_type))
                 .perform(scrollTo())
                 .perform(click());
-        onData(allOf(is(instanceOf(ConnectionSecurity.class)), is(security))).perform(click());
+        onData(is(security)).perform(click());
         return this;
     }