Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2353dd54 authored by hughchen's avatar hughchen
Browse files

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
parent 2862e794

tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java

+12 −6
Original line number Diff line number Diff line
@@ -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());

    }

}