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

Commit 511ce6aa authored by Harry Cutts's avatar Harry Cutts
Browse files

JoystickInputMapperTest: migrate to InputMapperUnitTest 

Bug: 283812079
Test: atest frameworks/native/services/inputflinger/tests/JoystickInputMapper_test.cpp
Test: atest frameworks/native/services/inputflinger/tests/CursorInputMapper_test.cpp
Flag: TEST_ONLY
Change-Id: Ia270695bf49cf3453b4d3ad7c0276bc6b7e6a963
parent edad9115

services/inputflinger/reader/include/InputDevice.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public: 
    inline std::optional<std::string> getDeviceTypeAssociation() const {

        return mAssociatedDeviceType;

    }

    inline std::optional<DisplayViewport> getAssociatedViewport() const {

    inline virtual std::optional<DisplayViewport> getAssociatedViewport() const {

        return mAssociatedViewport;

    }

    inline bool hasMic() const { return mHasMic; }

services/inputflinger/tests/InterfaceMocks.h

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ public: 
          : InputDevice(context, id, generation, identifier) {}



    MOCK_METHOD(uint32_t, getSources, (), (const, override));

    MOCK_METHOD(std::optional<DisplayViewport>, getAssociatedViewport, (), (const));

    MOCK_METHOD(bool, isEnabled, (), ());



    MOCK_METHOD(void, dump, (std::string& dump, const std::string& eventHubDevStr), ());

services/inputflinger/tests/JoystickInputMapper_test.cpp

+34 −54
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 


#include "JoystickInputMapper.h"



#include <list>

#include <optional>



#include <EventHub.h>

#include <NotifyArgs.h>

#include <ftl/flags.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <input/DisplayViewport.h>

#include <linux/input-event-codes.h>
@@ -28,76 +30,54 @@ 


#include "InputMapperTest.h"

#include "TestConstants.h"

#include "TestEventMatchers.h"



namespace android {



namespace {



using namespace ftl::flag_operators;

using testing::ElementsAre;

using testing::IsEmpty;

using testing::Return;

using testing::VariantWith;



} // namespace



class JoystickInputMapperTest : public InputMapperTest {

class JoystickInputMapperTest : public InputMapperUnitTest {

protected:

    static const int32_t RAW_X_MIN;

    static const int32_t RAW_X_MAX;

    static const int32_t RAW_Y_MIN;

    static const int32_t RAW_Y_MAX;



    static constexpr ui::LogicalDisplayId VIRTUAL_DISPLAY_ID = ui::LogicalDisplayId{1};

    static const char* const VIRTUAL_DISPLAY_UNIQUE_ID;



    void SetUp() override {

        InputMapperTest::SetUp(InputDeviceClass::JOYSTICK | InputDeviceClass::EXTERNAL);

    }

    void prepareAxes() {

        mFakeEventHub->addAbsoluteAxis(EVENTHUB_ID, ABS_X, RAW_X_MIN, RAW_X_MAX, 0, 0);

        mFakeEventHub->addAbsoluteAxis(EVENTHUB_ID, ABS_Y, RAW_Y_MIN, RAW_Y_MAX, 0, 0);

    }



    void processAxis(JoystickInputMapper& mapper, int32_t axis, int32_t value) {

        process(mapper, ARBITRARY_TIME, READ_TIME, EV_ABS, axis, value);

    }



    void processSync(JoystickInputMapper& mapper) {

        process(mapper, ARBITRARY_TIME, READ_TIME, EV_SYN, SYN_REPORT, 0);

    }



    void prepareVirtualDisplay(ui::Rotation orientation) {

        setDisplayInfoAndReconfigure(VIRTUAL_DISPLAY_ID, /*width=*/400, /*height=*/500, orientation,

                                     VIRTUAL_DISPLAY_UNIQUE_ID, /*physicalPort=*/std::nullopt,

                                     ViewportType::VIRTUAL);

        InputMapperUnitTest::SetUp();

        EXPECT_CALL(mMockEventHub, getDeviceClasses(EVENTHUB_ID))

                .WillRepeatedly(Return(InputDeviceClass::JOYSTICK | InputDeviceClass::EXTERNAL));



        // The mapper requests info on all ABS axis IDs, including ones which aren't actually used

        // (e.g. in the range from 0x0b (ABS_BRAKE) to 0x0f (ABS_HAT0X)), so just return nullopt for

        // all axes we don't explicitly set up below.

        EXPECT_CALL(mMockEventHub, getAbsoluteAxisInfo(EVENTHUB_ID, testing::_))

                .WillRepeatedly(Return(std::nullopt));



        setupAxis(ABS_X, /*valid=*/true, /*min=*/-32767, /*max=*/32767, /*resolution=*/0);

        setupAxis(ABS_Y, /*valid=*/true, /*min=*/-32767, /*max=*/32767, /*resolution=*/0);

    }

};



const int32_t JoystickInputMapperTest::RAW_X_MIN = -32767;

const int32_t JoystickInputMapperTest::RAW_X_MAX = 32767;

const int32_t JoystickInputMapperTest::RAW_Y_MIN = -32767;

const int32_t JoystickInputMapperTest::RAW_Y_MAX = 32767;

const char* const JoystickInputMapperTest::VIRTUAL_DISPLAY_UNIQUE_ID = "virtual:1";



TEST_F(JoystickInputMapperTest, Configure_AssignsDisplayUniqueId) {

    prepareAxes();

    JoystickInputMapper& mapper = constructAndAddMapper<JoystickInputMapper>();

    DisplayViewport viewport;

    viewport.displayId = ui::LogicalDisplayId{1};

    EXPECT_CALL((*mDevice), getAssociatedViewport).WillRepeatedly(Return(viewport));

    mMapper = createInputMapper<JoystickInputMapper>(*mDeviceContext,

                                                     mFakePolicy->getReaderConfiguration());



    mFakePolicy->addInputUniqueIdAssociation(DEVICE_LOCATION, VIRTUAL_DISPLAY_UNIQUE_ID);



    prepareVirtualDisplay(ui::ROTATION_0);

    std::list<NotifyArgs> out;



    // Send an axis event

    processAxis(mapper, ABS_X, 100);

    processSync(mapper);



    NotifyMotionArgs args;

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&args));

    ASSERT_EQ(VIRTUAL_DISPLAY_ID, args.displayId);

    out = process(EV_ABS, ABS_X, 100);

    ASSERT_THAT(out, IsEmpty());

    out = process(EV_SYN, SYN_REPORT, 0);

    ASSERT_THAT(out, ElementsAre(VariantWith<NotifyMotionArgs>(WithDisplayId(viewport.displayId))));



    // Send another axis event

    processAxis(mapper, ABS_Y, 100);

    processSync(mapper);



    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&args));

    ASSERT_EQ(VIRTUAL_DISPLAY_ID, args.displayId);

    out = process(EV_ABS, ABS_Y, 100);

    ASSERT_THAT(out, IsEmpty());

    out = process(EV_SYN, SYN_REPORT, 0);

    ASSERT_THAT(out, ElementsAre(VariantWith<NotifyMotionArgs>(WithDisplayId(viewport.displayId))));

}



} // namespace android