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

Commit 07d25029 authored by Hyundo Moon's avatar Hyundo Moon
Browse files

Fix failing BluetoothPbapSimVcardManagerTest 

testGetSIMPhonebookNameList_orderByAlphabet was failing since
the test does not set the local phone name in the service.

This CL fixes it, and also recovers the static variable
(local phone name) after the test ends.

Bug: 258075245
Test: atest BluetoothPbapSimVcardManagerTest
Change-Id: I4a8f3fd9e2a18ba1e626febef0e0ef3588e5f835
parent 9cf3ccc5

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