Skip to content

Commit c93479c

Browse files
Treehugger RobotAndroid (Google) Code Review
Treehugger Robot
authored and
Android (Google) Code Review
committed
Merge "KeyboardInputMapper_test: remove unused testDPadKeyRotation parameter" into main
2 parents c88e2b8 + 1167e9a commit c93479c

1 file changed

Lines changed: 34 additions & 43 deletions

File tree

‎services/inputflinger/tests/KeyboardInputMapper_test.cpp‎

Lines changed: 34 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ class KeyboardInputMapperUnitTest : public InputMapperUnitTest {
182182
return argsList;
183183
}
184184

185-
void testDPadKeyRotation(int32_t originalEvdevCode, int32_t originalKeyCode,
186-
int32_t rotatedKeyCode, ui::LogicalDisplayId displayId = DISPLAY_ID) {
185+
void testDPadKeyRotation(int32_t originalEvdevCode, int32_t rotatedKeyCode,
186+
ui::LogicalDisplayId displayId = DISPLAY_ID) {
187187
std::list<NotifyArgs> argsList = processKeyAndSync(ARBITRARY_TIME, originalEvdevCode, 1);
188188
NotifyKeyArgs args = expectSingleKeyArg(argsList);
189189
ASSERT_EQ(AKEY_EVENT_ACTION_DOWN, args.action);
@@ -392,11 +392,10 @@ TEST_F(KeyboardInputMapperUnitTest, Process_WhenNotOrientationAware_ShouldNotRot
392392
addKeyByEvdevCode(KEY_LEFT, AKEYCODE_DPAD_LEFT);
393393

394394
setDisplayOrientation(ui::Rotation::Rotation90);
395-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_UP, AKEYCODE_DPAD_UP));
396-
ASSERT_NO_FATAL_FAILURE(
397-
testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_RIGHT, AKEYCODE_DPAD_RIGHT));
398-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_DOWN, AKEYCODE_DPAD_DOWN));
399-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_LEFT, AKEYCODE_DPAD_LEFT));
395+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_UP));
396+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_RIGHT));
397+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_DOWN));
398+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_LEFT));
400399
}
401400

402401
TEST_F(KeyboardInputMapperUnitTest, Process_WhenOrientationAware_ShouldRotateDPad) {
@@ -410,31 +409,28 @@ TEST_F(KeyboardInputMapperUnitTest, Process_WhenOrientationAware_ShouldRotateDPa
410409
AINPUT_SOURCE_KEYBOARD);
411410
setDisplayOrientation(ui::ROTATION_0);
412411

413-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_UP, AKEYCODE_DPAD_UP));
414-
ASSERT_NO_FATAL_FAILURE(
415-
testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_RIGHT, AKEYCODE_DPAD_RIGHT));
416-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_DOWN, AKEYCODE_DPAD_DOWN));
417-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_LEFT, AKEYCODE_DPAD_LEFT));
412+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_UP));
413+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_RIGHT));
414+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_DOWN));
415+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_LEFT));
418416

419417
setDisplayOrientation(ui::ROTATION_90);
420-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_UP, AKEYCODE_DPAD_LEFT));
421-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_RIGHT, AKEYCODE_DPAD_UP));
422-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_DOWN, AKEYCODE_DPAD_RIGHT));
423-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_LEFT, AKEYCODE_DPAD_DOWN));
418+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_LEFT));
419+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_UP));
420+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_RIGHT));
421+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_DOWN));
424422

425423
setDisplayOrientation(ui::ROTATION_180);
426-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_UP, AKEYCODE_DPAD_DOWN));
427-
ASSERT_NO_FATAL_FAILURE(
428-
testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_RIGHT, AKEYCODE_DPAD_LEFT));
429-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_DOWN, AKEYCODE_DPAD_UP));
430-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_LEFT, AKEYCODE_DPAD_RIGHT));
424+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_DOWN));
425+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_LEFT));
426+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_UP));
427+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_RIGHT));
431428

432429
setDisplayOrientation(ui::ROTATION_270);
433-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_UP, AKEYCODE_DPAD_RIGHT));
434-
ASSERT_NO_FATAL_FAILURE(
435-
testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_RIGHT, AKEYCODE_DPAD_DOWN));
436-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_DOWN, AKEYCODE_DPAD_LEFT));
437-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_LEFT, AKEYCODE_DPAD_UP));
430+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_UP, AKEYCODE_DPAD_RIGHT));
431+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_RIGHT, AKEYCODE_DPAD_DOWN));
432+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_DOWN, AKEYCODE_DPAD_LEFT));
433+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(KEY_LEFT, AKEYCODE_DPAD_UP));
438434

