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

Commit 36a88956 authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge "Fix Robolectric Bluetooth tests" am: 01c9c0e4 am: 2f1cb548 

am: d327f7a5

Change-Id: I13676ddd4498df457ad11918ad73bfcdcf3297a1
parents b235036e d327f7a5

packages/SettingsLib/src/com/android/settingslib/bluetooth/PanProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.List; 
/**

 * 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 boolean V = true;

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

+17 −17
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class CachedBluetoothDeviceTest { 
    @Mock

    private A2dpProfile mA2dpProfile;

    @Mock

    private HidProfile mHidProfile;

    private PanProfile mPanProfile;

    @Mock

    private BluetoothDevice mDevice;

    private CachedBluetoothDevice mCachedDevice;
@@ -74,7 +74,7 @@ public class CachedBluetoothDeviceTest { 
        when(mAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON);

        when(mHfpProfile.isProfileReady()).thenReturn(true);

        when(mA2dpProfile.isProfileReady()).thenReturn(true);

        when(mHidProfile.isProfileReady()).thenReturn(true);

        when(mPanProfile.isProfileReady()).thenReturn(true);

        mCachedDevice = spy(

                new CachedBluetoothDevice(mContext, mAdapter, mProfileManager, mDevice));

        doAnswer((invocation) -> mBatteryLevel).when(mCachedDevice).getBatteryLevel();
@@ -92,37 +92,37 @@ public class CachedBluetoothDeviceTest { 
    @Test

    public void testGetConnectionSummary_testSingleProfileConnectDisconnect() {

        // Test without battery level

        // Set HID profile to be connected and test connection state summary

        mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_CONNECTED);

        // Set PAN profile to be connected and test connection state summary

        mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_CONNECTED);

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString(

                R.string.bluetooth_connected));



        // Set HID profile to be disconnected and test connection state summary

        mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_DISCONNECTED);

        // Set PAN profile to be disconnected and test connection state summary

        mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_DISCONNECTED);

        assertThat(mCachedDevice.getConnectionSummary()).isNull();



        // Test with battery level

        mBatteryLevel = 10;

        // Set HID profile to be connected and test connection state summary

        mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_CONNECTED);

        // Set PAN profile to be connected and test connection state summary

        mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_CONNECTED);

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString(

                R.string.bluetooth_connected_battery_level,

                com.android.settingslib.Utils.formatPercentage(mBatteryLevel)));



        // Set HID profile to be disconnected and test connection state summary

        mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_DISCONNECTED);

        // Set PAN profile to be disconnected and test connection state summary

        mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_DISCONNECTED);

        assertThat(mCachedDevice.getConnectionSummary()).isNull();



        // Test with BluetoothDevice.BATTERY_LEVEL_UNKNOWN battery level

        mBatteryLevel = BluetoothDevice.BATTERY_LEVEL_UNKNOWN;



        // Set HID profile to be connected and test connection state summary

        mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_CONNECTED);

        // Set PAN profile to be connected and test connection state summary

        mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_CONNECTED);

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString(

                R.string.bluetooth_connected));



        // Set HID profile to be disconnected and test connection state summary

        mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_DISCONNECTED);

        // Set PAN profile to be disconnected and test connection state summary

        mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_DISCONNECTED);

        assertThat(mCachedDevice.getConnectionSummary()).isNull();

    }
@@ -130,10 +130,10 @@ public class CachedBluetoothDeviceTest { 
    public void testGetConnectionSummary_testMultipleProfileConnectDisconnect() {

        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(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);

        mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_CONNECTED);

        mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_CONNECTED);

        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(mContext.getString(

                R.string.bluetooth_connected_battery_level,

                com.android.settingslib.Utils.formatPercentage(mBatteryLevel)));
@@ -158,7 +158,7 @@ public class CachedBluetoothDeviceTest { 
                com.android.settingslib.Utils.formatPercentage(mBatteryLevel)));



        // Disconnect all profiles and test connection state summary

        mCachedDevice.onProfileStateChanged(mHidProfile, BluetoothProfile.STATE_DISCONNECTED);

        mCachedDevice.onProfileStateChanged(mPanProfile, BluetoothProfile.STATE_DISCONNECTED);

        assertThat(mCachedDevice.getConnectionSummary()).isNull();

    }