From 2353dd54b8cbd05fe2c05350255d950897fc7ea6 Mon Sep 17 00:00:00 2001 From: hughchen Date: Tue, 13 Aug 2019 11:15:16 +0800 Subject: [PATCH] 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 --- .../BluetoothDevicePreferenceTest.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index a02ab4af949..f12e06e336b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -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()); } }