aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-12-28 13:34:42 -0600
committerKenny Root <kenny@the-b.org>2015-12-28 13:34:42 -0600
commit81405c036f22222062189f973b8dd625d7e5fa11 (patch)
treeab45c9f0f7826e57be08cfc274b3c368ba6b280a
parent0ab21d7d184149eeb7f7467ee03a182f43b6f656 (diff)
parenta51815901effa4ad9b504ad09fd90d7033e61b48 (diff)
downloadconnectbot-81405c036f22222062189f973b8dd625d7e5fa11.tar.gz
connectbot-81405c036f22222062189f973b8dd625d7e5fa11.tar.bz2
connectbot-81405c036f22222062189f973b8dd625d7e5fa11.zip
Merge pull request #360 from kruton/upgrade-sshlib
Upgrade sshlib and fix instrumentation tests
-rw-r--r--app/build.gradle2
-rw-r--r--app/src/androidTest/java/org/connectbot/ConnectbotMatchers.java16
-rw-r--r--app/src/main/java/org/connectbot/HostListActivity.java3
3 files changed, 11 insertions, 10 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 9e35927..0c53b90 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ buildscript {
}
dependencies {
- compile 'org.connectbot:sshlib:2.2.1'
+ compile 'org.connectbot:sshlib:2.2.2'
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'
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;