Merge "Fix failing tests related to archiving" into main (23cf3f1c) · Commits · e / os / android_frameworks_base

packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt

+1 −19

Original line number	Diff line number	Diff line
		@@ -126,10 +126,7 @@ class AppListRepositoryTest {
		val flags = argumentCaptor<ApplicationInfoFlags> {
		verify(packageManager).getInstalledApplicationsAsUser(capture(), eq(ADMIN_USER_ID))
		}.firstValue
		assertThat(flags.value).isEqualTo(
		PackageManager.MATCH_DISABLED_COMPONENTS or
		PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
		)
		assertThat(flags.value and PackageManager.MATCH_ANY_USER.toLong()).isEqualTo(0L)
		}

		@Test
		@@ -275,21 +272,6 @@ class AppListRepositoryTest {
		)
		}

		@Test
		fun loadApps_archivedAppsDisabled() = runTest {
		mockInstalledApplications(listOf(NORMAL_APP), ADMIN_USER_ID)
		val appList = repository.loadApps(userId = ADMIN_USER_ID)

		assertThat(appList).containsExactly(NORMAL_APP)
		val flags = argumentCaptor<ApplicationInfoFlags> {
		verify(packageManager).getInstalledApplicationsAsUser(capture(), eq(ADMIN_USER_ID))
		}.firstValue
		assertThat(flags.value).isEqualTo(
		PackageManager.MATCH_DISABLED_COMPONENTS or
		PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
		)
		}

		@Test
		fun showSystemPredicate_showSystem() = runTest {
		val app = SYSTEM_APP