Apply EXPECT_REPORT and EXPECT_EMPTY_REPORT (#17311)
...convenience macros to test cases that where missed during #17284
This commit is contained in:
@@ -44,14 +44,14 @@ TEST_P(OneShotParametrizedTestFixture, OSMAsRegularModifierWithAdditionalKeypres
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
|
||||
/* Release regular key */
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(osm_key.report_code))).Times(2);
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(regular_key.report_code, osm_key.report_code))).Times(1);
|
||||
EXPECT_REPORT(driver, (osm_key.report_code)).Times(2);
|
||||
EXPECT_REPORT(driver, (regular_key.report_code, osm_key.report_code)).Times(1);
|
||||
regular_key.release();
|
||||
run_one_scan_loop();
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
|
||||
/* Release OSM */
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
|
||||
EXPECT_EMPTY_REPORT(driver).Times(1);
|
||||
osm_key.release();
|
||||
run_one_scan_loop();
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
|
@@ -46,15 +46,15 @@ TEST_F(PermissiveHold, tap_regular_key_while_mod_tap_key_is_held) {
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
|
||||
/* Release regular key */
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSHIFT)));
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSHIFT, regular_key.report_code)));
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSHIFT)));
|
||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
||||
EXPECT_REPORT(driver, (KC_LSHIFT, regular_key.report_code));
|
||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
||||
regular_key.release();
|
||||
run_one_scan_loop();
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
|
||||
/* Release mod-tap-hold key */
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
mod_tap_hold_key.release();
|
||||
run_one_scan_loop();
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
@@ -81,15 +81,15 @@ TEST_F(PermissiveHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
|
||||
/* Release second mod-tap-hold key */
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSHIFT)));
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSHIFT, second_mod_tap_hold_key.report_code)));
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSHIFT)));
|
||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
||||
EXPECT_REPORT(driver, (KC_LSHIFT, second_mod_tap_hold_key.report_code));
|
||||
EXPECT_REPORT(driver, (KC_LSHIFT));
|
||||
second_mod_tap_hold_key.release();
|
||||
run_one_scan_loop();
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
|
||||
/* Release first mod-tap-hold key */
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
first_mod_tap_hold_key.release();
|
||||
run_one_scan_loop();
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
@@ -117,8 +117,8 @@ TEST_F(PermissiveHold, tap_regular_key_while_layer_tap_key_is_held) {
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
|
||||
/* Release regular key */
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(layer_key.report_code)));
|
||||
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
|
||||
EXPECT_REPORT(driver, (layer_key.report_code));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
regular_key.release();
|
||||
run_one_scan_loop();
|
||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||
|
Reference in New Issue
Block a user