Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix test cases in MediaDeviceTest" (b3063b68) · Commits · e / os / android_frameworks_base

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

+22 −22

Original line number	Diff line number	Diff line
		@@ -224,14 +224,14 @@ public class MediaDeviceTest {
		}

		@Test
		public void compareTo_carKit_phone_carKitFirst() {
		public void compareTo_carKit_phone_phoneFirst() {
		when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass);
		mMediaDevices.add(mPhoneMediaDevice);
		mMediaDevices.add(mBluetoothMediaDevice1);
		mMediaDevices.add(mPhoneMediaDevice);

		assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
		Collections.sort(mMediaDevices, COMPARATOR);
		assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice1);
		Collections.sort(mMediaDevices, COMPARATOR);
		assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
		}

		@Test
		@@ -305,13 +305,13 @@ public class MediaDeviceTest {
		}

		@Test
		public void compareTo_bluetooth_phone_bluetoothFirst() {
		mMediaDevices.add(mPhoneMediaDevice);
		public void compareTo_bluetooth_phone_phoneFirst() {
		mMediaDevices.add(mBluetoothMediaDevice1);
		mMediaDevices.add(mPhoneMediaDevice);

		assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
		Collections.sort(mMediaDevices, COMPARATOR);
		assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice1);
		Collections.sort(mMediaDevices, COMPARATOR);
		assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
		}

		@Test
		@@ -384,7 +384,7 @@ public class MediaDeviceTest {
		// 5.mBluetoothMediaDevice2: * 2 times usage
		// 6.mBluetoothMediaDevice3: * 1 time usage
		// 7.mPhoneMediaDevice: * 0 time usage
		// Order: 2 -> 5 -> 6 -> 1 -> 3 -> 4 -> 7
		// Order: 7 -> 2 -> 5 -> 6 -> 1 -> 3 -> 4
		@Test
		public void compareTo_mixedDevices_carKitFirst() {
		when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass);
		@@ -406,13 +406,13 @@ public class MediaDeviceTest {
		mInfoMediaDevice1.connect();

		Collections.sort(mMediaDevices, COMPARATOR);
		assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice1);
		assertThat(mMediaDevices.get(1)).isEqualTo(mBluetoothMediaDevice2);
		assertThat(mMediaDevices.get(2)).isEqualTo(mBluetoothMediaDevice3);
		assertThat(mMediaDevices.get(3)).isEqualTo(mInfoMediaDevice1);
		assertThat(mMediaDevices.get(4)).isEqualTo(mInfoMediaDevice2);
		assertThat(mMediaDevices.get(5)).isEqualTo(mInfoMediaDevice3);
		assertThat(mMediaDevices.get(6)).isEqualTo(mPhoneMediaDevice);
		assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
		assertThat(mMediaDevices.get(1)).isEqualTo(mBluetoothMediaDevice1);
		assertThat(mMediaDevices.get(2)).isEqualTo(mBluetoothMediaDevice2);
		assertThat(mMediaDevices.get(3)).isEqualTo(mBluetoothMediaDevice3);
		assertThat(mMediaDevices.get(4)).isEqualTo(mInfoMediaDevice1);
		assertThat(mMediaDevices.get(5)).isEqualTo(mInfoMediaDevice2);
		assertThat(mMediaDevices.get(6)).isEqualTo(mInfoMediaDevice3);
		}

		// 1.mInfoMediaDevice1: Last Selected device
		@@ -422,7 +422,7 @@ public class MediaDeviceTest {
		// 5.mBluetoothMediaDevice2: * 4 times usage not connected
		// 6.mBluetoothMediaDevice3: * 1 time usage
		// 7.mPhoneMediaDevice: * 0 time usage
		// Order: 6 -> 1 -> 3 -> 4 -> 7 -> 2 -> 5
		// Order: 7 -> 6 -> 1 -> 3 -> 4 -> 2 -> 5
		@Test
		public void compareTo_mixedDevices_connectDeviceFirst() {
		when(mDevice1.getBluetoothClass()).thenReturn(mCarkitClass);
		@@ -448,11 +448,11 @@ public class MediaDeviceTest {
		mInfoMediaDevice1.connect();

		Collections.sort(mMediaDevices, COMPARATOR);
		assertThat(mMediaDevices.get(0)).isEqualTo(mBluetoothMediaDevice3);
		assertThat(mMediaDevices.get(1)).isEqualTo(mInfoMediaDevice1);
		assertThat(mMediaDevices.get(2)).isEqualTo(mInfoMediaDevice2);
		assertThat(mMediaDevices.get(3)).isEqualTo(mInfoMediaDevice3);
		assertThat(mMediaDevices.get(4)).isEqualTo(mPhoneMediaDevice);
		assertThat(mMediaDevices.get(0)).isEqualTo(mPhoneMediaDevice);
		assertThat(mMediaDevices.get(1)).isEqualTo(mBluetoothMediaDevice3);
		assertThat(mMediaDevices.get(2)).isEqualTo(mInfoMediaDevice1);
		assertThat(mMediaDevices.get(3)).isEqualTo(mInfoMediaDevice2);
		assertThat(mMediaDevices.get(4)).isEqualTo(mInfoMediaDevice3);
		assertThat(mMediaDevices.get(5)).isEqualTo(mBluetoothMediaDevice1);
		assertThat(mMediaDevices.get(6)).isEqualTo(mBluetoothMediaDevice2);
		}