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

Commit b6af45d6 authored by Wenyu Zhang's avatar Wenyu Zhang Committed by Android (Google) Code Review
Browse files

Merge "Replace Thread.sleep with mTestLooper.dispatchAll" into main

parents 3a08e285 b3a6f464

services/tests/servicestests/src/com/android/server/audio/AudioServiceTest.java

+4 −5
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class AudioServiceTest { 
            Assert.assertEquals("mic mute reporting wrong value",

                    muted, mAudioService.isMicrophoneMuted());

            // verify the intent for mic mute changed is supposed to be fired

            Thread.sleep(MAX_MESSAGE_HANDLING_DELAY_MS);

            mTestLooper.dispatchAll();

            verify(mSpySystemServer, times(1))

                    .sendMicrophoneMuteChangedIntent();

            reset(mSpySystemServer);
@@ -148,7 +148,7 @@ public class AudioServiceTest { 
            Assert.assertEquals("mic mute reporting wrong value",

                    !muted, mAudioService.isMicrophoneMuted());

            // verify the intent for mic mute changed is supposed to be fired

            Thread.sleep(MAX_MESSAGE_HANDLING_DELAY_MS);

            mTestLooper.dispatchAll();

            verify(mSpySystemServer, times(1))

                    .sendMicrophoneMuteChangedIntent();

            reset(mSpySystemServer);
@@ -159,8 +159,7 @@ public class AudioServiceTest { 
    public void testRingNotifAlias() throws Exception {

        Log.i(TAG, "running testRingNotifAlias");

        Assert.assertNotNull(mAudioService);

        // TODO add initialization message that can be caught here instead of sleeping

        Thread.sleep(MAX_MESSAGE_HANDLING_DELAY_MS); // wait for full AudioService initialization

        mTestLooper.dispatchAll(); // wait for full AudioService initialization



        // test with aliasing RING and NOTIFICATION

        mAudioService.setNotifAliasRingForTest(true);
@@ -171,7 +170,7 @@ public class AudioServiceTest { 
        mAudioService.setStreamVolume(AudioSystem.STREAM_NOTIFICATION,

                ringVol, 0, "bla");

        mAudioService.setStreamVolume(AudioSystem.STREAM_RING, ringMaxVol, 0, "bla");

        Thread.sleep(MAX_MESSAGE_HANDLING_DELAY_MS);

        mTestLooper.dispatchAll();

        Assert.assertEquals(ringMaxVol,

                mAudioService.getStreamVolume(AudioSystem.STREAM_NOTIFICATION));