Add checks for post-dial functionality to avoid breaking tests (b2e47452) · Commits · e / os / android_packages_apps_Dialer

tests/src/com/android/dialer/calllog/CallLogAdapterTest.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -240,8 +240,10 @@ public class CallLogAdapterTest extends AndroidTestCase {
		mAdapter.changeCursor(mCursor);
		mAdapter.onBindViewHolder(mViewHolder, 0);

		if (PhoneNumberDisplayUtil.canShowPostDial()) {
		assertHasCallActionToGivenNumber(mViewHolder, TEST_NUMBER + TEST_POST_DIAL_DIGITS);
		}
		}

		@MediumTest
		public void testBindView_VoicemailUri() {
		@@ -262,8 +264,10 @@ public class CallLogAdapterTest extends AndroidTestCase {
		mAdapter.changeCursor(mCursor);
		mAdapter.onBindViewHolder(mViewHolder, 0);

		if (PhoneNumberDisplayUtil.canShowPostDial()) {
		assertNameIs(mViewHolder, TEST_NUMBER + TEST_POST_DIAL_DIGITS);
		}
		}

		@MediumTest
		public void testBindView_ContactWithPostDialDigits() {
		@@ -274,8 +278,10 @@ public class CallLogAdapterTest extends AndroidTestCase {
		mAdapter.changeCursor(mCursor);
		mAdapter.onBindViewHolder(mViewHolder, 0);

		if (PhoneNumberDisplayUtil.canShowPostDial()) {
		assertNameIs(mViewHolder, TEST_CACHED_NAME_PRIMARY);
		}
		}

		@MediumTest
		public void testPresentationAfterRebindingViewHolders() {
		@@ -655,7 +661,7 @@ public class CallLogAdapterTest extends AndroidTestCase {
		if (!TextUtils.isEmpty(number)) {
		values[CallLogQuery.NUMBER] = number;
		}
		if (!TextUtils.isEmpty(postDialDigits)) {
		if (!TextUtils.isEmpty(postDialDigits) && PhoneNumberDisplayUtil.canShowPostDial()) {
		values[CallLogQuery.POST_DIAL_DIGITS] = postDialDigits;
		}
		if (presentation != NO_VALUE_SET) {

+11 −4

Original line number	Diff line number	Diff line
		@@ -98,9 +98,14 @@ public class CallLogGroupBuilderTest extends AndroidTestCase {

		mBuilder.addGroups(mCursor);

		if (PhoneNumberDisplayUtil.canShowPostDial()) {
		assertEquals(2, mFakeGroupCreator.groups.size());
		assertGroupIs(0, 2, mFakeGroupCreator.groups.get(0));
		assertGroupIs(2, 1, mFakeGroupCreator.groups.get(1));
		} else {
		assertEquals(1, mFakeGroupCreator.groups.size());
		assertGroupIs(0, 3, mFakeGroupCreator.groups.get(0));
		}
		}

		public void testAddGroups_MatchingIncomingAndOutgoing() {
		@@ -339,7 +344,9 @@ public class CallLogGroupBuilderTest extends AndroidTestCase {
		values[CallLogQuery.ID] = mCursor.getPosition();
		values[CallLogQuery.NUMBER] = number;
		values[CallLogQuery.CALL_TYPE] = type;
		if (PhoneNumberDisplayUtil.canShowPostDial()) {
		values[CallLogQuery.POST_DIAL_DIGITS] = postDialDigits;
		}
		mCursor.addRow(values);
		}