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

Commit bb955700 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Make sure timeout message is handled" into main am: bdf9b8a5 

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



Change-Id: I485ee0be07ccb72a087971b27cfc0a8b2588f15a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df4df0d3 bdf9b8a5

android/app/tests/unit/src/com/android/bluetooth/gatt/ScanManagerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ public class ScanManagerTest { 
            assertThat(client.settings.getScanMode()).isEqualTo(ScanMode);

            // Wait for scan timeout

            testSleep(DELAY_SCAN_TIMEOUT_MS + DELAY_ASYNC_MS);

            TestUtils.waitForLooperToFinishScheduledTask(mHandler.getLooper());

            assertThat(client.settings.getScanMode()).isEqualTo(expectedScanMode);

            assertThat(client.stats.isScanTimeout(client.scannerId)).isTrue();

            // Turn off screen
@@ -617,6 +618,7 @@ public class ScanManagerTest { 
            assertThat(client.settings.getScanMode()).isEqualTo(ScanMode);

            // Wait for scan timeout

            testSleep(DELAY_SCAN_TIMEOUT_MS + DELAY_ASYNC_MS);

            TestUtils.waitForLooperToFinishScheduledTask(mHandler.getLooper());

            assertThat(client.settings.getScanMode()).isEqualTo(expectedScanMode);

            assertThat(client.stats.isScanTimeout(client.scannerId)).isTrue();

            // Turn off screen
@@ -745,6 +747,7 @@ public class ScanManagerTest { 
            assertThat(client.settings.getScanMode()).isEqualTo(expectedScanMode);

            // Wait for upgrade duration

            testSleep(DELAY_SCAN_UPGRADE_DURATION_MS + DELAY_ASYNC_MS);

            TestUtils.waitForLooperToFinishScheduledTask(mHandler.getLooper());

            assertThat(client.settings.getScanMode()).isEqualTo(ScanMode);

        }

    }
@@ -789,6 +792,7 @@ public class ScanManagerTest { 
            int max_duration = DELAY_SCAN_UPGRADE_DURATION_MS > DELAY_SCAN_DOWNGRADE_DURATION_MS ?

                    DELAY_SCAN_UPGRADE_DURATION_MS : DELAY_SCAN_DOWNGRADE_DURATION_MS;

            testSleep(max_duration + DELAY_ASYNC_MS);

            TestUtils.waitForLooperToFinishScheduledTask(mHandler.getLooper());

            assertThat(client.settings.getScanMode()).isEqualTo(ScanMode);

        }

    }
@@ -829,6 +833,7 @@ public class ScanManagerTest { 
            assertThat(client.settings.getScanMode()).isEqualTo(expectedScanMode);

            // Wait for downgrade duration

            testSleep(DELAY_SCAN_DOWNGRADE_DURATION_MS + DELAY_ASYNC_MS);

            TestUtils.waitForLooperToFinishScheduledTask(mHandler.getLooper());

            assertThat(client.settings.getScanMode()).isEqualTo(ScanMode);

        }

    }
@@ -870,6 +875,7 @@ public class ScanManagerTest { 
            sendMessageWaitForProcessed(createScreenOnOffMessage(false));

            // Wait for downgrade duration

            testSleep(DELAY_SCAN_DOWNGRADE_DURATION_MS + DELAY_ASYNC_MS);

            TestUtils.waitForLooperToFinishScheduledTask(mHandler.getLooper());

            assertThat(mScanManager.getRegularScanQueue().contains(client)).isTrue();

            assertThat(mScanManager.getSuspendedScanQueue().contains(client)).isFalse();

            assertThat(client.settings.getScanMode()).isEqualTo(expectedScanMode);
@@ -913,6 +919,7 @@ public class ScanManagerTest { 
            sendMessageWaitForProcessed(createImportanceMessage(false));

            // Wait for downgrade duration

            testSleep(DELAY_SCAN_DOWNGRADE_DURATION_MS + DELAY_ASYNC_MS);

            TestUtils.waitForLooperToFinishScheduledTask(mHandler.getLooper());

            assertThat(mScanManager.getRegularScanQueue().contains(client)).isTrue();

            assertThat(mScanManager.getSuspendedScanQueue().contains(client)).isFalse();

            assertThat(client.settings.getScanMode()).isEqualTo(expectedScanMode);