Disable APP_ARCHIVING flag for specific test
APP_ARCHIVING flag was introduced to control archiving feature in Settings separately from OS. The broken test was expecting archiving feature flag be disabled but it didn't take into account a newly introduced flag which was automatically rolled out in ag/26270549 Test: AppButtonsTest Bug: 325632047 Change-Id: I02a1f4e2e2bfa1b85f2d993c4127698c8a6195dc
This commit is contained in:
@@ -24,6 +24,7 @@ import android.content.pm.Flags
|
|||||||
import android.content.pm.PackageInfo
|
import android.content.pm.PackageInfo
|
||||||
import android.content.pm.PackageInstaller
|
import android.content.pm.PackageInstaller
|
||||||
import android.content.pm.PackageManager
|
import android.content.pm.PackageManager
|
||||||
|
import android.platform.test.flag.junit.SetFlagsRule
|
||||||
import androidx.compose.ui.test.assertIsDisplayed
|
import androidx.compose.ui.test.assertIsDisplayed
|
||||||
import androidx.compose.ui.test.assertIsEnabled
|
import androidx.compose.ui.test.assertIsEnabled
|
||||||
import androidx.compose.ui.test.assertIsNotDisplayed
|
import androidx.compose.ui.test.assertIsNotDisplayed
|
||||||
@@ -34,6 +35,7 @@ import androidx.test.core.app.ApplicationProvider
|
|||||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||||
import com.android.dx.mockito.inline.extended.ExtendedMockito
|
import com.android.dx.mockito.inline.extended.ExtendedMockito
|
||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
|
import com.android.settings.flags.Flags as SettingsFlags
|
||||||
import com.android.settingslib.applications.AppUtils
|
import com.android.settingslib.applications.AppUtils
|
||||||
import com.android.settingslib.spa.testutils.delay
|
import com.android.settingslib.spa.testutils.delay
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
@@ -54,6 +56,8 @@ class AppButtonsTest {
|
|||||||
@get:Rule
|
@get:Rule
|
||||||
val composeTestRule = createComposeRule()
|
val composeTestRule = createComposeRule()
|
||||||
|
|
||||||
|
@get:Rule val setFlagsRule: SetFlagsRule = SetFlagsRule()
|
||||||
|
|
||||||
private lateinit var mockSession: MockitoSession
|
private lateinit var mockSession: MockitoSession
|
||||||
|
|
||||||
@Spy
|
@Spy
|
||||||
@@ -113,6 +117,7 @@ class AppButtonsTest {
|
|||||||
fun launchButton_displayed_archivingDisabled() {
|
fun launchButton_displayed_archivingDisabled() {
|
||||||
whenever(packageManager.getLaunchIntentForPackage(PACKAGE_NAME)).thenReturn(Intent())
|
whenever(packageManager.getLaunchIntentForPackage(PACKAGE_NAME)).thenReturn(Intent())
|
||||||
featureFlags.setFlag(Flags.FLAG_ARCHIVING, false)
|
featureFlags.setFlag(Flags.FLAG_ARCHIVING, false)
|
||||||
|
setFlagsRule.disableFlags(SettingsFlags.FLAG_APP_ARCHIVING)
|
||||||
setContent()
|
setContent()
|
||||||
|
|
||||||
composeTestRule.onNodeWithText(context.getString(R.string.launch_instant_app))
|
composeTestRule.onNodeWithText(context.getString(R.string.launch_instant_app))
|
||||||
|
Reference in New Issue
Block a user