Merge "Adapt tests to FlickerLib refactoring" (323f653f) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ fun FlickerTest.snapshotStartingWindowLayerCoversExactlyOnApp(component: ICompon
		snapshotLayers
		.mapNotNull { snapshotLayer -> snapshotLayer.layer?.visibleRegion }
		.toTypedArray()
		val snapshotRegion = RegionSubject.assertThat(visibleAreas, this, timestamp)
		val snapshotRegion = RegionSubject(visibleAreas, this, timestamp)
		val appVisibleRegion = it.visibleRegion(component)
		if (snapshotRegion.region.isNotEmpty) {
		snapshotRegion.coversExactly(appVisibleRegion.region)

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeOnDismissPopupDialogTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ class CloseImeOnDismissPopupDialogTest(flicker: FlickerTest) : BaseTest(flicker)
		imeSnapshotLayer.layer?.visibleRegion
		}
		.toTypedArray()
		val imeVisibleRegion = RegionSubject.assertThat(visibleAreas, this, timestamp)
		val imeVisibleRegion = RegionSubject(visibleAreas, this, timestamp)
		val appVisibleRegion = it.visibleRegion(imeTestApp)
		if (imeVisibleRegion.region.isNotEmpty) {
		imeVisibleRegion.coversAtMost(appVisibleRegion.region)

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -111,9 +111,9 @@ open class SeamlessAppRotationTest(flicker: FlickerTest) : RotationTransition(fl
		val appWindow = it.windowState(testApp.`package`)
		val flags = appWindow.windowState?.attributes?.flags ?: 0
		appWindow
		.verify("isFullScreen")
		.check { "isFullScreen" }
		.that(flags.and(WindowManager.LayoutParams.FLAG_FULLSCREEN))
		.isGreaterThan(0)
		.isGreater(0)
		}
		}
		}
		@@ -127,13 +127,13 @@ open class SeamlessAppRotationTest(flicker: FlickerTest) : RotationTransition(fl
		val appWindow = it.windowState(testApp.`package`)
		val rotationAnimation = appWindow.windowState?.attributes?.rotationAnimation ?: 0
		appWindow
		.verify("isRotationSeamless")
		.check { "isRotationSeamless" }
		.that(
		rotationAnimation.and(
		WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS
		)
		)
		.isGreaterThan(0)
		.isGreater(0)
		}
		}
		}

tests/SurfaceViewBufferTests/src/com/android/test/BufferPresentationTests.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		*/
		package com.android.test

		import com.android.server.wm.flicker.traces.layers.LayersTraceSubject.Companion.assertThat
		import com.android.server.wm.flicker.traces.layers.LayersTraceSubject
		import junit.framework.Assert.assertEquals
		import junit.framework.Assert.assertTrue
		import org.junit.Test
		@@ -37,7 +37,7 @@ class BufferPresentationTests(useBlastAdapter: Boolean) : SurfaceTracingTestBase
		1000 /* ms */))
		}

		assertThat(trace).hasFrameSequence("SurfaceView", 1..numFrames)
		LayersTraceSubject(trace).hasFrameSequence("SurfaceView", 1..numFrames)
		}

		@Test
		@@ -51,7 +51,7 @@ class BufferPresentationTests(useBlastAdapter: Boolean) : SurfaceTracingTestBase
		assertEquals(0, activity.mSurfaceProxy.waitUntilBufferDisplayed(2, 5000 /* ms */))
		}

		assertThat(trace).hasFrameSequence("SurfaceView", 1..2L)
		LayersTraceSubject(trace).hasFrameSequence("SurfaceView", 1..2L)
		}

		@Test
		@@ -69,7 +69,7 @@ class BufferPresentationTests(useBlastAdapter: Boolean) : SurfaceTracingTestBase
		5000 /* ms */))
		}

		assertThat(trace).hasFrameSequence("SurfaceView", 1..numFrames)
		LayersTraceSubject(trace).hasFrameSequence("SurfaceView", 1..numFrames)
		}

		@Test
		@@ -92,7 +92,7 @@ class BufferPresentationTests(useBlastAdapter: Boolean) : SurfaceTracingTestBase
		5000 /* ms */))
		}

		assertThat(trace).hasFrameSequence("SurfaceView", 1..numFrames)
		LayersTraceSubject(trace).hasFrameSequence("SurfaceView", 1..numFrames)
		}

		@Test

