Fix voicemail playback tests.
Try to address race condition by checking for asserts immediately
for testFetchingVoicemail.
Bug: 24405834
Change-Id: I9c96f3932c30dfeeac18a2954810f856ca6e5e3c
diff --git a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java
index 420a17c..3a74f73 100644
--- a/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java
+++ b/tests/src/com/android/dialer/voicemail/VoicemailPlaybackTest.java
@@ -111,12 +111,9 @@
@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 @@
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 @@
}
}
- 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));
}