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

Commit 81b66b1c authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Bass: Fix handler timeout message test flakiness" into main am: 9ba73fdf 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3428862



Change-Id: Iff70a0f48d8d2b1f628238411bb2ede5cb355e1e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6c7ae61 9ba73fdf

android/app/tests/unit/src/com/android/bluetooth/bass_client/BassClientServiceTest.java

+15 −5
Original line number Diff line number Diff line
@@ -6280,7 +6280,9 @@ public class BassClientServiceTest { 


        checkAndDispatchTimeout(

                TEST_BROADCAST_ID, BassClientService.MESSAGE_BROADCAST_MONITOR_TIMEOUT);

        verifyStopBigMonitoringWithUnsync();

        mInOrderMethodProxy

                .verify(mMethodProxy)

                .periodicAdvertisingManagerUnregisterSync(any(), any());

        verifyRemoveMessageAndInjectSourceRemoval();

        checkNoResumeSynchronizationByBig();

    }
@@ -6310,7 +6312,9 @@ public class BassClientServiceTest { 


        checkAndDispatchTimeout(

                TEST_BROADCAST_ID, BassClientService.MESSAGE_BROADCAST_MONITOR_TIMEOUT);

        verifyStopBigMonitoringWithoutUnsync();

        mInOrderMethodProxy

                .verify(mMethodProxy, never())

                .periodicAdvertisingManagerUnregisterSync(any(), any());

        verifyRemoveMessageAndInjectSourceRemoval();

        checkNoResumeSynchronizationByBig();

    }
@@ -6324,7 +6328,9 @@ public class BassClientServiceTest { 
        sinkUnintentionalWithoutScanning();



        checkAndDispatchTimeout(TEST_BROADCAST_ID, BassClientService.MESSAGE_BIG_MONITOR_TIMEOUT);

        verifyStopBigMonitoringWithUnsync();

        mInOrderMethodProxy

                .verify(mMethodProxy)

                .periodicAdvertisingManagerUnregisterSync(any(), any());

        verifyRemoveMessageAndInjectSourceRemoval();

        checkNoResumeSynchronizationByBig();

    }
@@ -6338,7 +6344,9 @@ public class BassClientServiceTest { 
        sinkUnintentionalDuringScanning();



        checkAndDispatchTimeout(TEST_BROADCAST_ID, BassClientService.MESSAGE_BIG_MONITOR_TIMEOUT);

        verifyStopBigMonitoringWithoutUnsync();

        mInOrderMethodProxy

                .verify(mMethodProxy, never())

                .periodicAdvertisingManagerUnregisterSync(any(), any());

        verifyRemoveMessageAndInjectSourceRemoval();

        checkNoResumeSynchronizationByBig();

    }
@@ -6711,7 +6719,9 @@ public class BassClientServiceTest { 


        checkAndDispatchTimeout(

                TEST_BROADCAST_ID, BassClientService.MESSAGE_BROADCAST_MONITOR_TIMEOUT);

        verifyStopBigMonitoringWithUnsync();

        mInOrderMethodProxy

                .verify(mMethodProxy)

                .periodicAdvertisingManagerUnregisterSync(any(), any());

    }



    @Test