PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Output switcher subtitle modification" into rvc-dev am: 2c9d412ba2 am: 3d75454911 am: 2105141fe8 am: 7b33d011e1

Browse Source 
Change-Id: Ie1813961b78ae310608984753943bc035e3c9636
This commit is contained in:
tim peng
2020-04-14 03:27:32 +00:00
committed by Automerger Merge Worker
parent f04723e6f0 7b33d011e1
commit 0776ae9642
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
View File

@@ -35,7 +35,6 @@ import android.media.session.MediaController;
import android.media.session.MediaSessionManager;
import android.media.session.PlaybackState;
import android.net.Uri;
import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.slices.CustomSliceRegistry;
@@ -238,28 +237,31 @@ public class MediaOutputPanelTest {
}
@Test
public void getSubTitle_noMetadata_returnEmpty() {
public void getSubTitle_noMetadata_returnDefault() {
when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME);
when(mMediaController.getMetadata()).thenReturn(null);
assertThat(TextUtils.isEmpty(mPanel.getSubTitle())).isTrue();
assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
R.string.media_output_panel_title));
}
@Test
public void getSubTitle_noPackageName_returnEmpty() {
public void getSubTitle_noPackageName_returnDefault() {
mPanel = MediaOutputPanel.create(mContext, null);
when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
assertThat(TextUtils.isEmpty(mPanel.getSubTitle())).isTrue();
assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
R.string.media_output_panel_title));
}
@Test
public void getSubTitle_noController_returnEmpty() {
public void getSubTitle_noController_returnDefault() {
mMediaControllers.clear();
mPanel = MediaOutputPanel.create(mContext, TEST_PACKAGENAME);
when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
assertThat(TextUtils.isEmpty(mPanel.getSubTitle())).isTrue();
assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
R.string.media_output_panel_title));
}
@Test