@@ -54,15 +54,15 @@ TEST_F(TappingForceHold, tap_regular_key_while_mod_tap_key_is_held) {
54
54
testing::Mock::VerifyAndClearExpectations (&driver);
55
55
56
56
/* Release mod-tap-hold key. */
57
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_LSFT) ));
57
+ EXPECT_REPORT (driver, ( KC_LSFT));
58
58
mod_tap_hold_key.release ();
59
59
run_one_scan_loop ();
60
60
testing::Mock::VerifyAndClearExpectations (&driver);
61
61
62
62
/* Idle for tapping term of mod tap hold key. */
63
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_LSFT, KC_A) ));
64
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_LSFT) ));
65
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ()) );
63
+ EXPECT_REPORT (driver, ( KC_LSFT, KC_A));
64
+ EXPECT_REPORT (driver, ( KC_LSFT));
65
+ EXPECT_EMPTY_REPORT (driver);
66
66
idle_for (TAPPING_TERM - 3 );
67
67
testing::Mock::VerifyAndClearExpectations (&driver);
68
68
}
@@ -94,15 +94,15 @@ TEST_F(TappingForceHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
94
94
testing::Mock::VerifyAndClearExpectations (&driver);
95
95
96
96
/* Release first mod-tap-hold key */
97
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_LSFT) ));
97
+ EXPECT_REPORT (driver, ( KC_LSFT));
98
98
first_mod_tap_hold_key.release ();
99
99
run_one_scan_loop ();
100
100
testing::Mock::VerifyAndClearExpectations (&driver);
101
101
102
102
/* Idle for tapping term of first mod tap hold key. */
103
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_LSFT, KC_A) ));
104
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_LSFT) ));
105
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ()) );
103
+ EXPECT_REPORT (driver, ( KC_LSFT, KC_A));
104
+ EXPECT_REPORT (driver, ( KC_LSFT));
105
+ EXPECT_EMPTY_REPORT (driver);
106
106
idle_for (TAPPING_TERM - 3 );
107
107
testing::Mock::VerifyAndClearExpectations (&driver);
108
108
}
@@ -135,10 +135,10 @@ TEST_F(TappingForceHold, tap_regular_key_while_layer_tap_key_is_held) {
135
135
testing::Mock::VerifyAndClearExpectations (&driver);
136
136
137
137
/* Release layer-tap-hold key */
138
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_P) ));
139
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_A, KC_P) ));
140
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_P) ));
141
- EXPECT_CALL (driver, send_keyboard_mock (_) );
138
+ EXPECT_REPORT (driver, ( KC_P));
139
+ EXPECT_REPORT (driver, ( KC_A, KC_P));
140
+ EXPECT_REPORT (driver, ( KC_P));
141
+ EXPECT_EMPTY_REPORT (driver);
142
142
layer_tap_hold_key.release ();
143
143
run_one_scan_loop ();
144
144
testing::Mock::VerifyAndClearExpectations (&driver);
@@ -158,8 +158,8 @@ TEST_F(TappingForceHold, tap_mod_tap_hold_key_two_times) {
158
158
testing::Mock::VerifyAndClearExpectations (&driver);
159
159
160
160
/* Release mod-tap-hold key. */
161
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_P) ));
162
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ()) );
161
+ EXPECT_REPORT (driver, ( KC_P));
162
+ EXPECT_EMPTY_REPORT (driver);
163
163
mod_tap_hold_key.release ();
164
164
run_one_scan_loop ();
165
165
testing::Mock::VerifyAndClearExpectations (&driver);
@@ -171,8 +171,8 @@ TEST_F(TappingForceHold, tap_mod_tap_hold_key_two_times) {
171
171
testing::Mock::VerifyAndClearExpectations (&driver);
172
172
173
173
/* Release mod-tap-hold key. */
174
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_P) ));
175
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ()) );
174
+ EXPECT_REPORT (driver, ( KC_P));
175
+ EXPECT_EMPTY_REPORT (driver);
176
176
mod_tap_hold_key.release ();
177
177
run_one_scan_loop ();
178
178
testing::Mock::VerifyAndClearExpectations (&driver);
@@ -192,8 +192,8 @@ TEST_F(TappingForceHold, tap_mod_tap_hold_key_twice_and_hold_on_second_time) {
192
192
testing::Mock::VerifyAndClearExpectations (&driver);
193
193
194
194
/* Release mod-tap-hold key. */
195
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_P) ));
196
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ()) );
195
+ EXPECT_REPORT (driver, ( KC_P));
196
+ EXPECT_EMPTY_REPORT (driver);
197
197
mod_tap_hold_key.release ();
198
198
run_one_scan_loop ();
199
199
testing::Mock::VerifyAndClearExpectations (&driver);
@@ -205,8 +205,8 @@ TEST_F(TappingForceHold, tap_mod_tap_hold_key_twice_and_hold_on_second_time) {
205
205
testing::Mock::VerifyAndClearExpectations (&driver);
206
206
207
207
/* Release mod-tap-hold key. */
208
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ( KC_LSHIFT) ));
209
- EXPECT_CALL (driver, send_keyboard_mock ( KeyboardReport ()) );
208
+ EXPECT_REPORT (driver, ( KC_LSHIFT));
209
+ EXPECT_EMPTY_REPORT (driver);
210
210
mod_tap_hold_key.release ();
211
211
run_one_scan_loop ();
212
212
testing::Mock::VerifyAndClearExpectations (&driver);
0 commit comments