Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix test cases in MediaDeviceTest" into tm-dev

Browse Source
This commit is contained in:
Shaowei Shen
2022-04-08 00:44:35 +00:00
committed by Android (Google) Code Review
parent 2f48d97cff bf1a8a7f4a
commit 27561c31f0
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java
View File

@@ -224,14 +224,14 @@ public class MediaDeviceTest {
} }
@Test @Test
public void compareTo_carKit_phone_carKitFirst() { public void compareTo_carKit_phone_phoneFirst() {
when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass); when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass);
mMediaDevices.add(mPhoneMediaDevice);
mMediaDevices.add(mBluetoothMediaDevice1); mMediaDevices.add(mBluetoothMediaDevice1);
mMediaDevices.add(mPhoneMediaDevice);
assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
Collections.sort(mMediaDevices, COMPARATOR);
assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice1); assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice1);
Collections.sort(mMediaDevices, COMPARATOR);
assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
} }
@Test @Test
@@ -305,13 +305,13 @@ public class MediaDeviceTest {
} }
@Test @Test
public void compareTo_bluetooth_phone_bluetoothFirst() { public void compareTo_bluetooth_phone_phoneFirst() {
mMediaDevices.add(mPhoneMediaDevice);
mMediaDevices.add(mBluetoothMediaDevice1); mMediaDevices.add(mBluetoothMediaDevice1);
mMediaDevices.add(mPhoneMediaDevice);
assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
Collections.sort(mMediaDevices, COMPARATOR);
assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice1); assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice1);
Collections.sort(mMediaDevices, COMPARATOR);
assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
} }
@Test @Test
@@ -384,7 +384,7 @@ public class MediaDeviceTest {
// 5.mBluetoothMediaDevice2: * 2 times usage // 5.mBluetoothMediaDevice2: * 2 times usage
// 6.mBluetoothMediaDevice3: * 1 time usage // 6.mBluetoothMediaDevice3: * 1 time usage
// 7.mPhoneMediaDevice: * 0 time usage // 7.mPhoneMediaDevice: * 0 time usage
// Order: 2 -> 5 -> 6 -> 1 -> 3 -> 4 -> 7 // Order: 7 -> 2 -> 5 -> 6 -> 1 -> 3 -> 4
@Test @Test
public void compareTo_mixedDevices_carKitFirst() { public void compareTo_mixedDevices_carKitFirst() {
when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass); when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass);
@@ -406,13 +406,13 @@ public class MediaDeviceTest {
mInfoMediaDevice1.connect(); mInfoMediaDevice1.connect();
Collections.sort(mMediaDevices, COMPARATOR); Collections.sort(mMediaDevices, COMPARATOR);
assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice1); assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
assertThat(mMediaDevices.get(1)).isEqualTo(mBluetoothMediaDevice2); assertThat(mMediaDevices.get(1)).isEqualTo(mBluetoothMediaDevice1);
assertThat(mMediaDevices.get(2)).isEqualTo(mBluetoothMediaDevice3); assertThat(mMediaDevices.get(2)).isEqualTo(mBluetoothMediaDevice2);
assertThat(mMediaDevices.get(3)).isEqualTo(mInfoMediaDevice1); assertThat(mMediaDevices.get(3)).isEqualTo(mBluetoothMediaDevice3);
assertThat(mMediaDevices.get(4)).isEqualTo(mInfoMediaDevice2); assertThat(mMediaDevices.get(4)).isEqualTo(mInfoMediaDevice1);
assertThat(mMediaDevices.get(5)).isEqualTo(mInfoMediaDevice3); assertThat(mMediaDevices.get(5)).isEqualTo(mInfoMediaDevice2);
assertThat(mMediaDevices.get(6)).isEqualTo(mPhoneMediaDevice); assertThat(mMediaDevices.get(6)).isEqualTo(mInfoMediaDevice3);
} }
// 1.mInfoMediaDevice1: Last Selected device // 1.mInfoMediaDevice1: Last Selected device
@@ -422,7 +422,7 @@ public class MediaDeviceTest {
// 5.mBluetoothMediaDevice2: * 4 times usage not connected // 5.mBluetoothMediaDevice2: * 4 times usage not connected
// 6.mBluetoothMediaDevice3: * 1 time usage // 6.mBluetoothMediaDevice3: * 1 time usage
// 7.mPhoneMediaDevice: * 0 time usage // 7.mPhoneMediaDevice: * 0 time usage
// Order: 6 -> 1 -> 3 -> 4 -> 7 -> 2 -> 5 // Order: 7 -> 6 -> 1 -> 3 -> 4 -> 2 -> 5
@Test @Test
public void compareTo_mixedDevices_connectDeviceFirst() { public void compareTo_mixedDevices_connectDeviceFirst() {
when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass); when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass);
@@ -448,11 +448,11 @@ public class MediaDeviceTest {
mInfoMediaDevice1.connect(); mInfoMediaDevice1.connect();
Collections.sort(mMediaDevices, COMPARATOR); Collections.sort(mMediaDevices, COMPARATOR);
assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice3); assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
assertThat(mMediaDevices.get(1)).isEqualTo(mInfoMediaDevice1); assertThat(mMediaDevices.get(1)).isEqualTo(mBluetoothMediaDevice3);
assertThat(mMediaDevices.get(2)).isEqualTo(mInfoMediaDevice2); assertThat(mMediaDevices.get(2)).isEqualTo(mInfoMediaDevice1);
assertThat(mMediaDevices.get(3)).isEqualTo(mInfoMediaDevice3); assertThat(mMediaDevices.get(3)).isEqualTo(mInfoMediaDevice2);
assertThat(mMediaDevices.get(4)).isEqualTo(mPhoneMediaDevice); assertThat(mMediaDevices.get(4)).isEqualTo(mInfoMediaDevice3);
assertThat(mMediaDevices.get(5)).isEqualTo(mBluetoothMediaDevice1); assertThat(mMediaDevices.get(5)).isEqualTo(mBluetoothMediaDevice1);
assertThat(mMediaDevices.get(6)).isEqualTo(mBluetoothMediaDevice2); assertThat(mMediaDevices.get(6)).isEqualTo(mBluetoothMediaDevice2);
} }