summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Simon Wingrove <simonjw@google.com> 2023-07-26 09:48:06 +0100
committer Simon Wingrove <simonjw@google.com> 2023-07-26 12:56:00 +0000
commit4f19cfa7aae2badcfbb844cc713089481ff793a7 (patch)
tree403b4c94662eb4e78b03af5507f4fab04790e91f
parent28d22a524fb45c931414cb03eadbb997bbc688d5 (diff)
Remove ScreenRecord from SC tests to speed up
Try to bring presubmit P99 runtime down by removing screenrecording. The three worst offending test cases have screen record on. I'm leaving the filepuller in AndroidTest.xml so they can be reenabled more simply if needed for debugging any flakes. Bug: 292809502 Test: atest SafetyCenterFunctionalTestCases Relnote: Remove screenrecord from some tests Change-Id: I6ca05ca5e3fcf258a38c4d44fc40366509e2df70 (cherry picked from commit 69baec38d27591018182fd7129291f5d43b1f68f)
-rw-r--r--tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt6
-rw-r--r--tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/ui/SafetyCenterSubpagesTest.kt6
2 files changed, 0 insertions, 12 deletions
diff --git a/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt b/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt
index af9aaf74f..6656d0b98 100644
--- a/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt
+++ b/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt
@@ -21,8 +21,6 @@ import android.os.Build
import android.os.Build.VERSION_CODES.TIRAMISU
import android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE
import android.os.Bundle
-import android.platform.test.rule.ScreenRecordRule
-import android.platform.test.rule.ScreenRecordRule.ScreenRecord
import android.safetycenter.SafetyCenterManager.EXTRA_SAFETY_SOURCE_ID
import android.safetycenter.SafetyCenterManager.EXTRA_SAFETY_SOURCE_ISSUE_ID
import android.safetycenter.SafetySourceData.SEVERITY_LEVEL_CRITICAL_WARNING
@@ -98,7 +96,6 @@ class SafetyCenterActivityTest {
@get:Rule(order = 2) val safetyCenterTestRule = SafetyCenterTestRule(safetyCenterTestHelper)
@get:Rule(order = 3) val disableAnimationRule = DisableAnimationRule()
@get:Rule(order = 4) val freezeRotationRule = FreezeRotationRule()
- @get:Rule(order = 5) val screenRecordRule = ScreenRecordRule()
// It is necessary to couple RetryRule and Timeout to ensure that all the retries together are
// restricted with the test timeout
@@ -425,7 +422,6 @@ class SafetyCenterActivityTest {
}
@Test
- @ScreenRecord
fun entryListWithEntryGroup_clickingAClickableDisabledEntry_redirectsToDifferentScreen() {
safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
safetyCenterTestHelper.setData(
@@ -481,7 +477,6 @@ class SafetyCenterActivityTest {
}
@Test
- @ScreenRecord
fun entryListWithSingleSource_clickingDefaultEntryImplicitIntent_redirectsToDifferentScreen() {
safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.implicitIntentSingleSourceConfig)
@@ -924,7 +919,6 @@ class SafetyCenterActivityTest {
}
@Test
- @ScreenRecord
fun launchActivity_fromQuickSettings_issuesExpanded() {
safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
safetyCenterTestHelper.setData(
diff --git a/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/ui/SafetyCenterSubpagesTest.kt b/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/ui/SafetyCenterSubpagesTest.kt
index a6230ab73..4a2267d05 100644
--- a/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/ui/SafetyCenterSubpagesTest.kt
+++ b/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/ui/SafetyCenterSubpagesTest.kt
@@ -19,8 +19,6 @@ package android.safetycenter.functional.ui
import android.content.Context
import android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE
import android.os.Bundle
-import android.platform.test.rule.ScreenRecordRule
-import android.platform.test.rule.ScreenRecordRule.ScreenRecord
import android.safetycenter.SafetyCenterManager.EXTRA_SAFETY_SOURCES_GROUP_ID
import android.safetycenter.SafetySourceData
import android.safetycenter.SafetySourceIssue
@@ -100,7 +98,6 @@ class SafetyCenterSubpagesTest {
@get:Rule(order = 2) val safetyCenterTestRule = SafetyCenterTestRule(safetyCenterTestHelper)
@get:Rule(order = 3) val disableAnimationRule = DisableAnimationRule()
@get:Rule(order = 4) val freezeRotationRule = FreezeRotationRule()
- @get:Rule(order = 5) val screenRecordRule = ScreenRecordRule()
// It is necessary to couple RetryRule and Timeout to ensure that all the retries together are
// restricted with the test timeout
@@ -314,7 +311,6 @@ class SafetyCenterSubpagesTest {
}
@Test
- @ScreenRecord
fun entryListWithSingleSource_clickingTheInfoIcon_redirectsToDifferentScreen() {
safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig)
val sourceTestData = safetySourceTestData.informationWithIconAction
@@ -479,7 +475,6 @@ class SafetyCenterSubpagesTest {
}
@Test
- @ScreenRecord
fun issueCard_updateSafetySourceData_subpageDisplaysUpdatedIssue() {
val initialDataToDisplay = safetySourceTestData.informationWithIssueWithAttributionTitle
val updatedDataToDisplay = safetySourceTestData.criticalWithIssueWithAttributionTitle
@@ -912,7 +907,6 @@ class SafetyCenterSubpagesTest {
}
@Test
- @ScreenRecord
fun settingsSearch_openWithGenericIntentExtra_showsGenericSubpage() {
val config = safetyCenterTestConfigs.multipleSourcesConfig
safetyCenterTestHelper.setConfig(config)