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

Commit 42d40c3d authored by Sal Savage's avatar Sal Savage
Browse files

Cleanup State Machines after connect tests 

Flag: EXEMPT, test only change
Test: atest com.android.bluetooth.pbapclient.PbapClientServiceTest
Bug: 381114027
Change-Id: I82df4b4751e1538130842bd6615f630160844267
parent 4589d4e1

android/app/src/com/android/bluetooth/pbapclient/PbapClientStateMachine.java

+1 −0
Original line number Diff line number Diff line
@@ -857,6 +857,7 @@ class PbapClientStateMachine extends StateMachine { 
            case BluetoothProfile.STATE_CONNECTED:

                onConnectionStateChanged(BluetoothProfile.STATE_DISCONNECTING);

                // intentional fallthrough-- we want to broadcast both state changes

            case BluetoothProfile.STATE_CONNECTING:

            case BluetoothProfile.STATE_DISCONNECTING:

                onConnectionStateChanged(BluetoothProfile.STATE_DISCONNECTED);

                cleanup();

android/app/tests/unit/src/com/android/bluetooth/pbapclient/PbapClientServiceTest.java

+26 −2
Original line number Diff line number Diff line
@@ -508,10 +508,34 @@ public class PbapClientServiceTest { 
    }



    // connect (policy allowed) -> connect/true



    // old



    @Test

    @DisableFlags(Flags.FLAG_PBAP_CLIENT_STORAGE_REFACTOR)

    public void testConnect_onOld_onAllowedAndUnconnectedDevice_deviceCreatedAndIsConnecting() {

        mService.mPbapClientStateMachineOldMap.clear();

        assertThat(mService.connect(mRemoteDevice)).isTrue();



        // Clean up and wait for it to complete

        PbapClientStateMachineOld smOld = mService.mPbapClientStateMachineOldMap.get(mRemoteDevice);

        assertThat(smOld).isNotNull();

        smOld.doQuit();

    }



    // new



    @Test

    @EnableFlags(Flags.FLAG_PBAP_CLIENT_STORAGE_REFACTOR)

    public void testConnect_onAllowedAndUnconnectedDevice_deviceCreatedAndIsConnecting() {

        mMockDeviceMap.clear();

        assertThat(mService.connect(mRemoteDevice)).isTrue();



        // Clean up and wait for it to complete

        PbapClientStateMachine sm = mMockDeviceMap.get(mRemoteDevice);

        assertThat(sm).isNotNull();

        sm.disconnect();

        TestUtils.waitForLooperToFinishScheduledTask(sm.getHandler().getLooper());

    }



    // connect (device null) -> false
@@ -753,7 +777,7 @@ public class PbapClientServiceTest { 
    // setConnectionPolicy (allowed -> connect) -> connect/true



    @Test

    public void testSetConnectionPolicy_onOld_toAllowed_connectIssued() {

    public void testSetConnectionPolicy_toAllowed_connectIssued() {

        assertThat(

                        mService.setConnectionPolicy(

                                mRemoteDevice, BluetoothProfile.CONNECTION_POLICY_ALLOWED))
@@ -766,7 +790,7 @@ public class PbapClientServiceTest { 


    @Test

    @DisableFlags(Flags.FLAG_PBAP_CLIENT_STORAGE_REFACTOR)

    public void testSetConnectionPolicy_toOld_toForbidden_disconnectIssued() {

    public void testSetConnectionPolicy_onOld_toForbidden_disconnectIssued() {

        PbapClientStateMachineOld sm = mock(PbapClientStateMachineOld.class);

        mService.mPbapClientStateMachineOldMap.put(mRemoteDevice, sm);

        assertThat(