1 files changed, 36 insertions, 36 deletions
diff --git a/tests/basic/test_keypress.cpp b/tests/basic/test_keypress.cpp
index ecd6e98e4..cf839f8c1 100644
--- a/tests/basic/test_keypress.cpp
+++ b/tests/basic/test_keypress.cpp
@@ -73,10 +73,10 @@ TEST_F(KeyPress, LeftShiftIsReportedCorrectly) {
    // See issue #1476 for more information
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
    keyboard_task();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A, KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A, KC_LEFT_SHIFT)));
    keyboard_task();
    release_key(0, 0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
    keyboard_task();
    release_key(3, 0);
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
@@ -89,9 +89,9 @@ TEST_F(KeyPress, PressLeftShiftAndControl) {
    press_key(5, 0);
    // Unfortunately modifiers are also processed in the wrong order
    // See issue #1476 for more information
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
    keyboard_task();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_LCTRL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_LEFT_CTRL)));
    keyboard_task();
 }
@@ -101,9 +101,9 @@ TEST_F(KeyPress, LeftAndRightShiftCanBePressedAtTheSameTime) {
    press_key(4, 0);
    // Unfortunately modifiers are also processed in the wrong order
    // See issue #1476 for more information
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
    keyboard_task();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_RSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_RIGHT_SHIFT)));
    keyboard_task();
 }
@@ -115,11 +115,11 @@ TEST_F(KeyPress, RightShiftLeftControlAndCharWithTheSameKey) {
    // See issue #524 for more information
    // The underlying cause is that we use only one bit to represent the right hand
    // modifiers.
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RIGHT_SHIFT, KC_RIGHT_CTRL)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL, KC_O)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RIGHT_SHIFT, KC_RIGHT_CTRL, KC_O)));
    keyboard_task();
    release_key(6, 0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RIGHT_SHIFT, KC_RIGHT_CTRL)));
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
    keyboard_task();
 }
