Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
ea90fccbd6
|
@ -213,7 +213,7 @@ TEST_F(DefaultTapHold, tap_and_hold_mod_tap_hold_key) {
|
||||||
set_keymap({mod_tap_hold_key});
|
set_keymap({mod_tap_hold_key});
|
||||||
|
|
||||||
/* Press mod-tap-hold key. */
|
/* Press mod-tap-hold key. */
|
||||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
|
||||||
mod_tap_hold_key.press();
|
mod_tap_hold_key.press();
|
||||||
idle_for(TAPPING_TERM + 1);
|
idle_for(TAPPING_TERM + 1);
|
||||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||||
|
|
|
@ -46,9 +46,9 @@ TEST_F(PermissiveHold, tap_regular_key_while_mod_tap_key_is_held) {
|
||||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||||
|
|
||||||
/* Release regular key */
|
/* Release regular key */
|
||||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
|
||||||
EXPECT_REPORT(driver, (KC_LSHIFT, regular_key.report_code));
|
EXPECT_REPORT(driver, (KC_LEFT_SHIFT, regular_key.report_code));
|
||||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
|
||||||
regular_key.release();
|
regular_key.release();
|
||||||
run_one_scan_loop();
|
run_one_scan_loop();
|
||||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||||
|
@ -81,9 +81,9 @@ TEST_F(PermissiveHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
|
||||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||||
|
|
||||||
/* Release second mod-tap-hold key */
|
/* Release second mod-tap-hold key */
|
||||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
|
||||||
EXPECT_REPORT(driver, (KC_LSHIFT, second_mod_tap_hold_key.report_code));
|
EXPECT_REPORT(driver, (KC_LEFT_SHIFT, second_mod_tap_hold_key.report_code));
|
||||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
|
||||||
second_mod_tap_hold_key.release();
|
second_mod_tap_hold_key.release();
|
||||||
run_one_scan_loop();
|
run_one_scan_loop();
|
||||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||||
|
|
|
@ -42,7 +42,7 @@ TEST_F(RetroTapping, tap_and_hold_mod_tap_hold_key) {
|
||||||
|
|
||||||
/* Release mod-tap-hold key. */
|
/* Release mod-tap-hold key. */
|
||||||
/* TODO: Why is LSHIFT send at all? */
|
/* TODO: Why is LSHIFT send at all? */
|
||||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
|
||||||
EXPECT_EMPTY_REPORT(driver);
|
EXPECT_EMPTY_REPORT(driver);
|
||||||
EXPECT_REPORT(driver, (KC_P));
|
EXPECT_REPORT(driver, (KC_P));
|
||||||
EXPECT_EMPTY_REPORT(driver);
|
EXPECT_EMPTY_REPORT(driver);
|
||||||
|
|
|
@ -205,7 +205,7 @@ TEST_F(TappingForceHold, tap_mod_tap_hold_key_twice_and_hold_on_second_time) {
|
||||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||||
|
|
||||||
/* Release mod-tap-hold key. */
|
/* Release mod-tap-hold key. */
|
||||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
|
||||||
EXPECT_EMPTY_REPORT(driver);
|
EXPECT_EMPTY_REPORT(driver);
|
||||||
mod_tap_hold_key.release();
|
mod_tap_hold_key.release();
|
||||||
run_one_scan_loop();
|
run_one_scan_loop();
|
||||||
|
|
Loading…
Reference in New Issue