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

Commit 592af971 authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge changes I9104f450,I4f1f9945 into main 

* changes:
  VibratorInputMapperTest: migrate to InputMapperUnitTest
  Extract VibratorInputMapperTest to its own file
parents 71c6f73a 01149afd

services/inputflinger/tests/Android.bp

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

        "TestInputListener.cpp",

        "TouchpadInputMapper_test.cpp",

        "VibratorInputMapper_test.cpp",

        "MultiTouchInputMapper_test.cpp",

        "KeyboardInputMapper_test.cpp",

        "UinputDevice.cpp",

services/inputflinger/tests/InputReader_test.cpp

+0 −59
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <TestInputListener.h>

#include <TouchInputMapper.h>

#include <UinputDevice.h>

#include <VibratorInputMapper.h>

#include <android-base/thread_annotations.h>

#include <com_android_input_flags.h>

#include <ftl/enum.h>
@@ -3062,64 +3061,6 @@ TEST_F(InputDeviceTest, KernelBufferOverflowResetsMappers) { 
    mapper.assertProcessWasCalled();

}



// --- VibratorInputMapperTest ---

class VibratorInputMapperTest : public InputMapperTest {

protected:

    void SetUp() override { InputMapperTest::SetUp(DEVICE_CLASSES | InputDeviceClass::VIBRATOR); }

};



TEST_F(VibratorInputMapperTest, GetSources) {

    VibratorInputMapper& mapper = constructAndAddMapper<VibratorInputMapper>();



    ASSERT_EQ(AINPUT_SOURCE_UNKNOWN, mapper.getSources());

}



TEST_F(VibratorInputMapperTest, GetVibratorIds) {

    VibratorInputMapper& mapper = constructAndAddMapper<VibratorInputMapper>();



    ASSERT_EQ(mapper.getVibratorIds().size(), 2U);

}



TEST_F(VibratorInputMapperTest, Vibrate) {

    constexpr uint8_t DEFAULT_AMPLITUDE = 192;

    constexpr int32_t VIBRATION_TOKEN = 100;

    VibratorInputMapper& mapper = constructAndAddMapper<VibratorInputMapper>();



    VibrationElement pattern(2);

    VibrationSequence sequence(2);

    pattern.duration = std::chrono::milliseconds(200);

    pattern.channels = {{/*vibratorId=*/0, DEFAULT_AMPLITUDE / 2},

                        {/*vibratorId=*/1, DEFAULT_AMPLITUDE}};

    sequence.addElement(pattern);

    pattern.duration = std::chrono::milliseconds(500);

    pattern.channels = {{/*vibratorId=*/0, DEFAULT_AMPLITUDE / 4},

                        {/*vibratorId=*/1, DEFAULT_AMPLITUDE}};

    sequence.addElement(pattern);



    std::vector<int64_t> timings = {0, 1};

    std::vector<uint8_t> amplitudes = {DEFAULT_AMPLITUDE, DEFAULT_AMPLITUDE / 2};



    ASSERT_FALSE(mapper.isVibrating());

    // Start vibrating

    std::list<NotifyArgs> out = mapper.vibrate(sequence, /*repeat=*/-1, VIBRATION_TOKEN);

    ASSERT_TRUE(mapper.isVibrating());

    // Verify vibrator state listener was notified.

    mReader->loopOnce();

    ASSERT_EQ(1u, out.size());

    const NotifyVibratorStateArgs& vibrateArgs = std::get<NotifyVibratorStateArgs>(*out.begin());

    ASSERT_EQ(DEVICE_ID, vibrateArgs.deviceId);

    ASSERT_TRUE(vibrateArgs.isOn);

    // Stop vibrating

    out = mapper.cancelVibrate(VIBRATION_TOKEN);

    ASSERT_FALSE(mapper.isVibrating());

    // Verify vibrator state listener was notified.

    mReader->loopOnce();

    ASSERT_EQ(1u, out.size());

    const NotifyVibratorStateArgs& cancelArgs = std::get<NotifyVibratorStateArgs>(*out.begin());

    ASSERT_EQ(DEVICE_ID, cancelArgs.deviceId);

    ASSERT_FALSE(cancelArgs.isOn);

}



