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

Commit c6f6d5ee authored by Jakub Tyszkowski's avatar Jakub Tyszkowski
Browse files

LeAudioService: Fix failing unit test 

Now when the device is unbonded, we trigger the disconnection
if device is not in a disconnected state. Tests need to catch this
intent.

Fixes the following:

[31/39]
com.android.bluetooth.le_audio.LeAudioServiceTest#testDeleteStateMachineUnbondEvents:
FAILED (237ms)

STACKTRACE:
expected: 0
but was : 2
        at
	com.android.bluetooth.le_audio.LeAudioServiceTest.verifyConnectionStateIntent(LeAudioServiceTest.java:289)
        at
	com.android.bluetooth.le_audio.LeAudioServiceTest.generateConnectionMessageFromNative(LeAudioServiceTest.java:846)
        at
	com.android.bluetooth.le_audio.LeAudioServiceTest.testDeleteStateMachineUnbondEvents(LeAudioServiceTest.java:713)

Test: atest com.android.bluetooth.le_audio --no-bazel-mode
Bug: 249250843
Tag: #feature
Change-Id: I1f87ab52bb57af1fe1e55c9d7613b851c013c25c
parent f1790e9c

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java

+19 −16
Original line number Diff line number Diff line
@@ -285,10 +285,9 @@ public class LeAudioServiceTest { 
        assertThat(intent).isNotNull();

        assertThat(intent.getAction())

                .isEqualTo(BluetoothLeAudio.ACTION_LE_AUDIO_CONNECTION_STATE_CHANGED);

        assertThat(device).isEqualTo(intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE));

        assertThat(newState).isEqualTo(intent.getIntExtra(BluetoothProfile.EXTRA_STATE, -1));

        assertThat(prevState).isEqualTo(intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE,

                -1));

        assertThat((BluetoothDevice)intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE)).isEqualTo(device);

        assertThat(intent.getIntExtra(BluetoothProfile.EXTRA_STATE, -1)).isEqualTo(newState);

        assertThat(intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, -1)).isEqualTo(prevState);

    }



    /**
@@ -701,31 +700,35 @@ public class LeAudioServiceTest { 
        // LeAudio stack event: CONNECTION_STATE_CONNECTING - state machine should be created

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTED);

        assertThat(BluetoothProfile.STATE_CONNECTING)

                .isEqualTo(mService.getConnectionState(mLeftDevice));

        assertThat(mService.getConnectionState(mLeftDevice))

                .isEqualTo(BluetoothProfile.STATE_CONNECTING);

        assertThat(mService.getDevices().contains(mLeftDevice)).isTrue();

        // Device unbond - state machine is not removed

        mService.bondStateChanged(mLeftDevice, BluetoothDevice.BOND_NONE);

        assertThat(mService.getDevices().contains(mLeftDevice)).isTrue();

        verifyConnectionStateIntent(TIMEOUT_MS, mLeftDevice, BluetoothProfile.STATE_DISCONNECTED,

                BluetoothProfile.STATE_CONNECTING);



        // LeAudio stack event: CONNECTION_STATE_CONNECTED - state machine is not removed

        mService.bondStateChanged(mLeftDevice, BluetoothDevice.BOND_BONDED);

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTED,

                BluetoothProfile.STATE_CONNECTING);

        assertThat(BluetoothProfile.STATE_CONNECTED)

                .isEqualTo(mService.getConnectionState(mLeftDevice));

                BluetoothProfile.STATE_DISCONNECTED);

        assertThat(mService.getConnectionState(mLeftDevice))

                .isEqualTo(BluetoothProfile.STATE_CONNECTED);

        assertThat(mService.getDevices().contains(mLeftDevice)).isTrue();

        // Device unbond - state machine is not removed

        mService.bondStateChanged(mLeftDevice, BluetoothDevice.BOND_NONE);

        assertThat(mService.getDevices().contains(mLeftDevice)).isTrue();

        verifyConnectionStateIntent(TIMEOUT_MS, mLeftDevice, BluetoothProfile.STATE_DISCONNECTING,

                BluetoothProfile.STATE_CONNECTED);

        assertThat(mService.getConnectionState(mLeftDevice))

                .isEqualTo(BluetoothProfile.STATE_DISCONNECTING);

        assertThat(mService.getDevices().contains(mLeftDevice)).isTrue();



        // LeAudio stack event: CONNECTION_STATE_DISCONNECTING - state machine is not removed

        mService.bondStateChanged(mLeftDevice, BluetoothDevice.BOND_BONDED);

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_DISCONNECTING,

                BluetoothProfile.STATE_CONNECTED);

        assertThat(BluetoothProfile.STATE_DISCONNECTING)

                .isEqualTo(mService.getConnectionState(mLeftDevice));

        assertThat(mService.getDevices().contains(mLeftDevice)).isTrue();

        assertThat(mService.getConnectionState(mLeftDevice))

                .isEqualTo(BluetoothProfile.STATE_DISCONNECTING);

        // Device unbond - state machine is not removed

        mService.bondStateChanged(mLeftDevice, BluetoothDevice.BOND_NONE);

        assertThat(mService.getDevices().contains(mLeftDevice)).isTrue();
@@ -734,8 +737,8 @@ public class LeAudioServiceTest { 
        mService.bondStateChanged(mLeftDevice, BluetoothDevice.BOND_BONDED);

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_DISCONNECTED,

                BluetoothProfile.STATE_DISCONNECTING);

        assertThat(BluetoothProfile.STATE_DISCONNECTED)

                .isEqualTo(mService.getConnectionState(mLeftDevice));

        assertThat(mService.getConnectionState(mLeftDevice))

                .isEqualTo(BluetoothProfile.STATE_DISCONNECTED);

        assertThat(mService.getDevices().contains(mLeftDevice)).isTrue();

        // Device unbond - state machine is removed

        mService.bondStateChanged(mLeftDevice, BluetoothDevice.BOND_NONE);