Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f3645b8 authored Jan 28, 2021 by Nataniel Borges

Reduce flicker memory consumption (Pt 3)

Improve flicker memory consumption with the following:
- Ensure each assertion has a name for use with parameterized runner

Bug: 178572522
Test: atest FickerTests WMShellFlickerTests
Change-Id: I84af8ccccbbe42533013be664c91521fe49f7021

parent 4fb596f0

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ class AppPairsTestCannotPairNonResizeableApps(
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic
		fun getParams(): List<Array<Any>> {
		val testTag = "testAppPairs_unpairPrimaryAndSecondaryApps"
		val testTag = "testAppPairs_cannotPairNonResizeableApps"
		val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->
		withTestName {
		buildTestTag(testTag, configuration)
		@@ -71,7 +71,7 @@ class AppPairsTestCannotPairNonResizeableApps(
		appPairsDividerIsInvisible()
		}
		windowManagerTrace {
		end {
		end("onlyResizeableAppWindowVisible") {
		val nonResizeableApp = nonResizeableApp
		require(nonResizeableApp != null) {
		"Non resizeable app not initialized"

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ class AppPairsTestPairPrimaryAndSecondaryApps(
		}
		}
		windowManagerTrace {
		end {
		end("bothAppWindowsVisible") {
		isVisible(primaryApp.defaultWindowName)
		isVisible(secondaryApp.defaultWindowName)
		}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps(
		}
		}
		windowManagerTrace {
		end {
		end("bothAppWindowsInvisible") {
		isInvisible(primaryApp.defaultWindowName)
		isInvisible(secondaryApp.defaultWindowName)
		}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ class RotateTwoLaunchedAppsInAppPairsMode(
		val instrumentation = InstrumentationRegistry.getInstrumentation()
		val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->
		withTestName {
		buildTestTag("testRotateAndEnterAppPairsMode", configuration)
		buildTestTag("testRotateTwoLaunchedAppsInAppPairsMode", configuration)
		}
		transitions {
		executeShellCommand(composePairsCommand(
		@@ -88,7 +88,7 @@ class RotateTwoLaunchedAppsInAppPairsMode(
		windowManagerTrace {
		navBarWindowIsAlwaysVisible()
		statusBarWindowIsAlwaysVisible()
		end {
		end("bothAppWindowsVisible") {
		isVisible(primaryApp.defaultWindowName)
		.isVisible(secondaryApp.defaultWindowName)
		}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode(
		windowManagerTrace {
		navBarWindowIsAlwaysVisible()
		statusBarWindowIsAlwaysVisible()
		end {
		end("bothAppWindowsVisible") {
		isVisible(primaryApp.defaultWindowName)
		isVisible(secondaryApp.defaultWindowName)
		}