commit c7abe8278d7efd2597ec038b849655f823a1f905
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 01 20:30:20 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 01 20:30:20 2024 +0000
tree 0c2b32d0b740a119f784db1bda8c0cbc56774da3
parent ddecabc7c18367bbb0c2f663ad15e3b57f4f8fd8
parent 85eb580ba5a9bbeb84a02baf7aa17beb68638feb

Merge "Spy may receive events out of order" into main

services/inputflinger/tests/InputDispatcher_test.cpp

diff --git a/services/inputflinger/tests/InputDispatcher_test.cpp b/services/inputflinger/tests/InputDispatcher_test.cpp
index 7f25608..05db1ef 100644
--- a/services/inputflinger/tests/InputDispatcher_test.cpp
+++ b/services/inputflinger/tests/InputDispatcher_test.cpp
@@ -59,6 +59,8 @@
 using namespace ftl::flag_operators;
 using testing::AllOf;
 using testing::Not;
+using testing::Pointee;
+using testing::UnorderedElementsAre;
 
 namespace {
 
@@ -12299,8 +12301,13 @@
                     .deviceId(touchDeviceId)
                     .pointer(PointerBuilder(0, ToolType::FINGER).x(151).y(52))
                     .build());
-    spy->consumeMotionEvent(AllOf(WithMotionAction(ACTION_MOVE), WithDeviceId(stylusDeviceId)));
-    spy->consumeMotionEvent(AllOf(WithMotionAction(ACTION_MOVE), WithDeviceId(touchDeviceId)));
+    std::vector<std::unique_ptr<MotionEvent>> spyEvents;
+    spyEvents.push_back(spy->consumeMotionEvent(WithMotionAction(ACTION_MOVE)));
+    spyEvents.push_back(spy->consumeMotionEvent(WithMotionAction(ACTION_MOVE)));
+    // TODO(b/332314982) : Figure out why these can be out of order
+    ASSERT_THAT(spyEvents,
+                UnorderedElementsAre(Pointee(WithDeviceId(stylusDeviceId)),
+                                     Pointee(WithDeviceId(touchDeviceId))));
 
     spy->assertNoEvents();
     leftWindow->assertNoEvents();