// --- SensorInputMapperTest ---



class SensorInputMapperTest : public InputMapperTest {

services/inputflinger/tests/VibratorInputMapper_test.cpp

0 → 100644
+94 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "VibratorInputMapper.h"



#include <chrono>

#include <list>

#include <variant>

#include <vector>



#include <EventHub.h>

#include <NotifyArgs.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <input/Input.h>



#include "InputMapperTest.h"

#include "VibrationElement.h"



namespace android {



class VibratorInputMapperTest : public InputMapperUnitTest {

protected:

    void SetUp() override {

        InputMapperUnitTest::SetUp();

        createDevice();

        EXPECT_CALL(mMockEventHub, getDeviceClasses(EVENTHUB_ID))

                .WillRepeatedly(testing::Return(InputDeviceClass::VIBRATOR));

        EXPECT_CALL(mMockEventHub, getVibratorIds(EVENTHUB_ID))

                .WillRepeatedly(testing::Return<std::vector<int32_t>>({0, 1}));

        mMapper = createInputMapper<VibratorInputMapper>(*mDeviceContext,

                                                         mFakePolicy->getReaderConfiguration());

    }

};



TEST_F(VibratorInputMapperTest, GetSources) {

    ASSERT_EQ(AINPUT_SOURCE_UNKNOWN, mMapper->getSources());

}



TEST_F(VibratorInputMapperTest, GetVibratorIds) {

    ASSERT_EQ(mMapper->getVibratorIds().size(), 2U);

}



TEST_F(VibratorInputMapperTest, Vibrate) {

    constexpr uint8_t DEFAULT_AMPLITUDE = 192;

    constexpr int32_t VIBRATION_TOKEN = 100;



    VibrationElement pattern(2);

    VibrationSequence sequence(2);

    pattern.duration = std::chrono::milliseconds(200);

    pattern.channels = {{/*vibratorId=*/0, DEFAULT_AMPLITUDE / 2},

                        {/*vibratorId=*/1, DEFAULT_AMPLITUDE}};

    sequence.addElement(pattern);

    pattern.duration = std::chrono::milliseconds(500);

    pattern.channels = {{/*vibratorId=*/0, DEFAULT_AMPLITUDE / 4},

                        {/*vibratorId=*/1, DEFAULT_AMPLITUDE}};

    sequence.addElement(pattern);



    std::vector<int64_t> timings = {0, 1};

    std::vector<uint8_t> amplitudes = {DEFAULT_AMPLITUDE, DEFAULT_AMPLITUDE / 2};



    ASSERT_FALSE(mMapper->isVibrating());

    // Start vibrating

    std::list<NotifyArgs> out = mMapper->vibrate(sequence, /*repeat=*/-1, VIBRATION_TOKEN);

    ASSERT_TRUE(mMapper->isVibrating());

    // Verify vibrator state listener was notified.

    ASSERT_EQ(1u, out.size());

    const NotifyVibratorStateArgs& vibrateArgs = std::get<NotifyVibratorStateArgs>(*out.begin());

    ASSERT_EQ(DEVICE_ID, vibrateArgs.deviceId);

    ASSERT_TRUE(vibrateArgs.isOn);

    // Stop vibrating

    out = mMapper->cancelVibrate(VIBRATION_TOKEN);

    ASSERT_FALSE(mMapper->isVibrating());

    // Verify vibrator state listener was notified.

    ASSERT_EQ(1u, out.size());

    const NotifyVibratorStateArgs& cancelArgs = std::get<NotifyVibratorStateArgs>(*out.begin());

    ASSERT_EQ(DEVICE_ID, cancelArgs.deviceId);

    ASSERT_FALSE(cancelArgs.isOn);

}



} // namespace android
 
 No newline at end of file