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

Commit 45ffc162 authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "Fix failing BluetoothPbapSimVcardManagerTest" am: ad1969b0 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2291453



Change-Id: Iae85fd5f7ebf590a2d72ac2e9c9e6025cfbc8d1b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d4b40de ad1969b0

android/app/tests/unit/src/com/android/bluetooth/pbap/BluetoothPbapSimVcardManagerTest.java

+72 −61
Original line number Diff line number Diff line
@@ -240,7 +240,10 @@ public class BluetoothPbapSimVcardManagerTest { 


    @Test

    public void testGetSIMPhonebookNameList_orderByIndexed() {

        String prevLocalPhoneName = BluetoothPbapService.getLocalPhoneName();

        try {

            final String localPhoneName = "test_local_phone_name";

            BluetoothPbapService.setLocalPhoneName(localPhoneName);

            Cursor cursor = initManager();

            List<String> nameList = Arrays.asList("D", "C", "A", "B");
@@ -270,10 +273,15 @@ public class BluetoothPbapSimVcardManagerTest { 
            expectedResult.addAll(nameList);



            assertThat(result).isEqualTo(expectedResult);

        } finally {

            BluetoothPbapService.setLocalPhoneName(prevLocalPhoneName);

        }

    }



    @Test

    public void testGetSIMPhonebookNameList_orderByAlphabet() {

        String prevLocalPhoneName = BluetoothPbapService.getLocalPhoneName();

        try {

            final String localPhoneName = "test_local_phone_name";

            BluetoothPbapService.setLocalPhoneName(localPhoneName);

            Cursor cursor = initManager();
@@ -305,6 +313,9 @@ public class BluetoothPbapSimVcardManagerTest { 
            expectedResult.add(0, localPhoneName);



            assertThat(result).isEqualTo(expectedResult);

        } finally {

            BluetoothPbapService.setLocalPhoneName(prevLocalPhoneName);

        }

    }



    @Test