commit b237f9e214a05f9018c0321b8090e186a24fa364
author Siarhei Vishniakou <svv@google.com> Fri Jul 21 16:42:23 2023 -0700
committer Siarhei Vishniakou <svv@google.com> Tue Jul 25 11:58:16 2023 -0700
tree d89f41eb6e13db162dbfba9dbe183bf36b1c7c14
parent d3208d8ff6a1aeafb0bbb872aff46ba8d089f710

Increase timeouts in InputDispatcher_tests

These tests are flaky on some platforms because we aren't allowing
enough time to consume the events.

To work around this, create another path for checking when the events
didn't occur.

Now, if we expect to receive an event, we are waiting for a very long
time. If we expect no event, we are waiting a short time.

This will speed up tests while reducing the flake rate.

In addition to the above, add some more infrastructure to be able to
match against common fields of NotifyArgs and InputEvent.

Bug: 292232423
Test: TEST=inputflinger_tests; m $TEST && $ANDROID_HOST_OUT/nativetest64/$TEST/$TEST
Change-Id: I1d6f091376b59279f11a04d02a875991a6384e31

include/input/Input.h

diff --git a/include/input/Input.h b/include/input/Input.h
index a271f0c..64ee473 100644
--- a/include/input/Input.h
+++ b/include/input/Input.h
@@ -551,7 +551,7 @@
 public:
     virtual ~KeyEvent() { }
 
-    virtual InputEventType getType() const { return InputEventType::KEY; }
+    InputEventType getType() const override { return InputEventType::KEY; }
 
     inline int32_t getAction() const { return mAction; }
 
@@ -602,7 +602,7 @@
 public:
     virtual ~MotionEvent() { }
 
-    virtual InputEventType getType() const { return InputEventType::MOTION; }
+    InputEventType getType() const override { return InputEventType::MOTION; }
 
     inline int32_t getAction() const { return mAction; }
 
@@ -930,7 +930,7 @@
 public:
     virtual ~FocusEvent() {}
 
-    virtual InputEventType getType() const override { return InputEventType::FOCUS; }
+    InputEventType getType() const override { return InputEventType::FOCUS; }
 
     inline bool getHasFocus() const { return mHasFocus; }
 
@@ -949,7 +949,7 @@
 public:
     virtual ~CaptureEvent() {}
 
-    virtual InputEventType getType() const override { return InputEventType::CAPTURE; }
+    InputEventType getType() const override { return InputEventType::CAPTURE; }
 
     inline bool getPointerCaptureEnabled() const { return mPointerCaptureEnabled; }
 
@@ -968,7 +968,7 @@
 public:
     virtual ~DragEvent() {}
 
-    virtual InputEventType getType() const override { return InputEventType::DRAG; }
+    InputEventType getType() const override { return InputEventType::DRAG; }
 
     inline bool isExiting() const { return mIsExiting; }
 
@@ -992,7 +992,7 @@
 public:
     virtual ~TouchModeEvent() {}
 
-    virtual InputEventType getType() const override { return InputEventType::TOUCH_MODE; }
+    InputEventType getType() const override { return InputEventType::TOUCH_MODE; }
 
     inline bool isInTouchMode() const { return mIsInTouchMode; }