Merge "input tests: use BlockingQueueEventVerifier" into main (c0d0ae4f) · Commits · e / os / android_frameworks_base

apct-tests/perftests/input/src/android/input/TouchPerfTest.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.input

		import android.cts.input.EventVerifier
		import android.perftests.utils.PerfStatusReporter
		import android.view.MotionEvent.ACTION_DOWN
		import android.view.MotionEvent.ACTION_MOVE
		@@ -45,7 +44,7 @@ class TouchPerfTest {
		fun testDownMoveUp() {
		UinputTouchScreen(instrumentation, virtualDisplayRule.virtualDisplay.display).use {
		touchScreen ->
		val verifier = EventVerifier(virtualDisplayRule.activity::getInputEvent)
		val verifier = virtualDisplayRule.activity.verifier
		val state = perfStatusReporter.benchmarkState

		while (state.keepRunning()) {

tests/Input/src/com/android/test/input/UinputRecordingIntegrationTests.kt

+6 −11

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

		import android.app.Instrumentation
		import android.cts.input.EventVerifier
		import android.graphics.PointF
		import android.util.Log
		import android.util.Size
		@@ -24,7 +23,7 @@ import android.view.InputDevice
		import android.view.InputEvent
		import android.view.MotionEvent
		import androidx.test.platform.app.InstrumentationRegistry
		import com.android.cts.input.BatchedEventSplitter
		import com.android.cts.input.BlockingQueueEventVerifier
		import com.android.cts.input.CaptureEventActivity
		import com.android.cts.input.DebugInputRule
		import com.android.cts.input.EvemuDevice
		@@ -117,6 +116,7 @@ class UinputRecordingIntegrationTests {
		size = testData.displaySize,
		)
		.use { scenario ->
		scenario.activity.shouldSplitBatchedEvents = true
		scenario.activity.window.decorView.requestUnbufferedDispatch(
		INPUT_DEVICE_SOURCE_ALL
		)
		@@ -137,29 +137,24 @@ class UinputRecordingIntegrationTests {
		fail("Test cannot pass in debug mode!")
		}

		val verifier =
		EventVerifier(
		BatchedEventSplitter { scenario.activity.getInputEvent() }
		)
		verifyEvents(verifier)
		verifyEvents(scenario.activity.verifier)
		scenario.activity.assertNoEvents()
		}
		}
		}

		private fun printReceivedEventsToLogcat(activity: CaptureEventActivity) {
		val getNextEvent = BatchedEventSplitter { activity.getInputEvent() }
		var receivedEvent: InputEvent? = getNextEvent()
		var receivedEvent: InputEvent? = activity.getInputEvent()
		while (receivedEvent != null) {
		Log.d(
		TAG,
		parser.encodeEvent(receivedEvent)?.toString() ?: "(Failed to encode received event)",
		)
		receivedEvent = getNextEvent()
		receivedEvent = activity.getInputEvent()
		}
		}

		private fun verifyEvents(verifier: EventVerifier) {
		private fun verifyEvents(verifier: BlockingQueueEventVerifier) {
		val uinputTestData = parser.getUinputTestData(testData.expectedEventsResource)
		for (test in uinputTestData) {
		for ((index, expectedEvent) in test.events.withIndex()) {