diff options
author | Andrew Lee <anwlee@google.com> | 2015-09-30 18:24:48 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-10-02 17:06:02 -0700 |
commit | 7b127d43de0de29c27a9db19f0a7e792ac678c05 (patch) | |
tree | 56f130e190ef4f99ef23aa85cad041ea1fe388a0 /tests/src/com/android | |
parent | ea0742761c5511a713b43af16d4abd1a9059dcd8 (diff) |
Prepatory CallDetailActivity tweaks.
Incremental CL in changing actions/layout of CallDetailActivity to
move actions such as Block/Edit/Copy out of the overflow menu.
+ Make header at top of Call Detail Activity smaller.
+ Move delete options into actionbar button.
- Delete call list header in CallDetailActivity.
Bug: 24109819
Change-Id: If75f016e14de9e2c5ac8629c4bfa38e2380ce48b
Diffstat (limited to 'tests/src/com/android')
-rw-r--r-- | tests/src/com/android/dialer/CallDetailActivityTest.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/src/com/android/dialer/CallDetailActivityTest.java b/tests/src/com/android/dialer/CallDetailActivityTest.java index 27fbc304e..eda74742b 100644 --- a/tests/src/com/android/dialer/CallDetailActivityTest.java +++ b/tests/src/com/android/dialer/CallDetailActivityTest.java @@ -84,11 +84,9 @@ public class CallDetailActivityTest extends ActivityInstrumentationTestCase2<Cal } /** - * Test for bug where voicemails should not have remove-from-call-log entry. - * <p> - * See http://b/5054103. + * Verifies the trash menu item is present and a voicemail URI is set. */ - public void testVoicemailDoesNotHaveRemoveFromCallLog() throws Throwable { + public void testVoicemailDeleteButton() throws Throwable { setActivityIntentForTestVoicemailEntry(); startActivityUnderTest(); mFakeAsyncTaskExecutor.runTask(GET_CALL_DETAILS); @@ -96,12 +94,13 @@ public class CallDetailActivityTest extends ActivityInstrumentationTestCase2<Cal Menu optionsMenu = (new PopupMenu(mActivityUnderTest, null)).getMenu(); mActivityUnderTest.onCreateOptionsMenu(optionsMenu); mActivityUnderTest.onPrepareOptionsMenu(optionsMenu); - assertFalse(optionsMenu.findItem(R.id.menu_remove_from_call_log).isVisible()); - assertTrue(optionsMenu.findItem(R.id.menu_trash).isVisible()); + + assertTrue(optionsMenu.findItem(R.id.call_detail_delete_menu_item).isVisible()); + assertTrue(mActivityUnderTest.hasVoicemail()); } /** - * Test to check that I haven't broken the remove-from-call-log entry from regular calls. + * Verifies the trash menu item is present and a voicemail URI is not set. */ public void testRegularCallDoesHaveRemoveFromCallLog() throws Throwable { setActivityIntentForTestCallEntry(); @@ -111,8 +110,9 @@ public class CallDetailActivityTest extends ActivityInstrumentationTestCase2<Cal Menu optionsMenu = (new PopupMenu(mActivityUnderTest, null)).getMenu(); mActivityUnderTest.onCreateOptionsMenu(optionsMenu); mActivityUnderTest.onPrepareOptionsMenu(optionsMenu); - assertTrue(optionsMenu.findItem(R.id.menu_remove_from_call_log).isVisible()); - assertFalse(optionsMenu.findItem(R.id.menu_trash).isVisible()); + + assertTrue(optionsMenu.findItem(R.id.call_detail_delete_menu_item).isVisible()); + assertFalse(mActivityUnderTest.hasVoicemail()); } private void setActivityIntentForTestCallEntry() { |