KeyboardInputMapper: migrate most tests to InputMapperUnitTest
Some of these tests create multiple input devices and mappers, which I
didn't have time to work out how to mimic using InputMapperUnitTest. The
rest have been migrated.
Notes:
* Split out Process_UnknownKey from Process_SimpleKeyPress, since it's a
separate behaviour to test
* As far as I can tell, Process_KeyRemapping was just testing the
remapping code in FakeEventHub, so I removed it
* Process_WhenNotOrientationAware_ShouldNotRotateDPad now checks for a
display ID of DISPLAY_ID, not INVALID. This is because the method
called by KeyboardInputMapper to check orientation
(getAssociatedViewport) will never return an orientation without also
returning a valid display ID; setting one without the other appears to
have been possible in the old testing infrastructure, but would only
have affected state somewhere outside of KeyboardInputMapper.
For similar reasons, removed the second half of
DisplayIdConfigurationChange_NotOrientationAware.
* MarkSupportedKeyCodes was removed, as the code to test it would have
been too bulky to test a trivial one-liner (and it would basically
have been a change detector).
Test: atest --host inputflinger_tests
Bug: 283812079
Flag: TEST_ONLY
Change-Id: Id6d2eb4ec2bae6bd0e9a263209169785e40a6024
diff --git a/services/inputflinger/reader/include/InputDevice.h b/services/inputflinger/reader/include/InputDevice.h
index abe7a5f..4744dd0 100644
--- a/services/inputflinger/reader/include/InputDevice.h
+++ b/services/inputflinger/reader/include/InputDevice.h
@@ -48,7 +48,7 @@
inline InputReaderContext* getContext() { return mContext; }
inline int32_t getId() const { return mId; }
inline int32_t getControllerNumber() const { return mControllerNumber; }
- inline int32_t getGeneration() const { return mGeneration; }
+ inline virtual int32_t getGeneration() const { return mGeneration; }
inline const std::string getName() const { return mIdentifier.name; }
inline const std::string getDescriptor() { return mIdentifier.descriptor; }
inline std::optional<std::string> getBluetoothAddress() const {
@@ -59,7 +59,7 @@
inline virtual uint32_t getSources() const { return mSources; }
inline bool hasEventHubDevices() const { return !mDevices.empty(); }
- inline bool isExternal() { return mIsExternal; }
+ inline virtual bool isExternal() { return mIsExternal; }
inline std::optional<uint8_t> getAssociatedDisplayPort() const {
return mAssociatedDisplayPort;
}
@@ -79,7 +79,7 @@
inline bool isIgnored() { return !getMapperCount() && !mController; }
- inline KeyboardType getKeyboardType() const { return mKeyboardType; }
+ inline virtual KeyboardType getKeyboardType() const { return mKeyboardType; }
bool isEnabled();
@@ -124,7 +124,7 @@
int32_t getMetaState();
void setKeyboardType(KeyboardType keyboardType);
- void bumpGeneration();
+ virtual void bumpGeneration();
[[nodiscard]] NotifyDeviceResetArgs notifyReset(nsecs_t when);