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

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

Use TestPointerController in libinputservice_test 

This test is currently affecting SF state. Even though the bug is in SF,
add a workaround here while the SF is getting fixed to unbreak our
presubmit.

In the future, we can consider adding a proper integration test for
checking PointerController behaviour with the real SF.

Bug: 301657737
Test: atest libinputservice_test
Test: atest VirtualDpadTest

Change-Id: Ia70e13add397ba10bde36a07d132e8dbc252eacd
parent 698aa376

libs/input/tests/Android.bp

+15 −0
Original line number Diff line number Diff line
@@ -26,6 +26,21 @@ cc_test { 
    srcs: [

        "PointerController_test.cpp",

    ],

    sanitize: {

        hwaddress: true,

        undefined: true,

        all_undefined: true,

        diag: {

            undefined: true,

        },

    },

    target: {

        host: {

            sanitize: {

                address: true,

            },

        },

    },

    shared_libs: [

        "libandroid_runtime",

        "libinputservice",

libs/input/tests/PointerController_test.cpp

+26 −20
Original line number Diff line number Diff line
@@ -148,6 +148,25 @@ void MockPointerControllerPolicyInterface::onPointerDisplayIdChanged(int32_t dis 
    latestPointerDisplayId = displayId;

}



class TestPointerController : public PointerController {

public:

    TestPointerController(sp<android::gui::WindowInfosListener>& registeredListener,

                          sp<PointerControllerPolicyInterface> policy, const sp<Looper>& looper,

                          SpriteController& spriteController)

          : PointerController(

                    policy, looper, spriteController,

                    /*enabled=*/true,

                    [&registeredListener](const sp<android::gui::WindowInfosListener>& listener) {

                        // Register listener

                        registeredListener = listener;

                    },

                    [&registeredListener](const sp<android::gui::WindowInfosListener>& listener) {

                        // Unregister listener

                        if (registeredListener == listener) registeredListener = nullptr;

                    }) {}

    ~TestPointerController() override {}

};



class PointerControllerTest : public Test {

protected:

    PointerControllerTest();
@@ -159,6 +178,7 @@ protected: 
    sp<MockPointerControllerPolicyInterface> mPolicy;

    std::unique_ptr<MockSpriteController> mSpriteController;

    std::shared_ptr<PointerController> mPointerController;

    sp<android::gui::WindowInfosListener> mRegisteredListener;



private:

    void loopThread();
@@ -181,11 +201,12 @@ PointerControllerTest::PointerControllerTest() : mPointerSprite(new NiceMock<Moc 
    EXPECT_CALL(*mSpriteController, createSprite())

            .WillOnce(Return(mPointerSprite));



    mPointerController =

            PointerController::create(mPolicy, mLooper, *mSpriteController, /*enabled=*/true);

    mPointerController = std::make_unique<TestPointerController>(mRegisteredListener, mPolicy,

                                                                 mLooper, *mSpriteController);

}



PointerControllerTest::~PointerControllerTest() {

    mPointerController.reset();

    mRunning.store(false, std::memory_order_relaxed);

    mThread.join();

}
@@ -316,31 +337,16 @@ TEST_F(PointerControllerTest, notifiesPolicyWhenPointerDisplayChanges) { 


class PointerControllerWindowInfoListenerTest : public Test {};



class TestPointerController : public PointerController {

public:

    TestPointerController(sp<android::gui::WindowInfosListener>& registeredListener,

                          const sp<Looper>& looper, SpriteController& spriteController)

          : PointerController(

                    new MockPointerControllerPolicyInterface(), looper, spriteController,

                    /*enabled=*/true,

                    [&registeredListener](const sp<android::gui::WindowInfosListener>& listener) {

                        // Register listener

                        registeredListener = listener;

                    },

                    [&registeredListener](const sp<android::gui::WindowInfosListener>& listener) {

                        // Unregister listener

                        if (registeredListener == listener) registeredListener = nullptr;

                    }) {}

};



TEST_F(PointerControllerWindowInfoListenerTest,

       doesNotCrashIfListenerCalledAfterPointerControllerDestroyed) {

    sp<Looper> looper = new Looper(false);

    auto spriteController = NiceMock<MockSpriteController>(looper);

    sp<android::gui::WindowInfosListener> registeredListener;

    sp<android::gui::WindowInfosListener> localListenerCopy;

    sp<MockPointerControllerPolicyInterface> policy = new MockPointerControllerPolicyInterface();

    {

        TestPointerController pointerController(registeredListener, looper, spriteController);

        TestPointerController pointerController(registeredListener, policy, looper,

                                                spriteController);

        ASSERT_NE(nullptr, registeredListener) << "WindowInfosListener was not registered";

        localListenerCopy = registeredListener;

    }