439435
// Special case: if orientation changes while key is down, we still emit the same keycode
440436
// in the key up as we did in the key down.
@@ -736,7 +732,7 @@ class KeyboardInputMapperTest : public InputMapperTest {
736732
const std::string UNIQUE_ID = "local:0";
737733

738734
void testDPadKeyRotation(KeyboardInputMapper& mapper, int32_t originalEvdevCode,
739-
int32_t originalKeyCode, int32_t rotatedKeyCode,
735+
int32_t rotatedKeyCode,
740736
ui::LogicalDisplayId displayId = ui::LogicalDisplayId::INVALID);
741737

742738
void processKeyAndSync(InputMapper& mapper, nsecs_t when, nsecs_t readTime, int32_t code,
@@ -747,8 +743,7 @@ class KeyboardInputMapperTest : public InputMapperTest {
747743
};
748744

749745
void KeyboardInputMapperTest::testDPadKeyRotation(KeyboardInputMapper& mapper,
750-
int32_t originalEvdevCode,
751-
int32_t originalKeyCode, int32_t rotatedKeyCode,
746+
int32_t originalEvdevCode, int32_t rotatedKeyCode,
752747
ui::LogicalDisplayId displayId) {
753748
NotifyKeyArgs args;
754749

@@ -830,23 +825,19 @@ TEST_F(KeyboardInputMapperTest, Configure_AssignsDisplayPort) {
830825
ASSERT_TRUE(device2->isEnabled());
831826

832827
// Test pad key events
828+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper, KEY_UP, AKEYCODE_DPAD_UP, DISPLAY_ID));
833829
ASSERT_NO_FATAL_FAILURE(
834-
testDPadKeyRotation(mapper, KEY_UP, AKEYCODE_DPAD_UP, AKEYCODE_DPAD_UP, DISPLAY_ID));
835-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper, KEY_RIGHT, AKEYCODE_DPAD_RIGHT,
836-
AKEYCODE_DPAD_RIGHT, DISPLAY_ID));
837-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper, KEY_DOWN, AKEYCODE_DPAD_DOWN,
838-
AKEYCODE_DPAD_DOWN, DISPLAY_ID));
839-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper, KEY_LEFT, AKEYCODE_DPAD_LEFT,
840-
AKEYCODE_DPAD_LEFT, DISPLAY_ID));
830+
testDPadKeyRotation(mapper, KEY_RIGHT, AKEYCODE_DPAD_RIGHT, DISPLAY_ID));
831+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper, KEY_DOWN, AKEYCODE_DPAD_DOWN, DISPLAY_ID));
832+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper, KEY_LEFT, AKEYCODE_DPAD_LEFT, DISPLAY_ID));
841833

834+
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper2, KEY_UP, AKEYCODE_DPAD_UP, newDisplayId));
835+
ASSERT_NO_FATAL_FAILURE(
836+
testDPadKeyRotation(mapper2, KEY_RIGHT, AKEYCODE_DPAD_RIGHT, newDisplayId));
837+
ASSERT_NO_FATAL_FAILURE(
838+
testDPadKeyRotation(mapper2, KEY_DOWN, AKEYCODE_DPAD_DOWN, newDisplayId));
842839
ASSERT_NO_FATAL_FAILURE(
843-
testDPadKeyRotation(mapper2, KEY_UP, AKEYCODE_DPAD_UP, AKEYCODE_DPAD_UP, newDisplayId));
844-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper2, KEY_RIGHT, AKEYCODE_DPAD_RIGHT,
845-
AKEYCODE_DPAD_RIGHT, newDisplayId));
846-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper2, KEY_DOWN, AKEYCODE_DPAD_DOWN,
847-
AKEYCODE_DPAD_DOWN, newDisplayId));
848-
ASSERT_NO_FATAL_FAILURE(testDPadKeyRotation(mapper2, KEY_LEFT, AKEYCODE_DPAD_LEFT,
849-
AKEYCODE_DPAD_LEFT, newDisplayId));
840+
testDPadKeyRotation(mapper2, KEY_LEFT, AKEYCODE_DPAD_LEFT, newDisplayId));
850841
}
851842

852843
TEST_F(KeyboardInputMapperTest, Process_LockedKeysShouldToggleAfterReattach) {

0 commit comments

Comments
 (0)