diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java | 16 | ||||
-rw-r--r-- | app/src/main/java/org/connectbot/HostListActivity.java | 3 |
2 files changed, 10 insertions, 9 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); } diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index d83bd0c..3a7a383 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -370,7 +370,8 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta updateList(); } - private class HostViewHolder extends ItemViewHolder { + @VisibleForTesting + public class HostViewHolder extends ItemViewHolder { public final ImageView icon; public final TextView nickname; public final TextView caption; |