Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 202ad07c authored by James Laskey's avatar James Laskey
Browse files

Fix for test breakage in ContactDeletion 

Needed to update tests to account for accessing
DISPLAY_NAME_ALTERNATIVE.

Bug: 32321497
Test: Testsuite passes with no failures
Change-Id: I48f860446efa708c0c373ce85e8614377a107e77
parent 5e017cac

tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java

+7 −7
Original line number Diff line number Diff line
@@ -107,33 +107,33 @@ public class ContactDeletionInteractionTest 
    }



    public void testSingleWritableRawContact() {

        expectQuery().returnRow(1, WRITABLE_ACCOUNT_TYPE, null, 13, "foo", "baz");

        expectQuery().returnRow(1, WRITABLE_ACCOUNT_TYPE, null, 13, "foo", "baz", "bazAlt");

        assertWithMessageId(R.string.deleteConfirmation);

    }



    public void testReadOnlyRawContacts() {

        expectQuery().returnRow(1, READONLY_ACCOUNT_TYPE, null, 13, "foo", "baz");

        expectQuery().returnRow(1, READONLY_ACCOUNT_TYPE, null, 13, "foo", "baz", "bazAlt");

        assertWithMessageId(R.string.readOnlyContactWarning);

    }



    public void testMixOfWritableAndReadOnlyRawContacts() {

        expectQuery()

                .returnRow(1, WRITABLE_ACCOUNT_TYPE, null, 13, "foo", "baz")

                .returnRow(2, READONLY_ACCOUNT_TYPE, null, 13, "foo", "baz");

                .returnRow(1, WRITABLE_ACCOUNT_TYPE, null, 13, "foo", "baz", "bazAlt")

                .returnRow(2, READONLY_ACCOUNT_TYPE, null, 13, "foo", "baz", "bazAlt");

        assertWithMessageId(R.string.readOnlyContactDeleteConfirmation);

    }



    public void testMultipleWritableRawContacts() {

        expectQuery()

                .returnRow(1, WRITABLE_ACCOUNT_TYPE, null, 13, "foo", "baz")

                .returnRow(2, WRITABLE_ACCOUNT_TYPE, null, 13, "foo", "baz");

                .returnRow(1, WRITABLE_ACCOUNT_TYPE, null, 13, "foo", "baz", "bazAlt")

                .returnRow(2, WRITABLE_ACCOUNT_TYPE, null, 13, "foo", "baz", "bazAlt");

        assertWithMessageId(R.string.multipleContactDeleteConfirmation);

    }



    private Query expectQuery() {

        return mContactsProvider.expectQuery(ENTITY_URI).withProjection(

                Entity.RAW_CONTACT_ID, Entity.ACCOUNT_TYPE, Entity.DATA_SET, Entity.CONTACT_ID,

                Entity.LOOKUP_KEY, Entity.DISPLAY_NAME);

                Entity.LOOKUP_KEY, Entity.DISPLAY_NAME, Entity.DISPLAY_NAME_ALTERNATIVE);

    }



    private void assertWithMessageId(int messageId) {