tests/SurfaceViewBufferTests/src/com/android/test/BufferRejectionTests.kt

+14 −13

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		package com.android.test

		import android.graphics.Point
		import com.android.server.wm.flicker.traces.layers.LayersTraceSubject.Companion.assertThat
		import com.android.server.wm.flicker.traces.layers.LayersTraceSubject
		import com.android.test.SurfaceViewBufferTestBase.Companion.ScalingMode
		import com.android.test.SurfaceViewBufferTestBase.Companion.Transform
		import junit.framework.Assert.assertEquals
		@@ -45,10 +45,10 @@ class BufferRejectionTests(useBlastAdapter: Boolean) : SurfaceTracingTestBase(us
		activity.mSurfaceProxy.waitUntilBufferDisplayed(3, 500 /* ms */)
		}
		// Verify we reject buffers since scaling mode == NATIVE_WINDOW_SCALING_MODE_FREEZE
		assertThat(trace).layer("SurfaceView", 2).doesNotExist()
		LayersTraceSubject(trace).layer("SurfaceView", 2).doesNotExist()

		// Verify the next buffer is submitted with the correct size
		assertThat(trace).layer("SurfaceView", 3).also {
		LayersTraceSubject(trace).layer("SurfaceView", 3).also {
		it.hasBufferSize(defaultBufferSize)
		// scaling mode is not passed down to the layer for blast
		if (useBlastAdapter) {
		@@ -81,9 +81,9 @@ class BufferRejectionTests(useBlastAdapter: Boolean) : SurfaceTracingTestBase(us
		}

		// verify buffer size is reset to default buffer size
		assertThat(trace).layer("SurfaceView", 1).hasBufferSize(defaultBufferSize)
		assertThat(trace).layer("SurfaceView", 2).doesNotExist()
		assertThat(trace).layer("SurfaceView", 3).hasBufferSize(bufferSize)
		LayersTraceSubject(trace).layer("SurfaceView", 1).hasBufferSize(defaultBufferSize)
		LayersTraceSubject(trace).layer("SurfaceView", 2).doesNotExist()
		LayersTraceSubject(trace).layer("SurfaceView", 3).hasBufferSize(bufferSize)
		}

		@Test
		@@ -109,10 +109,11 @@ class BufferRejectionTests(useBlastAdapter: Boolean) : SurfaceTracingTestBase(us
		}

		// verify buffer size is reset to default buffer size
		assertThat(trace).layer("SurfaceView", 1).hasBufferSize(defaultBufferSize)
		assertThat(trace).layer("SurfaceView", 2).doesNotExist()
		assertThat(trace).layer("SurfaceView", 3).hasBufferSize(rotatedBufferSize)
		assertThat(trace).layer("SurfaceView", 3).hasBufferOrientation(Transform.ROT_90.value)
		LayersTraceSubject(trace).layer("SurfaceView", 1).hasBufferSize(defaultBufferSize)
		LayersTraceSubject(trace).layer("SurfaceView", 2).doesNotExist()
		LayersTraceSubject(trace).layer("SurfaceView", 3).hasBufferSize(rotatedBufferSize)
		LayersTraceSubject(trace).layer("SurfaceView", 3)
		.hasBufferOrientation(Transform.ROT_90.value)
		}

		@Test
		@@ -141,11 +142,11 @@ class BufferRejectionTests(useBlastAdapter: Boolean) : SurfaceTracingTestBase(us
		}

		for (count in 0 until 5) {
		assertThat(trace).layer("SurfaceView", (count * 3) + 1L)
		LayersTraceSubject(trace).layer("SurfaceView", (count * 3) + 1L)
		.hasBufferSize(defaultBufferSize)
		assertThat(trace).layer("SurfaceView", (count * 3) + 2L)
		LayersTraceSubject(trace).layer("SurfaceView", (count * 3) + 2L)
		.doesNotExist()
		assertThat(trace).layer("SurfaceView", (count * 3) + 3L)
		LayersTraceSubject(trace).layer("SurfaceView", (count * 3) + 3L)
		.hasBufferSize(bufferSize)
		}
		}