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

Commit e3cede10 authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by Automerger Merge Worker
Browse files

Merge "GATT start timeout" into rvc-dev am: 7d9a1823 am: 2b23c254 

Change-Id: I787fba12e150dd706e2959ade2007ff0f29f4a55
parents ac6e52e4 2b23c254

tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+4 −3
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class AdapterServiceTest { 
    private @Mock android.app.Application mApplication;



    private static final int CONTEXT_SWITCH_MS = 100;

    private static final int GATT_START_TIME_MS = 500;

    private static final int ONE_SECOND_MS = 1000;

    private static final int NATIVE_INIT_MS = 8000;

    private static final int NATIVE_DISABLE_MS = 1000;
@@ -201,7 +202,7 @@ public class AdapterServiceTest { 
                invocationNumber + 1, CONTEXT_SWITCH_MS);



        // Start GATT

        verify(mMockContext, timeout(CONTEXT_SWITCH_MS).times(

        verify(mMockContext, timeout(GATT_START_TIME_MS).times(

                startServiceCalls * invocationNumber + 1)).startService(any());

        mAdapterService.addProfile(mMockGattService);

        mAdapterService.onProfileServiceStateChanged(mMockGattService, BluetoothAdapter.STATE_ON);
@@ -331,7 +332,7 @@ public class AdapterServiceTest { 
                CONTEXT_SWITCH_MS);



        // Start GATT

        verify(mMockContext, timeout(CONTEXT_SWITCH_MS).times(1)).startService(any());

        verify(mMockContext, timeout(GATT_START_TIME_MS).times(1)).startService(any());

        mAdapterService.addProfile(mMockGattService);



        verifyStateChange(BluetoothAdapter.STATE_BLE_TURNING_ON,
@@ -398,7 +399,7 @@ public class AdapterServiceTest { 
                CONTEXT_SWITCH_MS);



        // Start GATT

        verify(mMockContext, timeout(CONTEXT_SWITCH_MS).times(1)).startService(any());

        verify(mMockContext, timeout(GATT_START_TIME_MS).times(1)).startService(any());

        mAdapterService.addProfile(mMockGattService);

        mAdapterService.onProfileServiceStateChanged(mMockGattService, BluetoothAdapter.STATE_ON);