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

Commit 05838899 authored by Alex Shabalin's avatar Alex Shabalin
Browse files

Fix unit tests for `enable_output_switcher_session_grouping`. 

Additionally, add a null check for the `getSessionName` call.

Flag: EXEMPT TEST_ONLY
Bug: 388347018
Test: atest SystemUiRoboTests:MediaOutputAdapterTest
Change-Id: Id2c3597cacd12dc83664d6853d1523f49527ebb2
parent 572738ed

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java

+1 −0
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ public abstract class InfoMediaManager { 
        return getActiveRoutingSession().getVolume();

    }



    @Nullable

    CharSequence getSessionName() {

        return getActiveRoutingSession().getName();

    }

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+1 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ public class LocalMediaManager implements BluetoothCallback { 
     *

     * @return current name of the session, and return {@code null} if not found.

     */

    @Nullable

    public CharSequence getSessionName() {

        return mInfoMediaManager.getSessionName();

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java

+7 −4
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        when(mMediaSwitchingController.getDeviceIconCompat(mMediaDevice2)).thenReturn(mIconCompat);

        when(mMediaSwitchingController.getCurrentConnectedMediaDevice()).thenReturn(mMediaDevice1);

        when(mMediaSwitchingController.isActiveRemoteDevice(mMediaDevice1)).thenReturn(true);

        when(mMediaSwitchingController.getSessionVolumeMax()).thenReturn(TEST_MAX_VOLUME);

        when(mMediaSwitchingController.getSessionVolume()).thenReturn(TEST_CURRENT_VOLUME);

        when(mMediaSwitchingController.getSessionName()).thenReturn(TEST_SESSION_NAME);

        when(mIconCompat.toIcon(mContext)).thenReturn(mIcon);

        when(mMediaDevice1.getName()).thenReturn(TEST_DEVICE_NAME_1);

        when(mMediaDevice1.getId()).thenReturn(TEST_DEVICE_ID_1);
@@ -163,6 +166,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
                mContext.getText(R.string.media_output_dialog_pairing_new).toString());

    }



    @DisableFlags(Flags.FLAG_ENABLE_OUTPUT_SWITCHER_SESSION_GROUPING)

    @Test

    public void onBindViewHolder_bindGroup_withSessionName_verifyView() {

        when(mMediaSwitchingController.getSelectedMediaDevice())
@@ -184,6 +188,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mCheckBox.getVisibility()).isEqualTo(View.VISIBLE);

    }



    @DisableFlags(Flags.FLAG_ENABLE_OUTPUT_SWITCHER_SESSION_GROUPING)

    @Test

    public void onBindViewHolder_bindGroup_noSessionName_verifyView() {

        when(mMediaSwitchingController.getSelectedMediaDevice())
@@ -232,6 +237,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);

    }



    @DisableFlags(Flags.FLAG_ENABLE_OUTPUT_SWITCHER_SESSION_GROUPING)

    @Test

    public void onBindViewHolder_bindConnectedRemoteDevice_verifyView() {

        when(mMediaSwitchingController.getSelectableMediaDevice())
@@ -812,6 +818,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
        verify(mMediaSwitchingController).removeDeviceFromPlayMedia(mMediaDevice1);

    }



    @DisableFlags(Flags.FLAG_ENABLE_OUTPUT_SWITCHER_SESSION_GROUPING)

    @Test

    public void onItemClick_onGroupActionTriggered_verifySeekbarDisabled() {

        when(mMediaSwitchingController.getSelectedMediaDevice())
@@ -1037,10 +1044,6 @@ public class MediaOutputAdapterTest extends SysuiTestCase { 
    }



    private void initializeSession() {

        when(mMediaSwitchingController.getSessionVolumeMax()).thenReturn(TEST_MAX_VOLUME);

        when(mMediaSwitchingController.getSessionVolume()).thenReturn(TEST_CURRENT_VOLUME);

        when(mMediaSwitchingController.getSessionName()).thenReturn(TEST_SESSION_NAME);



        List<MediaDevice> selectedDevices = new ArrayList<>();

        selectedDevices.add(mMediaDevice1);

        selectedDevices.add(mMediaDevice2);

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java

+2 −1
Original line number Diff line number Diff line
@@ -313,7 +313,8 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            }



            if (isDeviceGroup) {

                String sessionName = mController.getSessionName().toString();

                String sessionName = mController.getSessionName() == null ? ""

                        : mController.getSessionName().toString();

                updateTitle(sessionName);

                updateUnmutedVolumeIcon(null /* device */);

                updateGroupSeekBar(getGroupItemContentDescription(sessionName));

packages/SystemUI/src/com/android/systemui/media/dialog/MediaSwitchingController.java

+1 −0
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ public class MediaSwitchingController 
        return mLocalMediaManager.getSessionVolume();

    }



    @Nullable

    CharSequence getSessionName() {

        return mLocalMediaManager.getSessionName();

    }