diff options
author | cyberta <cyberta@riseup.net> | 2017-09-18 11:01:48 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2017-09-18 11:01:48 +0000 |
commit | 64e961fe8ebc1eeb331cef2604cf4c8714e8d8ad (patch) | |
tree | 2f44dc405415cbf03f81eff0c0967f29abec7c7e /app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java | |
parent | 14dc607adeaae623e643b1045ed1917d289a19c4 (diff) | |
parent | afa289cbcce4a431f6bd587b490b6470ed6caa50 (diff) |
Merge branch 'develop' into 'master'
Fixes failing tests
See merge request !5
Diffstat (limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java')
-rw-r--r-- | app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java index 138dfa71..821a23fd 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java @@ -6,6 +6,8 @@ import com.robotium.solo.*; import se.leap.bitmaskclient.*; +import static junit.framework.Assert.assertTrue; + public class UserStatusTestController { private final Solo solo; @@ -25,22 +27,32 @@ public class UserStatusTestController { return view; } - void logIn(String username, String password) { + void logIn(String username, String password, boolean expectSuccess) { solo.enterText(0, username); solo.enterText(1, password); solo.clickOnText(solo.getString(R.string.login_button)); - solo.waitForDialogToClose(); - assertLoggedIn(); + assertTrue(solo.waitForDialogToClose()); + + if (expectSuccess) { + assertLoggedIn(); + } else { + solo.waitForText(solo.getString(R.string.cancel)); + assertTrue(solo.waitForText(solo.getString(R.string.login_button))); + } + } + + void logIn(String username, String password) { + logIn(username, password, true); } private void assertLoggedIn() { String log_out = solo.getString(R.string.logout_button); - solo.waitForText(log_out); + assertTrue(solo.waitForText(log_out)); } void assertLoggedOut() { String log_in = solo.getString(R.string.login_button); - solo.waitForText(log_in); + assertTrue(solo.waitForText(log_in)); } void logOut() { @@ -53,7 +65,7 @@ public class UserStatusTestController { } boolean assertErrorLogInDialogAppears() { - solo.waitForDialogToOpen(); + assertTrue(solo.waitForDialogToOpen()); String username_hint = solo.getEditText(0).getHint().toString(); String correct_username_hint = solo.getString(R.string.username_hint); |