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

Commit 66ca4bbd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix flaky test error"

parents 4f9595a8 2353dd54

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());

    }

}