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

Commit ec863325 authored by Vasu Nori's avatar Vasu Nori
Browse files

port this change to aosp/ I3fb908c43f869e8816f6e46c6b271ef0bbd15be0 

Fix a flaky test.

Test: tested manually. In a script ran the test 100 times. no errors.
Change-Id: I94dbde46f40b523d762c9c4e9fcdfe0ecee5f09c
parent 85c7942a

android/app/tests/src/com/android/bluetooth/btservice/RemoteDevicesTest.java

+18 −7
Original line number Diff line number Diff line
@@ -49,14 +49,11 @@ public class RemoteDevicesTest { 


    @Test

    public void testSendUuidIntent() {

        mRemoteDevices.updateUuids(mDevice1);

        if (Looper.myLooper() != null) {

            Looper.myLooper().quitSafely();

        }

        MyAdapterSvc m = new MyAdapterSvc();

        RemoteDevices instance = new RemoteDevices(m);

        instance.updateUuids(mDevice1);

        Looper.loop();



        verify(mAdapterService).sendBroadcast(any(), anyString());

        verifyNoMoreInteractions(mAdapterService);

        Assert.assertTrue(m.isRecvd());

    }



    @Test
@@ -465,4 +462,18 @@ public class RemoteDevicesTest { 
        list.add(0);

        return list.toArray();

    }



    public class MyAdapterSvc extends AdapterService {

        private boolean recvd = false;



        @Override

        public void sendBroadcast(Intent intent, String receiverPermission) {

            recvd = (intent.getAction() == BluetoothDevice.ACTION_UUID);

            if (recvd || Looper.myQueue().isIdle()) Looper.myLooper().quitSafely();

        }



        boolean isRecvd() {

            return recvd;

        }

    }

}