Merge "Fix failing BluetoothPbapSimVcardManagerTest" into tm-qpr-dev (3a1d7f97) · Commits · e / os / android_packages_modules_Bluetooth

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