commit 9e5142b14d5bf18f46b27d46012e339e541ccd4b
author tim peng <timhypeng@google.com> Mon Mar 09 01:53:35 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 09 01:53:35 2020 +0000
tree 3627a169a4f70169ac46606d06014385e25f1e1f
parent 9ce0e0ca55530af5959c7dd96d40f6549ee45ec1
parent 37e8a34a40016172f6883209bc8c01bb0291e0d8

Merge "Update failed test case" into rvc-dev

tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java

diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
index 0f54cfb..c01c9b0 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
@@ -50,7 +50,6 @@
 import com.android.settingslib.media.MediaDevice;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -158,7 +157,6 @@
     }
 
     @Test
-    @Ignore
     public void getSlice_disconnectedBluetooth_verifyTitle() {
         mDevices.clear();
         final MediaDevice device = mock(MediaDevice.class);
@@ -166,6 +164,7 @@
         when(device.getIcon()).thenReturn(mTestDrawable);
         when(device.getMaxVolume()).thenReturn(100);
         when(device.isConnected()).thenReturn(false);
+        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE);
 
         mDevices.add(device);
         mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
@@ -174,8 +173,8 @@
         final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
 
         final SliceAction primaryAction = metadata.getPrimaryAction();
-        assertThat(primaryAction.getTitle().toString()).isEqualTo(TEST_DEVICE_1_NAME + " ("
-                + mContext.getText(R.string.media_output_disconnected_status) + ")");
+        assertThat(primaryAction.getTitle().toString()).isEqualTo(mContext.getString(
+                R.string.media_output_disconnected_status, TEST_DEVICE_1_NAME));
     }
 
     @Test