Merge "Fail tests that have failed to actually enable scene container." into main (f8cf5ad7) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/utils/src/com/android/systemui/flags/SceneContainerRule.kt

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,21 @@ class SceneContainerRule : TestRule {
	SceneContainerFlag.isEnabled		SceneContainerFlag.isEnabled
	)		)
	}		}
			// Get the flag value, treating the unset error as false.
			val sceneContainerAconfigEnabled = try {
			com.android.systemui.Flags.sceneContainer()
			} catch (e: Exception) {
			false
			}
			if (sceneContainerAconfigEnabled) {
			Assert.assertTrue(
			"FLAG_SCENE_CONTAINER is enabled but SceneContainerFlag.isEnabled" +
			" is false. Use `.andSceneContainer()` from" +
			" SceneContainerFlagParameterization.kt to parameterize this" +
			" flag correctly.",
			SceneContainerFlag.isEnabled
			)
			}
	if (		if (
	description.hasAnnotation<BrokenWithSceneContainer>() &&		description.hasAnnotation<BrokenWithSceneContainer>() &&
	SceneContainerFlag.isEnabled		SceneContainerFlag.isEnabled