PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager

Browse Source 
-add test case "onGetDeviceName"

Bug: 112735753
Test: make -j42 RunSettingsRoboTests
Change-Id: Id62b6eb8be38fb6ac69ca371563be899b8d61aff
This commit is contained in:
timhypeng
2018-08-23 12:53:17 +08:00
committed by tim peng
parent a59ce66b3b
commit 3029efc5f7
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
View File

@@ -15,10 +15,13 @@
*/
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
import static android.bluetooth.BluetoothDevice.PAIRING_VARIANT_CONSENT;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
@@ -27,6 +30,7 @@ import android.content.Intent;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothPan;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import org.junit.Before;
import org.junit.Test;
@@ -39,10 +43,12 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class})
public class BluetoothPairingControllerTest {
private final static String DEVICE_NAME = "TestName";
@Mock
private BluetoothDevice mBluetoothDevice;
private Context mContext;
private BluetoothPairingController mBluetoothPairingController;
private LocalBluetoothManager mBluetoothManager;
@Before
public void setUp() {
@@ -51,6 +57,9 @@ public class BluetoothPairingControllerTest {
mContext = RuntimeEnvironment.application;
final Intent intent = new Intent();
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
mBluetoothManager = Utils.getLocalBtManager(mContext);
when(mBluetoothDevice.getAliasName()).thenReturn(DEVICE_NAME);
mBluetoothManager.getCachedDeviceManager().addDevice(mBluetoothDevice);
mBluetoothPairingController = spy(new BluetoothPairingController(intent, mContext));
}
@@ -63,4 +72,9 @@ public class BluetoothPairingControllerTest {
verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
}
@Test
public void onGetDeviceName() {
assertThat(mBluetoothPairingController.getDeviceName()).isEqualTo(DEVICE_NAME);
}
}