Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Robolectric Bluetooth tests"

Browse Source
This commit is contained in:
Treehugger Robot
2017-10-31 02:25:31 +00:00
committed by Gerrit Code Review
parent 45183fc5a7 1c1bc25dfc
commit 01c9c0e4ba
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/bluetooth/PanProfile.java
View File

@@ -32,7 +32,7 @@ import java.util.List;
/** /**
* PanProfile handles Bluetooth PAN profile (NAP and PANU). * PanProfile handles Bluetooth PAN profile (NAP and PANU).
*/ */
public final class PanProfile implements LocalBluetoothProfile { public class PanProfile implements LocalBluetoothProfile {
private static final String TAG = "PanProfile"; private static final String TAG = "PanProfile";
private static boolean V = true; private static boolean V = true;

34
packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java
View File

@@ -51,7 +51,7 @@ public class CachedBluetoothDeviceTest {
@Mock @Mock
private A2dpProfile mA2dpProfile; private A2dpProfile mA2dpProfile;
@Mock @Mock
private HidProfile mHidProfile; private PanProfile mPanProfile;
@Mock @Mock
private BluetoothDevice mDevice; private BluetoothDevice mDevice;
private CachedBluetoothDevice mCachedDevice; private CachedBluetoothDevice mCachedDevice;
@@ -65,7 +65,7 @@ public class CachedBluetoothDeviceTest {
when(mAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON); when(mAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON);
when(mHfpProfile.isProfileReady()).thenReturn(true); when(mHfpProfile.isProfileReady()).thenReturn(true);
when(mA2dpProfile.isProfileReady()).thenReturn(true); when(mA2dpProfile.isProfileReady()).thenReturn(true);
when(mHidProfile.isProfileReady()).thenReturn(true); when(mPanProfile.isProfileReady()).thenReturn(true);
mCachedDevice = spy( mCachedDevice = spy(
new CachedBluetoothDevice(mContext, mAdapter, mProfileManager, mDevice)); new CachedBluetoothDevice(mContext, mAdapter, mProfileManager, mDevice));
doAnswer((invocation) -> mBatteryLevel).when(mCachedDevice).getBatteryLevel(); doAnswer((invocation) -> mBatteryLevel).when(mCachedDevice).getBatteryLevel();
@@ -83,37 +83,37 @@ public class CachedBluetoothDeviceTest {
@Test @Test
public void testGetConnectionSummary_testSingleProfileConnectDisconnect() { public void testGetConnectionSummary_testSingleProfileConnectDisconnect() {
// Test without battery level // Test without battery level
// Set HID profile to be connected and test connection state summary // Set PAN profile to be connected and test connection state summary
mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_CONNECTED); mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_CONNECTED);
assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString( assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString(
R.string.bluetooth_connected)); R.string.bluetooth_connected));
// Set HID profile to be disconnected and test connection state summary // Set PAN profile to be disconnected and test connection state summary
mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_DISCONNECTED); mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_DISCONNECTED);
assertThat(mCachedDevice.getConnectionSummary()).isNull(); assertThat(mCachedDevice.getConnectionSummary()).isNull();
// Test with battery level // Test with battery level
mBatteryLevel = 10; mBatteryLevel = 10;
// Set HID profile to be connected and test connection state summary // Set PAN profile to be connected and test connection state summary
mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_CONNECTED); mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_CONNECTED);
assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString( assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString(
R.string.bluetooth_connected_battery_level, R.string.bluetooth_connected_battery_level,
com.android.settingslib.Utils.formatPercentage(mBatteryLevel))); com.android.settingslib.Utils.formatPercentage(mBatteryLevel)));
// Set HID profile to be disconnected and test connection state summary // Set PAN profile to be disconnected and test connection state summary
mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_DISCONNECTED); mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_DISCONNECTED);
assertThat(mCachedDevice.getConnectionSummary()).isNull(); assertThat(mCachedDevice.getConnectionSummary()).isNull();
// Test with BluetoothDevice.BATTERY_LEVEL_UNKNOWN battery level // Test with BluetoothDevice.BATTERY_LEVEL_UNKNOWN battery level
mBatteryLevel = BluetoothDevice.BATTERY_LEVEL_UNKNOWN; mBatteryLevel = BluetoothDevice.BATTERY_LEVEL_UNKNOWN;
// Set HID profile to be connected and test connection state summary // Set PAN profile to be connected and test connection state summary
mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_CONNECTED); mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_CONNECTED);
assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString( assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString(
R.string.bluetooth_connected)); R.string.bluetooth_connected));
// Set HID profile to be disconnected and test connection state summary // Set PAN profile to be disconnected and test connection state summary
mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_DISCONNECTED); mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_DISCONNECTED);
assertThat(mCachedDevice.getConnectionSummary()).isNull(); assertThat(mCachedDevice.getConnectionSummary()).isNull();
} }
@@ -121,10 +121,10 @@ public class CachedBluetoothDeviceTest {
public void testGetConnectionSummary_testMultipleProfileConnectDisconnect() { public void testGetConnectionSummary_testMultipleProfileConnectDisconnect() {
mBatteryLevel = 10; mBatteryLevel = 10;
// Set HFP, A2DP and HID profile to be connected and test connection state summary // Set HFP, A2DP and PAN profile to be connected and test connection state summary
mCachedDevice.onProfileStateChanged(mHfpProfile, BluetoothProfile.STATE_CONNECTED); mCachedDevice.onProfileStateChanged(mHfpProfile, BluetoothProfile.STATE_CONNECTED);
mCachedDevice.onProfileStateChanged(mA2dpProfile, BluetoothProfile.STATE_CONNECTED); mCachedDevice.onProfileStateChanged(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);
mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_CONNECTED); mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_CONNECTED);
assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString( assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString(
R.string.bluetooth_connected_battery_level, R.string.bluetooth_connected_battery_level,
com.android.settingslib.Utils.formatPercentage(mBatteryLevel))); com.android.settingslib.Utils.formatPercentage(mBatteryLevel)));
@@ -149,7 +149,7 @@ public class CachedBluetoothDeviceTest {
com.android.settingslib.Utils.formatPercentage(mBatteryLevel))); com.android.settingslib.Utils.formatPercentage(mBatteryLevel)));
// Disconnect all profiles and test connection state summary // Disconnect all profiles and test connection state summary
mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_DISCONNECTED); mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_DISCONNECTED);
assertThat(mCachedDevice.getConnectionSummary()).isNull(); assertThat(mCachedDevice.getConnectionSummary()).isNull();
} }
} }