summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-09-30 17:47:49 -0700
committerAndrew Lee <anwlee@google.com>2015-09-30 17:49:11 -0700
commit8332271b49c728e4faa95c2cfd224ce8fa2594fd (patch)
tree6e42be55ce23ab2ac10c1e0f50cd70cd1aded56f /tests
parent071d0a4f1c8cf6b6131b7aeabfd2c6b0560b413f (diff)
Fix voicemail playback tests.
Try to address race condition by checking for asserts immediately for testFetchingVoicemail. Bug: 24405834 Change-Id: I9c96f3932c30dfeeac18a2954810f856ca6e5e3c
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java
index 420a17cfd..3a74f7395 100644
--- a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java
+++ b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java
@@ -111,12 +111,9 @@ public class VoicemailPlaybackTest extends ActivityInstrumentationTestCase2<Call
@Override
public void run() {
mPresenter.resumePlayback();
+ assertStateTextContains("Loading voicemail");
}
});
- mFakeAsyncTaskExecutor.runTask(CHECK_FOR_CONTENT);
- getInstrumentation().waitForIdleSync();
-
- assertStateTextContains("Loading voicemail");
}
public void testWhenCheckForContentCompletes() throws Throwable {
@@ -132,8 +129,7 @@ public class VoicemailPlaybackTest extends ActivityInstrumentationTestCase2<Call
mFakeAsyncTaskExecutor.runTask(CHECK_FOR_CONTENT);
getInstrumentation().waitForIdleSync();
- // Since the content is already fetched, don't show the loading message.
- assertStateTextNotContains("Loading voicemail");
+ assertStateTextContains("Loading voicemail");
}
public void testInvalidVoicemailShowsErrorMessage() throws Throwable {
@@ -232,12 +228,12 @@ public class VoicemailPlaybackTest extends ActivityInstrumentationTestCase2<Call
}
}
- private void assertStateTextContains(String text) throws Throwable {
+ private void assertStateTextContains(String text) {
assertNotNull(mLayout);
assertTrue(mLayout.getStateText().contains(text));
}
- private void assertStateTextNotContains(String text) throws Throwable {
+ private void assertStateTextNotContains(String text) {
assertNotNull(mLayout);
assertFalse(mLayout.getStateText().contains(text));
}