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

Commit b237f9e2 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

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
parent d3208d8f

include/input/Input.h

+6 −6
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ class KeyEvent : public InputEvent { 
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 @@ class MotionEvent : public InputEvent { 
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 @@ class FocusEvent : public InputEvent { 
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 @@ class CaptureEvent : public InputEvent { 
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 @@ class DragEvent : public InputEvent { 
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 @@ class TouchModeEvent : public InputEvent { 
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; }

services/inputflinger/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ cc_test { 
        "SlopController_test.cpp",

        "SyncQueue_test.cpp",

        "TestInputListener.cpp",

        "TestInputListenerMatchers.cpp",

        "TouchpadInputMapper_test.cpp",

        "UinputDevice.cpp",

        "UnwantedInteractionBlocker_test.cpp",