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

Commit c8e4fa9b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Test MotionEvents for InputDispatcher::verifyInputEvent" into rvc-dev am: 34560b6d 

Change-Id: I4adfc4a230876817c48bb6f98f5058c4d979f45b
parents a0281244 34560b6d

services/inputflinger/tests/InputDispatcher_test.cpp

+37 −1
Original line number Diff line number Diff line
@@ -1445,7 +1445,6 @@ TEST_F(InputDispatcherTest, VerifyInputEvent_KeyEvent) { 


    ASSERT_EQ(keyArgs.action, verifiedKey.action);

    ASSERT_EQ(keyArgs.downTime, verifiedKey.downTimeNanos);

    ASSERT_EQ(keyArgs.eventTime, verifiedKey.eventTimeNanos);

    ASSERT_EQ(keyArgs.flags & VERIFIED_KEY_EVENT_FLAGS, verifiedKey.flags);

    ASSERT_EQ(keyArgs.keyCode, verifiedKey.keyCode);

    ASSERT_EQ(keyArgs.scanCode, verifiedKey.scanCode);
@@ -1453,6 +1452,43 @@ TEST_F(InputDispatcherTest, VerifyInputEvent_KeyEvent) { 
    ASSERT_EQ(0, verifiedKey.repeatCount);

}



TEST_F(InputDispatcherTest, VerifyInputEvent_MotionEvent) {

    sp<FakeApplicationHandle> application = new FakeApplicationHandle();

    sp<FakeWindowHandle> window =

            new FakeWindowHandle(application, mDispatcher, "Test window", ADISPLAY_ID_DEFAULT);



    mDispatcher->setFocusedApplication(ADISPLAY_ID_DEFAULT, application);



    mDispatcher->setInputWindows({window}, ADISPLAY_ID_DEFAULT);



    NotifyMotionArgs motionArgs =

            generateMotionArgs(AMOTION_EVENT_ACTION_DOWN, AINPUT_SOURCE_TOUCHSCREEN,

                               ADISPLAY_ID_DEFAULT);

    mDispatcher->notifyMotion(&motionArgs);



    InputEvent* event = window->consume();

    ASSERT_NE(event, nullptr);



    std::unique_ptr<VerifiedInputEvent> verified = mDispatcher->verifyInputEvent(*event);

    ASSERT_NE(verified, nullptr);

    ASSERT_EQ(verified->type, VerifiedInputEvent::Type::MOTION);



    EXPECT_EQ(motionArgs.eventTime, verified->eventTimeNanos);

    EXPECT_EQ(motionArgs.deviceId, verified->deviceId);

    EXPECT_EQ(motionArgs.source, verified->source);

    EXPECT_EQ(motionArgs.displayId, verified->displayId);



    const VerifiedMotionEvent& verifiedMotion = static_cast<const VerifiedMotionEvent&>(*verified);



    EXPECT_EQ(motionArgs.pointerCoords[0].getX(), verifiedMotion.rawX);

    EXPECT_EQ(motionArgs.pointerCoords[0].getY(), verifiedMotion.rawY);

    EXPECT_EQ(motionArgs.action & AMOTION_EVENT_ACTION_MASK, verifiedMotion.actionMasked);

    EXPECT_EQ(motionArgs.downTime, verifiedMotion.downTimeNanos);

    EXPECT_EQ(motionArgs.flags & VERIFIED_MOTION_EVENT_FLAGS, verifiedMotion.flags);

    EXPECT_EQ(motionArgs.metaState, verifiedMotion.metaState);

    EXPECT_EQ(motionArgs.buttonState, verifiedMotion.buttonState);

}



class InputDispatcherKeyRepeatTest : public InputDispatcherTest {

protected:

    static constexpr nsecs_t KEY_REPEAT_TIMEOUT = 40 * 1000000; // 40 ms