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

Commit 3a66e424 authored by Ben's avatar Ben
Browse files

BumbleBluetoothTests: Fix reconnectExistingClient flake 

Fix GattClientTest#reconnectExistingClient flake where
the gatt callback was sometimes being called to notify
of disconnection at the end of the test. The end of the
test and the disconnection were racing. This is fixed
by explicitly disconnecting at the end of the test.

Bug: 322517596
Flag: TEST_ONLY
Test: atest BumbleBluetoothTests:android.bluetooth.GattClientTest
Change-Id: I428a3c6230aa139fc0479c1fcb5b09dd97686f57
parent f9e41790

framework/tests/bumble/src/android/bluetooth/GattClientTest.java

+8 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.mockingDetails;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;



import android.bluetooth.le.BluetoothLeScanner;

import android.content.Context;
@@ -45,6 +44,9 @@ import org.junit.runner.RunWith; 
import org.mockito.InOrder;

import org.mockito.invocation.Invocation;



import java.util.Collection;

import java.util.UUID;



import pandora.GattProto.GattCharacteristicParams;

import pandora.GattProto.GattServiceParams;

import pandora.GattProto.RegisterServiceRequest;
@@ -52,9 +54,6 @@ import pandora.HostProto.AdvertiseRequest; 
import pandora.HostProto.AdvertiseResponse;

import pandora.HostProto.OwnAddressType;



import java.util.Collection;

import java.util.UUID;



@RunWith(AndroidJUnit4.class)

public class GattClientTest {

    private static final String TAG = "GattClientTest";
@@ -134,8 +133,12 @@ public class GattClientTest { 
        inOrder.verify(gattCallback, timeout(1000))

                .onConnectionStateChange(any(), anyInt(), eq(BluetoothProfile.STATE_CONNECTED));



        // TODO(323889717): Fix callback being called after gatt.close(). This disconnect shouldn't

        //  be necessary.

        gatt.disconnect();

        inOrder.verify(gattCallback, timeout(1000))

                .onConnectionStateChange(any(), anyInt(), eq(BluetoothProfile.STATE_DISCONNECTED));

        gatt.close();

        verifyNoMoreInteractions(gattCallback);

    }



    @Test