PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Fix queryShortcuts_shouldSortBasedOnPriority test

Browse Source 
Previously this test asserted that the resulting ActivityInfo instances
from the queryShortcuts() method were the same address. While this can
assert general equality, it is more robust to assert the resulting
ResolveInfos- mainly that they are sorted by priority.

Bug: b/314924127
Test: atest SettingsRoboTests:com.android.settings.shortcut.CreateShortcutPreferenceControllerTest
Flag: TEST_ONLY
Change-Id: I00210440c7c1a87a6f8eb7a2866ae8571ec7d053
This commit is contained in:
Wes Okuhara
2024-11-12 12:06:04 -08:00
parent 229a1dbca3
commit 33a7b96f5f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
View File

@@ -141,7 +141,6 @@ public class CreateShortcutPreferenceControllerTest {
assertThat(resultActivityInfo.applicationInfo.isSystemApp()).isTrue(); assertThat(resultActivityInfo.applicationInfo.isSystemApp()).isTrue();
} }
@Ignore("b/314924127")
@Test @Test
public void queryShortcuts_shouldSortBasedOnPriority() { public void queryShortcuts_shouldSortBasedOnPriority() {
final ResolveInfo ri1 = new ResolveInfo(); final ResolveInfo ri1 = new ResolveInfo();
@@ -165,8 +164,12 @@ public class CreateShortcutPreferenceControllerTest {
doReturn(false).when(mController).canShowWifiHotspot(); doReturn(false).when(mController).canShowWifiHotspot();
final List<ResolveInfo> info = mController.queryShortcuts(); final List<ResolveInfo> info = mController.queryShortcuts();
assertThat(info).hasSize(2); assertThat(info).hasSize(2);
assertThat(info.get(0).activityInfo).isEqualTo(ri2.activityInfo);
assertThat(info.get(1).activityInfo).isEqualTo(ri1.activityInfo); final ResolveInfo resultRi1 = info.get(0);
assertThat(resultRi1.activityInfo.name).isEqualTo(ri2.activityInfo.name);
final ResolveInfo resultRi2 = info.get(1);
assertThat(resultRi2.activityInfo.name).isEqualTo(ri1.activityInfo.name);
assertThat(resultRi1.priority).isLessThan(resultRi2.priority);
} }
@Test @Test