summaryrefslogtreecommitdiff
path: root/tests/src/com
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-05-28 18:26:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-28 18:26:40 +0000
commit6c327dcc027c6df1548873031d62a0d84a0dc50d (patch)
tree4f48b103e4efb0953e8b3d26b52932565563bbf0 /tests/src/com
parentec3fa8255f547b4ed3fa5c50b62283e7291f519a (diff)
parent58eaabcc31e23fd4c071ad911b96da6eea4abc28 (diff)
Merge "Refactor Voicemail Playback into standalone view." into mnc-dev
Diffstat (limited to 'tests/src/com')
-rw-r--r--tests/src/com/android/dialer/CallDetailActivityTest.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/src/com/android/dialer/CallDetailActivityTest.java b/tests/src/com/android/dialer/CallDetailActivityTest.java
index aca8f2985..4dc9ebb81 100644
--- a/tests/src/com/android/dialer/CallDetailActivityTest.java
+++ b/tests/src/com/android/dialer/CallDetailActivityTest.java
@@ -18,7 +18,6 @@ package com.android.dialer;
import static com.android.dialer.calllog.CallLogAsyncTaskUtil.Tasks.GET_CALL_DETAILS;
import static com.android.dialer.voicemail.VoicemailPlaybackPresenter.Tasks.CHECK_FOR_CONTENT;
-import static com.android.dialer.voicemail.VoicemailPlaybackPresenter.Tasks.PREPARE_MEDIA_PLAYER;
import android.content.ContentResolver;
import android.content.ContentUris;
@@ -118,10 +117,8 @@ public class CallDetailActivityTest extends ActivityInstrumentationTestCase2<Cal
setActivityIntentForTestVoicemailEntry();
startActivityUnderTest();
mFakeAsyncTaskExecutor.runTask(CHECK_FOR_CONTENT);
- // There should be exactly one background task ready to prepare the media player.
- // Preparing the media player will have thrown an IOException since the file doesn't exist.
+ // The media player will have thrown an IOException since the file doesn't exist.
// This should have put a failed to play message on screen, buffering is gone.
- mFakeAsyncTaskExecutor.runTask(PREPARE_MEDIA_PLAYER);
assertHasOneTextViewContaining("Couldn't play voicemail");
assertZeroTextViewsContaining("Buffering");
}
@@ -192,7 +189,6 @@ public class CallDetailActivityTest extends ActivityInstrumentationTestCase2<Cal
setActivityIntentForRealFileVoicemailEntry();
startActivityUnderTest();
mFakeAsyncTaskExecutor.runTask(CHECK_FOR_CONTENT);
- mFakeAsyncTaskExecutor.runTask(PREPARE_MEDIA_PLAYER);
mTestUtils.clickButton(mActivityUnderTest, R.id.playback_speakerphone);
mTestUtils.clickButton(mActivityUnderTest, R.id.playback_start_stop);
Thread.sleep(2000);