Rename ScenarioConfig and InitializedScenarioConfig for clarity
Test: atest FlickerLibTest
Change-Id: Iba0b94fa8c739b807ff7045a6dc1f36910a5cc72
diff --git a/libraries/flicker/src/android/tools/common/flicker/ScenarioInstance.kt b/libraries/flicker/src/android/tools/common/flicker/ScenarioInstance.kt
index c599c6e..31b9a53 100644
--- a/libraries/flicker/src/android/tools/common/flicker/ScenarioInstance.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/ScenarioInstance.kt
@@ -18,13 +18,13 @@
import android.tools.common.Scenario
import android.tools.common.flicker.assertions.ScenarioAssertion
-import android.tools.common.flicker.config.InitializedScenarioConfig
+import android.tools.common.flicker.config.ScenarioAssertionsConfig
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.io.Reader
import android.tools.common.traces.wm.Transition
interface ScenarioInstance : Scenario {
- val config: InitializedScenarioConfig
+ val config: ScenarioAssertionsConfig
/** A reader to read the part of the trace associated with the scenario instance */
val reader: Reader
diff --git a/libraries/flicker/src/android/tools/common/flicker/ScenarioInstanceImpl.kt b/libraries/flicker/src/android/tools/common/flicker/ScenarioInstanceImpl.kt
index 61c58ec..74b2076 100644
--- a/libraries/flicker/src/android/tools/common/flicker/ScenarioInstanceImpl.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/ScenarioInstanceImpl.kt
@@ -21,13 +21,13 @@
import android.tools.common.Timestamp
import android.tools.common.flicker.assertions.ScenarioAssertion
import android.tools.common.flicker.assertions.ScenarioAssertionImpl
-import android.tools.common.flicker.config.InitializedScenarioConfig
+import android.tools.common.flicker.config.ScenarioAssertionsConfig
import android.tools.common.io.Reader
import android.tools.common.traces.events.CujType
import android.tools.common.traces.wm.Transition
internal data class ScenarioInstanceImpl(
- override val config: InitializedScenarioConfig,
+ override val config: ScenarioAssertionsConfig,
override val startRotation: Rotation,
override val endRotation: Rotation,
val startTimestamp: Timestamp,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfig.kt b/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfig.kt
index 2d69f7c..5a3918f 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfig.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfig.kt
@@ -48,7 +48,8 @@
fun unregisterAssertion(scenario: ScenarioId, assertionId: AssertionId)
- fun use(scenarioConfigs: Collection<ScenarioConfig>): FlickerConfig
+ fun use(flickerConfigEntries: Collection<FlickerConfigEntry>): FlickerConfig
- fun use(vararg scenarioConfigs: ScenarioConfig): FlickerConfig = use(scenarioConfigs.asList())
+ fun use(vararg flickerConfigEntries: FlickerConfigEntry): FlickerConfig =
+ use(flickerConfigEntries.asList())
}
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/ScenarioConfig.kt b/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfigEntry.kt
similarity index 96%
rename from libraries/flicker/src/android/tools/common/flicker/config/ScenarioConfig.kt
rename to libraries/flicker/src/android/tools/common/flicker/config/FlickerConfigEntry.kt
index 08da6e3..6535db9 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/ScenarioConfig.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfigEntry.kt
@@ -19,7 +19,7 @@
import android.tools.common.flicker.AssertionInvocationGroup
import android.tools.common.flicker.assertors.AssertionTemplate
-data class ScenarioConfig(
+data class FlickerConfigEntry(
val scenarioId: ScenarioId,
val extractorProvider: ScenarioExtractorProvider,
val assertions: Map<AssertionTemplate, AssertionInvocationGroup>,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfigImpl.kt b/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfigImpl.kt
index 768770e..856d6d1 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfigImpl.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/FlickerConfigImpl.kt
@@ -21,7 +21,7 @@
import android.tools.common.flicker.assertors.AssertionTemplate
import android.tools.common.flicker.extractors.ScenarioExtractor
-typealias ScenarioExtractorProvider = (InitializedScenarioConfig) -> ScenarioExtractor
+typealias ScenarioExtractorProvider = (ScenarioAssertionsConfig) -> ScenarioExtractor
internal class FlickerConfigImpl : FlickerConfig {
private val registry = mutableMapOf<ScenarioId, RegistryEntry>()
@@ -30,8 +30,8 @@
val assertions: MutableSet<AssertionEntry> = mutableSetOf()
)
- override fun use(scenarioConfigs: Collection<ScenarioConfig>): FlickerConfig = apply {
- for (config in scenarioConfigs) {
+ override fun use(flickerConfigEntries: Collection<FlickerConfigEntry>): FlickerConfig = apply {
+ for (config in flickerConfigEntries) {
if (!config.enabled) {
continue
}
@@ -116,7 +116,7 @@
override fun getExtractors(): Collection<ScenarioExtractor> {
return registry.entries.flatMap { entry ->
entry.value.extractorProviders.map {
- it(InitializedScenarioConfig(entry.key, entry.value.assertions))
+ it(ScenarioAssertionsConfig(entry.key, entry.value.assertions))
}
}
}
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/InitializedScenarioConfig.kt b/libraries/flicker/src/android/tools/common/flicker/config/ScenarioAssertionsConfig.kt
similarity index 92%
rename from libraries/flicker/src/android/tools/common/flicker/config/InitializedScenarioConfig.kt
rename to libraries/flicker/src/android/tools/common/flicker/config/ScenarioAssertionsConfig.kt
index 4b9b40b..cb047f5 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/InitializedScenarioConfig.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/ScenarioAssertionsConfig.kt
@@ -16,8 +16,7 @@
package android.tools.common.flicker.config
-// TODO: rename
-data class InitializedScenarioConfig(
+data class ScenarioAssertionsConfig(
val scenarioId: ScenarioId,
val assertions: Set<AssertionEntry>
)
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/appclose/AppCloseToHome.kt b/libraries/flicker/src/android/tools/common/flicker/config/appclose/AppCloseToHome.kt
index f8f75bc..0b5ffa0 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/appclose/AppCloseToHome.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/appclose/AppCloseToHome.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.appclose
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val APP_CLOSE_TO_HOME =
- ScenarioConfig(
+ FlickerConfigEntry(
scenarioId = ScenarioId("APP_CLOSE_TO_HOME"),
assertions = AssertionTemplates.APP_CLOSE_TO_HOME_ASSERTIONS,
extractor =
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromIcon.kt b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromIcon.kt
index c288fc4..9c8e3f3 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromIcon.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromIcon.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.applaunch
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val AppLaunchFromIcon =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("APP_LAUNCH_FROM_ICON"),
assertions = AssertionTemplates.APP_LAUNCH_FROM_HOME_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromNotification.kt b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromNotification.kt
index 1ec08f0..6465f61 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromNotification.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromNotification.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.applaunch
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val AppLaunchFromNotification =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("APP_LAUNCH_FROM_NOTIFICATION"),
assertions = AssertionTemplates.APP_LAUNCH_FROM_NOTIFICATION_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromRecents.kt b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromRecents.kt
index d9fc5ba..8f3210b 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromRecents.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromRecents.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.applaunch
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val AppLaunchFromRecents =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("APP_LAUNCH_FROM_RECENTS"),
assertions = AssertionTemplates.APP_LAUNCH_FROM_HOME_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromStatusBarCallChip.kt b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromStatusBarCallChip.kt
index 79e482e..be79997 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromStatusBarCallChip.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromStatusBarCallChip.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.applaunch
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val AppLaunchFromStatusBarCallChip =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("APP_LAUNCH_FROM_STATUS_BAR_CALL_CHIP"),
assertions = AssertionTemplates.APP_LAUNCH_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromWidget.kt b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromWidget.kt
index b8a5ef3..1516faf 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromWidget.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/applaunch/AppLaunchFromWidget.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.applaunch
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val AppLaunchFromWidget =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("APP_LAUNCH_FROM_WIDGET"),
assertions = AssertionTemplates.APP_LAUNCH_FROM_HOME_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/foldables/FoldablesUnfoldAnimation.kt b/libraries/flicker/src/android/tools/common/flicker/config/foldables/FoldablesUnfoldAnimation.kt
index 992f751..7a19002 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/foldables/FoldablesUnfoldAnimation.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/foldables/FoldablesUnfoldAnimation.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.foldables
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val FoldablesUnfoldAnimation =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("FOLDABLES_UNFOLD_ANIMATION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/gesturenav/Quickswitch.kt b/libraries/flicker/src/android/tools/common/flicker/config/gesturenav/Quickswitch.kt
index 257b306..d7463b3 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/gesturenav/Quickswitch.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/gesturenav/Quickswitch.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.gesturenav
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val Quickswitch =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("QUICKSWITCH"),
assertions = AssertionTemplates.LAUNCHER_QUICK_SWITCH_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/gesturenav/SwipeToRecents.kt b/libraries/flicker/src/android/tools/common/flicker/config/gesturenav/SwipeToRecents.kt
index c6a18ee..ac711d1 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/gesturenav/SwipeToRecents.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/gesturenav/SwipeToRecents.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.gesturenav
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val SwipeToRecents =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("SWIPE_TO_RECENTS"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/ime/ImeInsetsAnimation.kt b/libraries/flicker/src/android/tools/common/flicker/config/ime/ImeInsetsAnimation.kt
index b8855ff..4390169 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/ime/ImeInsetsAnimation.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/ime/ImeInsetsAnimation.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.ime
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val ImeInsetsAnimation =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("IME_INSETS_ANIMATION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsCloseSwipe.kt b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsCloseSwipe.kt
index 65c8bb9..4e5c432 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsCloseSwipe.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsCloseSwipe.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.launcher
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LauncherAllAppsCloseSwipe =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LAUNCHER_ALL_APPS_CLOSE_SWIPE"),
assertions = AssertionTemplates.COMMON_ASSERTIONS, // TODO: Add specific assertions
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsCloseToHome.kt b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsCloseToHome.kt
index cb46778..befa1a7 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsCloseToHome.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsCloseToHome.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.launcher
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val LauncherAllAppsCloseToHome =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("LAUNCHER_ALL_APPS_CLOSE_TO_HOME"),
assertions = AssertionTemplates.APP_CLOSE_TO_HOME_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsOpen.kt b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsOpen.kt
index cb5c9a7..443d5c1 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsOpen.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsOpen.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.launcher
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LauncherAllAppsOpen =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LAUNCHER_ALL_APP_OPEN"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsScroll.kt b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsScroll.kt
index bfe3ed3..fe602c0 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsScroll.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherAllAppsScroll.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.launcher
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LauncherAllAppsScroll =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LAUNCHER_ALL_APPS_SCROLL"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherRecentsScrolling.kt b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherRecentsScrolling.kt
index e70e3ce..ec7900e 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherRecentsScrolling.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherRecentsScrolling.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.launcher
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LauncherRecentsScrolling =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LAUNCHER_RECENTS_SCROLLING"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherUnlockEntranceAnimation.kt b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherUnlockEntranceAnimation.kt
index cc73e0d..2a6bafb 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherUnlockEntranceAnimation.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/launcher/LauncherUnlockEntranceAnimation.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.launcher
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LauncherUnlockEntranceAnimation =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LAUNCHER_UNLOCK_ENTRANCE_ANIMATION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenAppLaunchCamera.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenAppLaunchCamera.kt
index c2b8216..6fdf155 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenAppLaunchCamera.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenAppLaunchCamera.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val LockscreenAppLaunchCamera =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("LOCKSCREEN_APP_LAUNCH_CAMERA"),
assertions = AssertionTemplates.APP_LAUNCH_FROM_LOCK_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenOcclusion.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenOcclusion.kt
index 6bb5a49..48c93c6 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenOcclusion.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenOcclusion.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenOcclusion =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LOCKSCREEN_OCCLUSION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPasswordAppear.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPasswordAppear.kt
index 021f0fd..320242d 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPasswordAppear.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPasswordAppear.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenPasswordAppear =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LOCKSCREEN_PASSWORD_APPEAR"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPasswordDisappear.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPasswordDisappear.kt
index 9441d45..255ee7f 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPasswordDisappear.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPasswordDisappear.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenPasswordDisappear =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LOCKSCREEN_PASSWORD_DISAPPEAR"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPatternAppear.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPatternAppear.kt
index e49342f..90a4590 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPatternAppear.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPatternAppear.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenPatternAppear =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LOCKSCREEN_PATTERN_APPEAR"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPatternDisappear.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPatternDisappear.kt
index 8cb4908..4714a5d 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPatternDisappear.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPatternDisappear.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenPatternDisappear =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LOCKSCREEN_PATTERN_DISAPPEAR"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPinAppear.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPinAppear.kt
index d2dc7b7..0e3ff74 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPinAppear.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPinAppear.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenPinAppear =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LOCKSCREEN_PIN_APPEAR"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPinDisappear.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPinDisappear.kt
index 104dc57..f056d45 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPinDisappear.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenPinDisappear.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenPinDisappear =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("LOCKSCREEN_PIN_DISAPPEAR"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenTransitionFromAod.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenTransitionFromAod.kt
index 179664e..cc5cd37 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenTransitionFromAod.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenTransitionFromAod.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenTransitionFromAod =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("LOCKSCREEN_TRANSITION_FROM_AOD"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenTransitionToAod.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenTransitionToAod.kt
index 304e711..3a5ac09 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenTransitionToAod.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenTransitionToAod.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenTransitionToAod =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("LOCKSCREEN_TRANSITION_TO_AOD"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenUnlockAnimation.kt b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenUnlockAnimation.kt
index ee822f8..d6d5aaf 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenUnlockAnimation.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/lockscreen/LockscreenUnlockAnimation.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.lockscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val LockscreenUnlockAnimation =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("LOCKSCNREEN_UNLOCK_ANIMATION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAdd.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAdd.kt
index 0c53d4e..656b9bc 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAdd.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAdd.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationAdd =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_ADD"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromHistory.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromHistory.kt
index 5f15d28..0aba983 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromHistory.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromHistory.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val NotificationAppLaunchFromHistory =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("NOTIFICATION_APP_LAUNCH_FROM_HISTORY"),
assertions = AssertionTemplates.APP_LAUNCH_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromMediaPlayer.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromMediaPlayer.kt
index 419d396..38ddf0c 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromMediaPlayer.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromMediaPlayer.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val NotificationAppLaunchFromMediaPlayer =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("NOTIFICATION_APP_LAUNCH_FROM_MEDIA_PLAYER"),
assertions = AssertionTemplates.APP_LAUNCH_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromQsTile.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromQsTile.kt
index 4396928..eb9eb2d 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromQsTile.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromQsTile.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val NotificationAppLaunchFromQsTile =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("NOTIFICATION_APP_LAUNCH_FROM_QS_TILE"),
assertions = AssertionTemplates.APP_LAUNCH_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromSettingsButton.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromSettingsButton.kt
index 8307b1a..eef324c 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromSettingsButton.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationAppLaunchFromSettingsButton.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val NotificationAppLaunchFromSettingsButton =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("NOTIFICATION_APP_LAUNCH_FROM_SETTINGS_BUTTON"),
assertions = AssertionTemplates.APP_LAUNCH_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationClearAll.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationClearAll.kt
index 0574227..4e33f96 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationClearAll.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationClearAll.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationClearAll =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_CLEAR_ALL"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationDialogOpen.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationDialogOpen.kt
index 3b8a795..d6c1b05 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationDialogOpen.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationDialogOpen.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationDialogOpen =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_DIALOG_OPEN"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationExpandCollapse.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationExpandCollapse.kt
index 362c5f8..b91d505 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationExpandCollapse.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationExpandCollapse.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationExpandCollapse =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_EXPAND_COLLAPSE"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationExpandCollapseLockscreen.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationExpandCollapseLockscreen.kt
index 0042d20..a715a3d 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationExpandCollapseLockscreen.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationExpandCollapseLockscreen.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationExpandCollapseLockscreen =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_EXPAND_COLLAPSE_LOCKSCREEN"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationHeadsUpAppear.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationHeadsUpAppear.kt
index eb3b434..a313ace 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationHeadsUpAppear.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationHeadsUpAppear.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationHeadsUpAppear =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_HEADS_UP_APPEAR"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationHeadsUpDisappear.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationHeadsUpDisappear.kt
index 9a54bba..ec17c13 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationHeadsUpDisappear.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationHeadsUpDisappear.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationHeadsUpDisappear =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_HEADS_UP_DISAPPEAR"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationQsExpandCollapse.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationQsExpandCollapse.kt
index ab56070..081eecb 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationQsExpandCollapse.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationQsExpandCollapse.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationQsExpandCollapse =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_QS_EXPAND_COLLAPSE"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationQsScrollSwipe.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationQsScrollSwipe.kt
index 6438f64..b465f75 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationQsScrollSwipe.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationQsScrollSwipe.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationQsScrollSwipe =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_QS_SCROLL_SWIPER"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRemove.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRemove.kt
index 6c9bc44..6687377 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRemove.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRemove.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationRemove =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_REMOVE"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRowExpand.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRowExpand.kt
index d2bef90..4d9b926 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRowExpand.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRowExpand.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationRowExpand =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_ROW_EXPAND"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRowSwipe.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRowSwipe.kt
index 3e90a05..4e160cf 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRowSwipe.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationRowSwipe.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationRowSwipe =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_ROW_SWIPE"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationScrollFling.kt b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationScrollFling.kt
index ca88f0d..916d200 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationScrollFling.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/notification/NotificationScrollFling.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.notification
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val NotificationScrollFling =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("NOTIFICATION_SCROLL_FLING"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/EntireTrace.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/EntireTrace.kt
index 755b1a2..482c71b 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/EntireTrace.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/EntireTrace.kt
@@ -17,12 +17,12 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.EntireTraceExtractor
val EntireTrace =
- ScenarioConfig(
+ FlickerConfigEntry(
assertions = AssertionTemplates.ENTIRE_TRACE_ASSERTIONS,
extractor = EntireTraceExtractor(),
enabled = true,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersBiometricPromptTransition.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersBiometricPromptTransition.kt
index 4481308..9c16a3c 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersBiometricPromptTransition.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersBiometricPromptTransition.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val OthersBiometricPromptTransition =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("BIOMETRIC_PROMPT_TRANSITION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersOneHandedEnterTransition.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersOneHandedEnterTransition.kt
index bda90a2..b81d186 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersOneHandedEnterTransition.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersOneHandedEnterTransition.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val OthersOneHandedEnterTransition =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("ONE_HANDED_ENTER_TRANSITION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersOneHandedExitTransition.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersOneHandedExitTransition.kt
index aeceb30..ee3a8b0 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersOneHandedExitTransition.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersOneHandedExitTransition.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val OthersOneHandedExitTransition =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("ONE_HANDED_EXIT_TRANSITION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersScreenOff.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersScreenOff.kt
index 1d825c1..331780d 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersScreenOff.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersScreenOff.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val OthersScreenOff =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SCREEN_OFF"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersScreenOffShowAod.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersScreenOffShowAod.kt
index f4ddaf7..e862cf4 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersScreenOffShowAod.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersScreenOffShowAod.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val OthersScreenOffShowAod =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SCREEN_OFF_AOD"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersTakeScreenshot.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersTakeScreenshot.kt
index 31e315f..df96be2 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersTakeScreenshot.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersTakeScreenshot.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val OthersTakeScreenshot =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("TAKE_SCREENSHOT"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersUserDialogOpen.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersUserDialogOpen.kt
index 62c311a..8a673ba 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersUserDialogOpen.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersUserDialogOpen.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val OthersUserDialogOpen =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("USER_DIALOG_OPEN"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersUserSwitch.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersUserSwitch.kt
index 0e73b40..7032014 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersUserSwitch.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersUserSwitch.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val OthersUserSwitch =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("USER_SWITCH"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersVolumeControl.kt b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersVolumeControl.kt
index 3bd692a..f5ff66f 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/others/OthersVolumeControl.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/others/OthersVolumeControl.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.others
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val OthersVolumeControl =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("VOLUME_CONTROL"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/pip/AppCloseToPip.kt b/libraries/flicker/src/android/tools/common/flicker/config/pip/AppCloseToPip.kt
index 5fad2b8..bb8f257 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/pip/AppCloseToPip.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/pip/AppCloseToPip.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.pip
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.CujAdjust
@@ -28,7 +28,7 @@
import android.tools.common.traces.events.CujType
val AppCloseToPip =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("APP_CLOSE_TO_PIP"),
assertions = AssertionTemplates.APP_CLOSE_TO_PIP_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/pip/PipTransition.kt b/libraries/flicker/src/android/tools/common/flicker/config/pip/PipTransition.kt
index fddd364..d029594 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/pip/PipTransition.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/pip/PipTransition.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.pip
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val PipTransition =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("PIP_TRANSITION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsPageScroll.kt b/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsPageScroll.kt
index dc15528..a34c429 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsPageScroll.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsPageScroll.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.settings
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val SettingsPageScroll =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SETTINGS_PAGE_SCROLL"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsSlider.kt b/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsSlider.kt
index 7f52095..ead000c 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsSlider.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsSlider.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.settings
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val SettingsSlider =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SETTINGS_SLIDER"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsToggle.kt b/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsToggle.kt
index bac09cc..f620d30 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsToggle.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/settings/SettingsToggle.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.settings
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val SettingsToggle =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SETTINGS_TOGGLE"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/splashscreen/SplashscreenAvd.kt b/libraries/flicker/src/android/tools/common/flicker/config/splashscreen/SplashscreenAvd.kt
index f478590..cbb13b7 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/splashscreen/SplashscreenAvd.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/splashscreen/SplashscreenAvd.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.splashscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val SplashscreenAvd =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SPLASHSCREEN_AVD"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/splashscreen/SplashscreenExitAnimation.kt b/libraries/flicker/src/android/tools/common/flicker/config/splashscreen/SplashscreenExitAnimation.kt
index 8913b16..c0bc350 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/splashscreen/SplashscreenExitAnimation.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/splashscreen/SplashscreenExitAnimation.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.splashscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val SplashscreenExitAnimation =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SPLASHSCREEN_EXIT_ANIMATION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenEnter.kt b/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenEnter.kt
index 321286f..8fa654b 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenEnter.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenEnter.kt
@@ -17,13 +17,13 @@
package android.tools.common.flicker.config.splitscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.ShellTransitionScenarioExtractor
val SplitScreenEnter =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("SPLIT_SCREEN_ENTER"),
assertions = AssertionTemplates.ENTER_SPLITSCREEN_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenExit.kt b/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenExit.kt
index bc70fd3..0e7002a 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenExit.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenExit.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.splitscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val SplitScreenExit =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("SPLIT_SCREEN_EXIT"),
assertions = AssertionTemplates.EXIT_SPLITSCREEN_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenResize.kt b/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenResize.kt
index 707419d..f8878e8 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenResize.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/splitscreen/SplitScreenResize.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.config.splitscreen
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.config.TransitionFilters
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
@@ -25,7 +25,7 @@
import android.tools.common.traces.events.CujType
val SplitScreenResize =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = true,
scenarioId = ScenarioId("SPLIT_SCREEN_RESIZE"),
assertions = AssertionTemplates.RESIZE_SPLITSCREEN_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingScreenForStatus.kt b/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingScreenForStatus.kt
index 3c87c28..c19fc91 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingScreenForStatus.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingScreenForStatus.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.suw
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val SuwLoadingScreenForStatus =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SUW_LOADING_SCREEN_FOR_STATUS"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingToNextFlow.kt b/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingToNextFlow.kt
index afd8987..4a3180d 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingToNextFlow.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingToNextFlow.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.suw
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val SuwLoadingToNextFlow =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SUW_LOADING_TO_NEXT_FLOW"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingToShowInfoWithActions.kt b/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingToShowInfoWithActions.kt
index cecc4f9..fadad5c 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingToShowInfoWithActions.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwLoadingToShowInfoWithActions.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.suw
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val SuwLoadingToShowInfoWithActions =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SUW_LOADING_TO_SHOW_INFO_WITH_ACTIONS"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwShowFunctionScreenWithActions.kt b/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwShowFunctionScreenWithActions.kt
index 553e2d2..85eb45f 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwShowFunctionScreenWithActions.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/suw/SuwShowFunctionScreenWithActions.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.suw
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val SuwShowFunctionScreenWithActions =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("SUW_SHOW_FUNCTION_SCREEN_WITH_ACTIONS"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/taskbar/TaskbarCollapse.kt b/libraries/flicker/src/android/tools/common/flicker/config/taskbar/TaskbarCollapse.kt
index db3df73..fbcf55a 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/taskbar/TaskbarCollapse.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/taskbar/TaskbarCollapse.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.taskbar
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val TaskbarCollapse =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("TASKBAR_COLLAPSE"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/taskbar/TaskbarExpand.kt b/libraries/flicker/src/android/tools/common/flicker/config/taskbar/TaskbarExpand.kt
index 1593c4b..c13d07f 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/taskbar/TaskbarExpand.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/taskbar/TaskbarExpand.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.taskbar
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val TaskbarExpand =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("TASKBAR_EXPAND"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/config/wallpaper/WallpaperTransition.kt b/libraries/flicker/src/android/tools/common/flicker/config/wallpaper/WallpaperTransition.kt
index cb87cb2..1317500 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/wallpaper/WallpaperTransition.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/wallpaper/WallpaperTransition.kt
@@ -17,14 +17,14 @@
package android.tools.common.flicker.config.wallpaper
import android.tools.common.flicker.config.AssertionTemplates
-import android.tools.common.flicker.config.ScenarioConfig
+import android.tools.common.flicker.config.FlickerConfigEntry
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.flicker.extractors.TaggedCujTransitionMatcher
import android.tools.common.flicker.extractors.TaggedScenarioExtractorBuilder
import android.tools.common.traces.events.CujType
val WallpaperTransition =
- ScenarioConfig(
+ FlickerConfigEntry(
enabled = false,
scenarioId = ScenarioId("WALLPAPER_TRANSITION"),
assertions = AssertionTemplates.COMMON_ASSERTIONS,
diff --git a/libraries/flicker/src/android/tools/common/flicker/extractors/EntireTraceExtractor.kt b/libraries/flicker/src/android/tools/common/flicker/extractors/EntireTraceExtractor.kt
index 9570fa5..2a22649 100644
--- a/libraries/flicker/src/android/tools/common/flicker/extractors/EntireTraceExtractor.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/extractors/EntireTraceExtractor.kt
@@ -19,10 +19,10 @@
import android.tools.common.Rotation
import android.tools.common.flicker.ScenarioInstance
import android.tools.common.flicker.ScenarioInstanceImpl
-import android.tools.common.flicker.config.InitializedScenarioConfig
+import android.tools.common.flicker.config.ScenarioAssertionsConfig
import android.tools.common.io.Reader
-class EntireTraceExtractor(val config: InitializedScenarioConfig) : ScenarioExtractor {
+class EntireTraceExtractor(val config: ScenarioAssertionsConfig) : ScenarioExtractor {
override val scenarioId = config.scenarioId
override fun extract(reader: Reader): List<ScenarioInstance> {
diff --git a/libraries/flicker/src/android/tools/common/flicker/extractors/ShellTransitionScenarioExtractor.kt b/libraries/flicker/src/android/tools/common/flicker/extractors/ShellTransitionScenarioExtractor.kt
index 8fba8a9..7dcc06f 100644
--- a/libraries/flicker/src/android/tools/common/flicker/extractors/ShellTransitionScenarioExtractor.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/extractors/ShellTransitionScenarioExtractor.kt
@@ -18,12 +18,12 @@
import android.tools.common.flicker.ScenarioInstance
import android.tools.common.flicker.ScenarioInstanceImpl
-import android.tools.common.flicker.config.InitializedScenarioConfig
+import android.tools.common.flicker.config.ScenarioAssertionsConfig
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.io.Reader
class ShellTransitionScenarioExtractor(
- val config: InitializedScenarioConfig,
+ val config: ScenarioAssertionsConfig,
val transitionMatcher: ITransitionMatcher,
) : ScenarioExtractor {
override val scenarioId: ScenarioId = config.scenarioId
diff --git a/libraries/flicker/src/android/tools/common/flicker/extractors/TaggedScenarioExtractor.kt b/libraries/flicker/src/android/tools/common/flicker/extractors/TaggedScenarioExtractor.kt
index 534fd6b..9daba8a 100644
--- a/libraries/flicker/src/android/tools/common/flicker/extractors/TaggedScenarioExtractor.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/extractors/TaggedScenarioExtractor.kt
@@ -20,7 +20,7 @@
import android.tools.common.Timestamps
import android.tools.common.flicker.ScenarioInstance
import android.tools.common.flicker.ScenarioInstanceImpl
-import android.tools.common.flicker.config.InitializedScenarioConfig
+import android.tools.common.flicker.config.ScenarioAssertionsConfig
import android.tools.common.flicker.config.ScenarioId
import android.tools.common.io.Reader
import android.tools.common.traces.events.Cuj
@@ -30,7 +30,7 @@
import kotlin.math.min
class TaggedScenarioExtractor(
- val config: InitializedScenarioConfig,
+ val config: ScenarioAssertionsConfig,
private val targetTag: CujType,
private val transitionMatcher: TransitionMatcher,
private val adjustCuj: CujAdjust
diff --git a/libraries/flicker/test/src/android/tools/common/flicker/config/FlickerConfigTest.kt b/libraries/flicker/test/src/android/tools/common/flicker/config/FlickerConfigTest.kt
index f6c9126..31db399 100644
--- a/libraries/flicker/test/src/android/tools/common/flicker/config/FlickerConfigTest.kt
+++ b/libraries/flicker/test/src/android/tools/common/flicker/config/FlickerConfigTest.kt
@@ -319,8 +319,8 @@
)
}
- private fun createConfig(scenarioId: ScenarioId): ScenarioConfig {
- val scenarioExtractorProvider = { config: InitializedScenarioConfig ->
+ private fun createConfig(scenarioId: ScenarioId): FlickerConfigEntry {
+ val scenarioExtractorProvider = { config: ScenarioAssertionsConfig ->
object : ScenarioExtractor {
override val scenarioId = config.scenarioId
@@ -330,7 +330,7 @@
}
}
- return object : ScenarioConfig {
+ return object : FlickerConfigEntry {
override val extractorProvider = scenarioExtractorProvider
override val assertions = mapOf<AssertionTemplate, AssertionInvocationGroup>()
override val enabled = true
@@ -342,7 +342,7 @@
private val SOME_SCENARIO = ScenarioId("SOME_SCENARIO")
private val SOME_OTHER_SCENARIO = ScenarioId("SOME_OTHER_SCENARIO")
- private val EXTRACTOR_FOR_SOME_SCENARIO = { config: InitializedScenarioConfig ->
+ private val EXTRACTOR_FOR_SOME_SCENARIO = { config: ScenarioAssertionsConfig ->
object : ScenarioExtractor {
override val scenarioId: ScenarioId = SOME_SCENARIO
@@ -351,7 +351,7 @@
}
}
}
- private val EXTRACTOR_FOR_SOME_OTHER_SCENARIO = { _: InitializedScenarioConfig ->
+ private val EXTRACTOR_FOR_SOME_OTHER_SCENARIO = { _: ScenarioAssertionsConfig ->
object : ScenarioExtractor {
override val scenarioId: ScenarioId
get() = SOME_OTHER_SCENARIO
diff --git a/libraries/flicker/test/src/android/tools/common/flicker/extractor/ShellTransitionScenarioExtractorTest.kt b/libraries/flicker/test/src/android/tools/common/flicker/extractor/ShellTransitionScenarioExtractorTest.kt
index 49b6d1b..c0a8411 100644
--- a/libraries/flicker/test/src/android/tools/common/flicker/extractor/ShellTransitionScenarioExtractorTest.kt
+++ b/libraries/flicker/test/src/android/tools/common/flicker/extractor/ShellTransitionScenarioExtractorTest.kt
@@ -17,7 +17,7 @@
package android.tools.common.flicker.extractor
import android.tools.common.Timestamps
-import android.tools.common.flicker.config.InitializedScenarioConfig
+import android.tools.common.flicker.config.ScenarioAssertionsConfig
import android.tools.common.flicker.extractors.ITransitionMatcher
import android.tools.common.flicker.extractors.ShellTransitionScenarioExtractor
import android.tools.common.traces.wm.Transition
@@ -116,5 +116,5 @@
Truth.assertThat(filterToBackExtractor.extract(reader)).hasSize(0)
}
- private val mockConfig = Mockito.mock(InitializedScenarioConfig::class.java)
+ private val mockConfig = Mockito.mock(ScenarioAssertionsConfig::class.java)
}