@@ -129,23 +129,23 @@ TEST_F(KeyPress, PressPlusEqualReleaseBeforePress) {
    InSequence s;
    press_key(1, 1);  // KC_PLUS
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
    release_key(1, 1);  // KC_PLUS
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
-    press_key(0, 1);  // KC_EQL
+    press_key(0, 1);  // KC_EQUAL
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
-    release_key(0, 1);  // KC_EQL
+    release_key(0, 1);  // KC_EQUAL
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
@@ -156,25 +156,25 @@ TEST_F(KeyPress, PressPlusEqualDontReleaseBeforePress) {
    InSequence s;
    press_key(1, 1);  // KC_PLUS
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
-    press_key(0, 1);  // KC_EQL
+    press_key(0, 1);  // KC_EQUAL
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
-    release_key(1, 1);  // KC_PLS
+    release_key(1, 1);  // KC_PLUS
-    // BUG: Should really still return KC_EQL, but this is fine too
+    // BUG: Should really still return KC_EQUAL, but this is fine too
    // It's also called twice for some reason
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(2);
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
-    release_key(0, 1);  // KC_EQL
+    release_key(0, 1);  // KC_EQUAL
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
@@ -184,24 +184,24 @@ TEST_F(KeyPress, PressEqualPlusReleaseBeforePress) {
    TestDriver driver;
    InSequence s;
-    press_key(0, 1);  // KC_EQL
+    press_key(0, 1);  // KC_EQUAL
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
-    release_key(0, 1);  // KQ_EQL
+    release_key(0, 1);  // KC_EQUAL
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
    press_key(1, 1);  // KC_PLUS
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
    release_key(1, 1);  // KC_PLUS
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
@@ -211,29 +211,29 @@ TEST_F(KeyPress, PressEqualPlusDontReleaseBeforePress) {
    TestDriver driver;
    InSequence s;
-    press_key(0, 1);  // KC_EQL
+    press_key(0, 1);  // KC_EQUAL
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
    press_key(1, 1);  // KC_PLUS
    // BUG: The sequence is a bit strange, but it works, the end result is that
    // KC_PLUS is sent
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
-    release_key(0, 1);  // KC_EQL
+    release_key(0, 1);  // KC_EQUAL
    // I guess it's fine to still report shift here
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);
    release_key(1, 1);  // KC_PLUS
    // This report is not needed
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
    run_one_scan_loop();
    testing::Mock::VerifyAndClearExpectations(&driver);

diff --git a/tests/basic/test_keypress.cpp b/tests/basic/test_keypress.cpp index ecd6e98e4..cf839f8c1 100644 --- a/tests/basic/test_keypress.cpp +++ b/tests/basic/test_keypress.cpp
@@ -73,10 +73,10 @@ TEST_F(KeyPress, LeftShiftIsReportedCorrectly) {
73	// See issue #1476 for more information	73	// See issue #1476 for more information
74	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));	74	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
75	keyboard_task();	75	keyboard_task();
76	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A, KC_LSFT)));	76	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A, KC_LEFT_SHIFT)));
77	keyboard_task();	77	keyboard_task();
78	release_key(0, 0);	78	release_key(0, 0);
79	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	79	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
80	keyboard_task();	80	keyboard_task();
81	release_key(3, 0);	81	release_key(3, 0);
82	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));	82	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
@@ -89,9 +89,9 @@ TEST_F(KeyPress, PressLeftShiftAndControl) {
89	press_key(5, 0);	89	press_key(5, 0);
90	// Unfortunately modifiers are also processed in the wrong order	90	// Unfortunately modifiers are also processed in the wrong order
91	// See issue #1476 for more information	91	// See issue #1476 for more information
92	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	92	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
93	keyboard_task();	93	keyboard_task();
94	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_LCTRL)));	94	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_LEFT_CTRL)));
95	keyboard_task();	95	keyboard_task();
96	}	96	}
97		97
@@ -101,9 +101,9 @@ TEST_F(KeyPress, LeftAndRightShiftCanBePressedAtTheSameTime) {
101	press_key(4, 0);	101	press_key(4, 0);
102	// Unfortunately modifiers are also processed in the wrong order	102	// Unfortunately modifiers are also processed in the wrong order
103	// See issue #1476 for more information	103	// See issue #1476 for more information
104	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	104	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
105	keyboard_task();	105	keyboard_task();
106	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_RSFT)));	106	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_RIGHT_SHIFT)));
107	keyboard_task();	107	keyboard_task();
108	}	108	}
109		109
@@ -115,11 +115,11 @@ TEST_F(KeyPress, RightShiftLeftControlAndCharWithTheSameKey) {
115	// See issue #524 for more information	115	// See issue #524 for more information
116	// The underlying cause is that we use only one bit to represent the right hand	116	// The underlying cause is that we use only one bit to represent the right hand
117	// modifiers.	117	// modifiers.
118	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));	118	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RIGHT_SHIFT, KC_RIGHT_CTRL)));
119	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL, KC_O)));	119	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RIGHT_SHIFT, KC_RIGHT_CTRL, KC_O)));
120	keyboard_task();	120	keyboard_task();
121	release_key(6, 0);	121	release_key(6, 0);
122	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));	122	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RIGHT_SHIFT, KC_RIGHT_CTRL)));
123	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));	123	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
124	keyboard_task();	124	keyboard_task();
125	}	125	}
@@ -129,23 +129,23 @@ TEST_F(KeyPress, PressPlusEqualReleaseBeforePress) {
129	InSequence s;	129	InSequence s;
130		130
131	press_key(1, 1); // KC_PLUS	131	press_key(1, 1); // KC_PLUS
132	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	132	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
133	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));	133	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
134	run_one_scan_loop();	134	run_one_scan_loop();
135	testing::Mock::VerifyAndClearExpectations(&driver);	135	testing::Mock::VerifyAndClearExpectations(&driver);
136		136
137	release_key(1, 1); // KC_PLUS	137	release_key(1, 1); // KC_PLUS
138	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	138	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
139	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));	139	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
140	run_one_scan_loop();	140	run_one_scan_loop();
141	testing::Mock::VerifyAndClearExpectations(&driver);	141	testing::Mock::VerifyAndClearExpectations(&driver);
142		142
143	press_key(0, 1); // KC_EQL	143	press_key(0, 1); // KC_EQUAL
144	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));	144	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
145	run_one_scan_loop();	145	run_one_scan_loop();
146	testing::Mock::VerifyAndClearExpectations(&driver);	146	testing::Mock::VerifyAndClearExpectations(&driver);
147		147
148	release_key(0, 1); // KC_EQL	148	release_key(0, 1); // KC_EQUAL
149	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));	149	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
150	run_one_scan_loop();	150	run_one_scan_loop();
151	testing::Mock::VerifyAndClearExpectations(&driver);	151	testing::Mock::VerifyAndClearExpectations(&driver);
@@ -156,25 +156,25 @@ TEST_F(KeyPress, PressPlusEqualDontReleaseBeforePress) {
156	InSequence s;	156	InSequence s;
157		157
158	press_key(1, 1); // KC_PLUS	158	press_key(1, 1); // KC_PLUS
159	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	159	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
160	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));	160	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
161	run_one_scan_loop();	161	run_one_scan_loop();
162	testing::Mock::VerifyAndClearExpectations(&driver);	162	testing::Mock::VerifyAndClearExpectations(&driver);
163		163
164	press_key(0, 1); // KC_EQL	164	press_key(0, 1); // KC_EQUAL
165	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));	165	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
166	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));	166	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
167	run_one_scan_loop();	167	run_one_scan_loop();
168	testing::Mock::VerifyAndClearExpectations(&driver);	168	testing::Mock::VerifyAndClearExpectations(&driver);
169		169
170	release_key(1, 1); // KC_PLS	170	release_key(1, 1); // KC_PLUS
171	// BUG: Should really still return KC_EQL, but this is fine too	171	// BUG: Should really still return KC_EQUAL, but this is fine too
172	// It's also called twice for some reason	172	// It's also called twice for some reason
173	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(2);	173	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(2);
174	run_one_scan_loop();	174	run_one_scan_loop();
175	testing::Mock::VerifyAndClearExpectations(&driver);	175	testing::Mock::VerifyAndClearExpectations(&driver);
176		176
177	release_key(0, 1); // KC_EQL	177	release_key(0, 1); // KC_EQUAL
178	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));	178	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
179	run_one_scan_loop();	179	run_one_scan_loop();
180	testing::Mock::VerifyAndClearExpectations(&driver);	180	testing::Mock::VerifyAndClearExpectations(&driver);
@@ -184,24 +184,24 @@ TEST_F(KeyPress, PressEqualPlusReleaseBeforePress) {
184	TestDriver driver;	184	TestDriver driver;
185	InSequence s;	185	InSequence s;
186		186
187	press_key(0, 1); // KC_EQL	187	press_key(0, 1); // KC_EQUAL
188	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));	188	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
189	run_one_scan_loop();	189	run_one_scan_loop();
190	testing::Mock::VerifyAndClearExpectations(&driver);	190	testing::Mock::VerifyAndClearExpectations(&driver);
191		191
192	release_key(0, 1); // KQ_EQL	192	release_key(0, 1); // KC_EQUAL
193	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));	193	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
194	run_one_scan_loop();	194	run_one_scan_loop();
195	testing::Mock::VerifyAndClearExpectations(&driver);	195	testing::Mock::VerifyAndClearExpectations(&driver);
196		196
197	press_key(1, 1); // KC_PLUS	197	press_key(1, 1); // KC_PLUS
198	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	198	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
199	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));	199	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
200	run_one_scan_loop();	200	run_one_scan_loop();
201	testing::Mock::VerifyAndClearExpectations(&driver);	201	testing::Mock::VerifyAndClearExpectations(&driver);
202		202
203	release_key(1, 1); // KC_PLUS	203	release_key(1, 1); // KC_PLUS
204	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	204	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
205	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));	205	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
206	run_one_scan_loop();	206	run_one_scan_loop();
207	testing::Mock::VerifyAndClearExpectations(&driver);	207	testing::Mock::VerifyAndClearExpectations(&driver);
@@ -211,29 +211,29 @@ TEST_F(KeyPress, PressEqualPlusDontReleaseBeforePress) {
211	TestDriver driver;	211	TestDriver driver;
212	InSequence s;	212	InSequence s;
213		213
214	press_key(0, 1); // KC_EQL	214	press_key(0, 1); // KC_EQUAL
215	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));	215	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
216	run_one_scan_loop();	216	run_one_scan_loop();
217	testing::Mock::VerifyAndClearExpectations(&driver);	217	testing::Mock::VerifyAndClearExpectations(&driver);
218		218
219	press_key(1, 1); // KC_PLUS	219	press_key(1, 1); // KC_PLUS
220	// BUG: The sequence is a bit strange, but it works, the end result is that	220	// BUG: The sequence is a bit strange, but it works, the end result is that
221	// KC_PLUS is sent	221	// KC_PLUS is sent
222	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));	222	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
223	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	223	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
224	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));	224	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
225	run_one_scan_loop();	225	run_one_scan_loop();
226	testing::Mock::VerifyAndClearExpectations(&driver);	226	testing::Mock::VerifyAndClearExpectations(&driver);
227		227
228	release_key(0, 1); // KC_EQL	228	release_key(0, 1); // KC_EQUAL
229	// I guess it's fine to still report shift here	229	// I guess it's fine to still report shift here
230	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	230	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
231	run_one_scan_loop();	231	run_one_scan_loop();
232	testing::Mock::VerifyAndClearExpectations(&driver);	232	testing::Mock::VerifyAndClearExpectations(&driver);
233		233
234	release_key(1, 1); // KC_PLUS	234	release_key(1, 1); // KC_PLUS
235	// This report is not needed	235	// This report is not needed
236	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));	236	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
237	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));	237	EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
238	run_one_scan_loop();	238	run_one_scan_loop();
239	testing::Mock::VerifyAndClearExpectations(&driver);	239	testing::Mock::VerifyAndClearExpectations(&driver);