diff options
| author | Kenny Root <kenny@the-b.org> | 2015-12-28 13:34:42 -0600 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-12-28 13:34:42 -0600 |
| commit | 81405c036f22222062189f973b8dd625d7e5fa11 (patch) | |
| tree | ab45c9f0f7826e57be08cfc274b3c368ba6b280a /app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java | |
| parent | 0ab21d7d184149eeb7f7467ee03a182f43b6f656 (diff) | |
| parent | a51815901effa4ad9b504ad09fd90d7033e61b48 (diff) | |
| download | connectbot-81405c036f22222062189f973b8dd625d7e5fa11.tar.gz connectbot-81405c036f22222062189f973b8dd625d7e5fa11.tar.bz2 connectbot-81405c036f22222062189f973b8dd625d7e5fa11.zip | |
Merge pull request #360 from kruton/upgrade-sshlib
Upgrade sshlib and fix instrumentation tests
Diffstat (limited to 'app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java')
| -rw-r--r-- | app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java b/app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java index 76864e2..b7cf7aa 100644 --- a/app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java +++ b/app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java @@ -21,9 +21,9 @@ public class ConnectbotMatchers { */ @NonNull public static Matcher<RecyclerView.ViewHolder> withHostNickname(final String content) { - return new BoundedMatcher<RecyclerView.ViewHolder, HostListActivity.HostAdapter.ViewHolder>(HostListActivity.HostAdapter.ViewHolder.class) { + return new BoundedMatcher<RecyclerView.ViewHolder, HostListActivity.HostViewHolder>(HostListActivity.HostViewHolder.class) { @Override - public boolean matchesSafely(HostListActivity.HostAdapter.ViewHolder holder) { + public boolean matchesSafely(HostListActivity.HostViewHolder holder) { return holder.host.getNickname().matches(content); } @@ -36,9 +36,9 @@ public class ConnectbotMatchers { @NonNull public static Matcher<RecyclerView.ViewHolder> withConnectedHost() { - return new BoundedMatcher<RecyclerView.ViewHolder, HostListActivity.HostAdapter.ViewHolder>(HostListActivity.HostAdapter.ViewHolder.class) { + return new BoundedMatcher<RecyclerView.ViewHolder, HostListActivity.HostViewHolder>(HostListActivity.HostViewHolder.class) { @Override - public boolean matchesSafely(HostListActivity.HostAdapter.ViewHolder holder) { + public boolean matchesSafely(HostListActivity.HostViewHolder holder) { return hasDrawableState(holder.icon, android.R.attr.state_checked); } @@ -51,9 +51,9 @@ public class ConnectbotMatchers { @NonNull public static Matcher<RecyclerView.ViewHolder> withDisconnectedHost() { - return new BoundedMatcher<RecyclerView.ViewHolder, HostListActivity.HostAdapter.ViewHolder>(HostListActivity.HostAdapter.ViewHolder.class) { + return new BoundedMatcher<RecyclerView.ViewHolder, HostListActivity.HostViewHolder>(HostListActivity.HostViewHolder.class) { @Override - public boolean matchesSafely(HostListActivity.HostAdapter.ViewHolder holder) { + public boolean matchesSafely(HostListActivity.HostViewHolder holder) { return hasDrawableState(holder.icon, android.R.attr.state_expanded); } @@ -66,9 +66,9 @@ public class ConnectbotMatchers { @NonNull public static Matcher<RecyclerView.ViewHolder> withColoredText(@ColorInt final int expectedColor) { - return new BoundedMatcher<RecyclerView.ViewHolder, HostListActivity.HostAdapter.ViewHolder>(HostListActivity.HostAdapter.ViewHolder.class) { + return new BoundedMatcher<RecyclerView.ViewHolder, HostListActivity.HostViewHolder>(HostListActivity.HostViewHolder.class) { @Override - public boolean matchesSafely(HostListActivity.HostAdapter.ViewHolder holder) { + public boolean matchesSafely(HostListActivity.HostViewHolder holder) { return hasTextColor(holder.nickname, expectedColor); } |