Merge "Fix flaky test error"

This commit is contained in:
TreeHugger Robot
2019-08-13 11:19:30 +00:00
committed by Android (Google) Code Review

View File

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