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

Commit cd5641a1 authored by William Escande's avatar William Escande
Browse files

Uniformize times(1) mockito usage 

1 is the default, we don't need to specify it

Bug: 311772251
Test: atest BluetoothInstrumentationTests
Flag: TEST_ONLY
Change-Id: Id18d97842023c2b3c9b8336150d4021656d16d50
parent 918489e2

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpCodecConfigTest.java

+2 −4
Original line number Diff line number Diff line
@@ -755,8 +755,7 @@ public class A2dpCodecConfigTest { 
                getDefaultCodecConfigByType(

                        BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,

                        BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT));

        verify(mA2dpNativeInterface, times(1))

                .setCodecConfigPreference(mTestDevice, codecConfigsArray);

        verify(mA2dpNativeInterface).setCodecConfigPreference(mTestDevice, codecConfigsArray);



        // shouldn't invoke to native when current codec is already an optional

        for (int codecType : sOptionalCodecTypes) {
@@ -764,8 +763,7 @@ public class A2dpCodecConfigTest { 
                    mTestDevice,

                    getDefaultCodecConfigByType(

                            codecType, BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT));

            verify(mA2dpNativeInterface, times(1))

                    .setCodecConfigPreference(mTestDevice, codecConfigsArray);

            verify(mA2dpNativeInterface).setCodecConfigPreference(mTestDevice, codecConfigsArray);

        }

    }

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpStateMachineTest.java

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ public class A2dpStateMachineTest { 
        // Selected codec = SBC, selectable codec = SBC

        mA2dpStateMachine.processCodecConfigEvent(codecStatusSbcAndSbc);

        verify(mA2dpService).codecConfigUpdated(mTestDevice, codecStatusSbcAndSbc, false);

        verify(mA2dpService, times(1)).updateLowLatencyAudioSupport(mTestDevice);

        verify(mA2dpService).updateLowLatencyAudioSupport(mTestDevice);



        // Inject an event to change state machine to connected state

        A2dpStackEvent connStCh =
@@ -382,7 +382,7 @@ public class A2dpStateMachineTest { 
                .sendBroadcast(intentArgument2.capture(), anyString(), any(Bundle.class));



        // Verify that state machine update optional codec when enter connected state

        verify(mA2dpService, times(1)).updateOptionalCodecsSupport(mTestDevice);

        verify(mA2dpService).updateOptionalCodecsSupport(mTestDevice);

        verify(mA2dpService, times(2)).updateLowLatencyAudioSupport(mTestDevice);



        // Change codec status when device connected.

android/app/tests/unit/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandlerTest.java

+11 −11
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public class A2dpSinkStreamHandlerTest { 
    public void testSnkPlay() {

        // Play was pressed locally, expect streaming to start soon.

        mStreamHandler.handleMessage(mStreamHandler.obtainMessage(A2dpSinkStreamHandler.SNK_PLAY));

        verify(mMockAudioManager, times(1)).requestAudioFocus(any());

        verify(mMockAudioManager).requestAudioFocus(any());

        assertThat(mStreamHandler.isPlaying()).isFalse();

        assertThat(BluetoothMediaBrowserService.isActive()).isFalse();

    }
@@ -189,7 +189,7 @@ public class A2dpSinkStreamHandlerTest { 
        // Play was pressed remotely for an iot device, expect streaming to start.

        when(mMockPackageManager.hasSystemFeature(any())).thenReturn(true);

        mStreamHandler.handleMessage(mStreamHandler.obtainMessage(A2dpSinkStreamHandler.SRC_PLAY));

        verify(mMockAudioManager, times(1)).requestAudioFocus(any());

        verify(mMockAudioManager).requestAudioFocus(any());

        TestUtils.waitForLooperToFinishScheduledTask(mHandlerThread.getLooper());

        assertThat(mStreamHandler.isPlaying()).isTrue();

    }
@@ -211,9 +211,9 @@ public class A2dpSinkStreamHandlerTest { 
        mStreamHandler.handleMessage(

                mStreamHandler.obtainMessage(

                        A2dpSinkStreamHandler.AUDIO_FOCUS_CHANGE, AudioManager.AUDIOFOCUS_GAIN));

        verify(mMockAudioManager, times(1)).requestAudioFocus(any());

        verify(mMockNativeInterface, times(1)).informAudioFocusState(1);

        verify(mMockNativeInterface, times(1)).informAudioTrackGain(1.0f);

        verify(mMockAudioManager).requestAudioFocus(any());

        verify(mMockNativeInterface).informAudioFocusState(1);

        verify(mMockNativeInterface).informAudioTrackGain(1.0f);



        TestUtils.waitForLooperToFinishScheduledTask(mHandlerThread.getLooper());

        assertThat(mStreamHandler.getFocusState()).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
@@ -228,7 +228,7 @@ public class A2dpSinkStreamHandlerTest { 
                mStreamHandler.obtainMessage(

                        A2dpSinkStreamHandler.AUDIO_FOCUS_CHANGE,

                        AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK));

        verify(mMockNativeInterface, times(1)).informAudioTrackGain(DUCK_PERCENT / 100.0f);

        verify(mMockNativeInterface).informAudioTrackGain(DUCK_PERCENT / 100.0f);



        TestUtils.waitForLooperToFinishScheduledTask(mHandlerThread.getLooper());

        assertThat(mStreamHandler.getFocusState())
@@ -246,7 +246,7 @@ public class A2dpSinkStreamHandlerTest { 
                        AudioManager.AUDIOFOCUS_LOSS_TRANSIENT));

        verify(mMockAudioManager, times(0)).abandonAudioFocus(any());

        verify(mMockNativeInterface, times(0)).informAudioFocusState(0);

        verify(mMockNativeInterface, times(1)).informAudioTrackGain(0);

        verify(mMockNativeInterface).informAudioTrackGain(0);



        TestUtils.waitForLooperToFinishScheduledTask(mHandlerThread.getLooper());

        assertThat(mStreamHandler.getFocusState())
@@ -264,7 +264,7 @@ public class A2dpSinkStreamHandlerTest { 
                        AudioManager.AUDIOFOCUS_LOSS_TRANSIENT));

        verify(mMockAudioManager, times(0)).abandonAudioFocus(any());

        verify(mMockNativeInterface, times(0)).informAudioFocusState(0);

        verify(mMockNativeInterface, times(1)).informAudioTrackGain(0);

        verify(mMockNativeInterface).informAudioTrackGain(0);

        mStreamHandler.handleMessage(

                mStreamHandler.obtainMessage(A2dpSinkStreamHandler.REQUEST_FOCUS, true));

        verify(mMockAudioManager, times(2)).requestAudioFocus(any());
@@ -281,7 +281,7 @@ public class A2dpSinkStreamHandlerTest { 
                mStreamHandler.obtainMessage(

                        A2dpSinkStreamHandler.AUDIO_FOCUS_CHANGE, AudioManager.AUDIOFOCUS_GAIN));

        verify(mMockAudioManager, times(0)).abandonAudioFocus(any());

        verify(mMockNativeInterface, times(1)).informAudioTrackGain(1.0f);

        verify(mMockNativeInterface).informAudioTrackGain(1.0f);



        TestUtils.waitForLooperToFinishScheduledTask(mHandlerThread.getLooper());

        assertThat(BluetoothMediaBrowserService.isActive()).isTrue();
@@ -295,8 +295,8 @@ public class A2dpSinkStreamHandlerTest { 
        mStreamHandler.handleMessage(

                mStreamHandler.obtainMessage(

                        A2dpSinkStreamHandler.AUDIO_FOCUS_CHANGE, AudioManager.AUDIOFOCUS_LOSS));

        verify(mMockAudioManager, times(1)).abandonAudioFocus(any());

        verify(mMockNativeInterface, times(1)).informAudioFocusState(0);

        verify(mMockAudioManager).abandonAudioFocus(any());

        verify(mMockNativeInterface).informAudioFocusState(0);



        TestUtils.waitForLooperToFinishScheduledTask(mHandlerThread.getLooper());

        assertThat(BluetoothMediaBrowserService.isActive()).isFalse();

android/app/tests/unit/src/com/android/bluetooth/audio_util/BrowserPlayerWrapperTest.java

+10 −10
Original line number Diff line number Diff line
@@ -197,10 +197,10 @@ public class BrowserPlayerWrapperTest { 
        verify(mMockBrowser).testInit(any(), any(), mBrowserConnCb.capture(), any());

        MediaBrowser.ConnectionCallback browserConnCb = mBrowserConnCb.getValue();



        verify(mMockBrowser, times(1)).connect();

        verify(mMockBrowser).connect();

        browserConnCb.onConnected();

        verify(mConnCb).run(eq(BrowsedPlayerWrapper.STATUS_SUCCESS), eq(wrapper));

        verify(mMockBrowser, times(1)).disconnect();

        verify(mMockBrowser).disconnect();

    }



    @Test
@@ -211,7 +211,7 @@ public class BrowserPlayerWrapperTest { 
        verify(mMockBrowser).testInit(any(), any(), mBrowserConnCb.capture(), any());

        MediaBrowser.ConnectionCallback browserConnCb = mBrowserConnCb.getValue();



        verify(mMockBrowser, times(1)).connect();

        verify(mMockBrowser).connect();

        browserConnCb.onConnectionSuspended();

        verify(mConnCb).run(eq(BrowsedPlayerWrapper.STATUS_CONN_ERROR), eq(wrapper));

        // Twice because our mConnCb is wrapped when using the plain connect() call and disconnect
@@ -228,10 +228,10 @@ public class BrowserPlayerWrapperTest { 
        verify(mMockBrowser).testInit(any(), any(), mBrowserConnCb.capture(), any());

        MediaBrowser.ConnectionCallback browserConnCb = mBrowserConnCb.getValue();



        verify(mMockBrowser, times(1)).connect();

        verify(mMockBrowser).connect();

        browserConnCb.onConnectionFailed();

        verify(mConnCb).run(eq(BrowsedPlayerWrapper.STATUS_CONN_ERROR), eq(wrapper));

        verify(mMockBrowser, times(1)).disconnect();

        verify(mMockBrowser).disconnect();

    }



    @Test
@@ -245,11 +245,11 @@ public class BrowserPlayerWrapperTest { 
        verify(mMockBrowser).testInit(any(), any(), mBrowserConnCb.capture(), any());

        MediaBrowser.ConnectionCallback browserConnCb = mBrowserConnCb.getValue();



        verify(mMockBrowser, times(1)).connect();

        verify(mMockBrowser).connect();



        browserConnCb.onConnected();

        verify(mConnCb).run(eq(BrowsedPlayerWrapper.STATUS_CONN_ERROR), eq(wrapper));

        verify(mMockBrowser, times(1)).disconnect();

        verify(mMockBrowser).disconnect();

    }



    @Test
@@ -284,7 +284,7 @@ public class BrowserPlayerWrapperTest { 
        MediaBrowser.ConnectionCallback browserConnCb = mBrowserConnCb.getValue();



        wrapper.playItem("test_item");

        verify(mMockBrowser, times(1)).connect();

        verify(mMockBrowser).connect();



        MediaController mockController = mock(MediaController.class);

        MediaController.TransportControls mockTransport =
@@ -310,7 +310,7 @@ public class BrowserPlayerWrapperTest { 
        // Once we're told we're playing, make sure we disconnect

        builder.setState(PlaybackState.STATE_PLAYING, 0, 1);

        controllerCb.onPlaybackStateChanged(builder.build());

        verify(mMockBrowser, times(1)).disconnect();

        verify(mMockBrowser).disconnect();

    }



    @Test
@@ -321,7 +321,7 @@ public class BrowserPlayerWrapperTest { 
        MediaBrowser.ConnectionCallback browserConnCb = mBrowserConnCb.getValue();



        wrapper.playItem("test_item");

        verify(mMockBrowser, times(1)).connect();

        verify(mMockBrowser).connect();



        MediaController mockController = mock(MediaController.class);

        MediaController.TransportControls mockTransport =

android/app/tests/unit/src/com/android/bluetooth/audio_util/MediaPlayerWrapperTest.java

+8 −8
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ public class MediaPlayerWrapperTest { 
        controllerCallbacks.onMetadataChanged(mTestMetadata.build());



        // Assert that the metadata was updated and playback state wasn't

        verify(mTestCbs, times(1)).mediaUpdatedCallback(mMediaUpdateData.capture());

        verify(mTestCbs).mediaUpdatedCallback(mMediaUpdateData.capture());

        MediaData data = mMediaUpdateData.getValue();

        Assert.assertEquals(

                "Returned Metadata isn't equal to given Metadata",
@@ -332,7 +332,7 @@ public class MediaPlayerWrapperTest { 
        controllerCallbacks.onPlaybackStateChanged(mTestState.build());



        // Assert that both metadata and playback state are there.

        verify(mTestCbs, times(1)).mediaUpdatedCallback(mMediaUpdateData.capture());

        verify(mTestCbs).mediaUpdatedCallback(mMediaUpdateData.capture());

        MediaData data = mMediaUpdateData.getValue();

        Assert.assertEquals(

                "Returned PlaybackState isn't equal to given PlaybackState",
@@ -371,7 +371,7 @@ public class MediaPlayerWrapperTest { 
        controllerCallbacks.onMetadataChanged(null);



        // Assert that the metadata returned by getMetadata() is used instead of null

        verify(mTestCbs, times(1)).mediaUpdatedCallback(mMediaUpdateData.capture());

        verify(mTestCbs).mediaUpdatedCallback(mMediaUpdateData.capture());

        MediaData data = mMediaUpdateData.getValue();

        Assert.assertEquals(

                "Returned metadata is incorrect",
@@ -402,7 +402,7 @@ public class MediaPlayerWrapperTest { 


        // Assert that the metadata returned by getPlaybackState() is used instead of null



        verify(mTestCbs, times(1)).mediaUpdatedCallback(mMediaUpdateData.capture());

        verify(mTestCbs).mediaUpdatedCallback(mMediaUpdateData.capture());

        MediaData data = mMediaUpdateData.getValue();

        Assert.assertEquals(

                "Returned PlaybackState is incorrect",
@@ -428,7 +428,7 @@ public class MediaPlayerWrapperTest { 
        controllerCallbacks.onQueueChanged(null);



        // Assert that both metadata and playback state are there.

        verify(mTestCbs, times(1)).mediaUpdatedCallback(mMediaUpdateData.capture());

        verify(mTestCbs).mediaUpdatedCallback(mMediaUpdateData.capture());

        MediaData data = mMediaUpdateData.getValue();

        Assert.assertEquals("Returned Queue isn't null", data.queue.size(), 0);

    }
@@ -509,7 +509,7 @@ public class MediaPlayerWrapperTest { 
        controllerCallbacks.onPlaybackStateChanged(mTestState.build());



        // Assert that both metadata and only the first playback state is there.

        verify(mTestCbs, times(1)).mediaUpdatedCallback(mMediaUpdateData.capture());

        verify(mTestCbs).mediaUpdatedCallback(mMediaUpdateData.capture());

        MediaData data = mMediaUpdateData.getValue();

        Assert.assertEquals(

                "Returned PlaybackState isn't equal to given PlaybackState",
@@ -625,7 +625,7 @@ public class MediaPlayerWrapperTest { 
        controllerCallbacks.onQueueChanged(getQueueFromDescriptions(mTestQueue));



        // Assert that the callback was called with the updated data

        verify(mTestCbs, times(1)).mediaUpdatedCallback(mMediaUpdateData.capture());

        verify(mTestCbs).mediaUpdatedCallback(mMediaUpdateData.capture());

        verify(mFailHandler, never()).onTerribleFailure(any(), any(), anyBoolean());

        MediaData data = mMediaUpdateData.getValue();

        Assert.assertEquals(
@@ -676,7 +676,7 @@ public class MediaPlayerWrapperTest { 
        verify(mFailHandler).onTerribleFailure(any(), any(), anyBoolean());



        // Assert that the callback was called with the mismatch data

        verify(mTestCbs, times(1)).mediaUpdatedCallback(mMediaUpdateData.capture());

        verify(mTestCbs).mediaUpdatedCallback(mMediaUpdateData.capture());

        MediaData data = mMediaUpdateData.getValue();

        Assert.assertEquals(

                "Returned Metadata isn't equal to given Metadata",