Fix flaky test error

Use mac address to check preference whether is equal instead of use
preference.

Bug: 138547532
Test: make -j42 RunSettingsRoboTests
Change-Id: Iffbbdf063e78a3bf40e74d798ef4dd3a439f8677
This commit is contained in:
hughchen
2019-08-13 11:15:16 +08:00
parent 2862e79478
commit 2353dd54b8

View File

@@ -229,9 +229,12 @@ public class BluetoothDevicePreferenceTest {
mPreferenceList.add(preference3);
Collections.sort(mPreferenceList, COMPARATOR);
assertThat(mPreferenceList.get(0)).isEqualTo(preference3);
assertThat(mPreferenceList.get(1)).isEqualTo(preference2);
assertThat(mPreferenceList.get(2)).isEqualTo(preference1);
assertThat(mPreferenceList.get(0).getCachedDevice().getAddress())
.isEqualTo(preference3.getCachedDevice().getAddress());
assertThat(mPreferenceList.get(1).getCachedDevice().getAddress())
.isEqualTo(preference2.getCachedDevice().getAddress());
assertThat(mPreferenceList.get(2).getCachedDevice().getAddress())
.isEqualTo(preference1.getCachedDevice().getAddress());
}
@Test
@@ -251,8 +254,11 @@ public class BluetoothDevicePreferenceTest {
mPreferenceList.add(preference3);
Collections.sort(mPreferenceList, COMPARATOR);
assertThat(mPreferenceList.get(0)).isEqualTo(preference1);
assertThat(mPreferenceList.get(1)).isEqualTo(preference2);
assertThat(mPreferenceList.get(2)).isEqualTo(preference3);
assertThat(mPreferenceList.get(0).getCachedDevice().getAddress())
.isEqualTo(preference1.getCachedDevice().getAddress());
assertThat(mPreferenceList.get(1).getCachedDevice().getAddress())
.isEqualTo(preference2.getCachedDevice().getAddress());
assertThat(mPreferenceList.get(2).getCachedDevice().getAddress())
.isEqualTo(preference3.getCachedDevice().getAddress());
}
}