aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/basic/test_one_shot_keys.cpp50
-rw-r--r--tests/test_common/keycode_table.cpp9
2 files changed, 19 insertions, 40 deletions
diff --git a/tests/basic/test_one_shot_keys.cpp b/tests/basic/test_one_shot_keys.cpp
index 9748dad7da..64a8673a5c 100644
--- a/tests/basic/test_one_shot_keys.cpp
+++ b/tests/basic/test_one_shot_keys.cpp
@@ -32,10 +32,7 @@ TEST_F(OneShot, OSMWithoutAdditionalKeypressDoesNothing) {
/* Press and release OSM key*/
EXPECT_NO_REPORT(driver);
- osm_key.press();
- run_one_scan_loop();
- osm_key.release();
- run_one_scan_loop();
+ tap_key(osm_key);
VERIFY_AND_CLEAR(driver);
/* OSM are added when an actual report is send */
@@ -88,10 +85,7 @@ TEST_P(OneShotParametrizedTestFixture, OSMWithAdditionalKeypress) {
/* Press and release OSM */
EXPECT_NO_REPORT(driver);
- osm_key.press();
- run_one_scan_loop();
- osm_key.release();
- run_one_scan_loop();
+ tap_key(osm_key);
VERIFY_AND_CLEAR(driver);
/* Press regular key */
@@ -171,18 +165,12 @@ TEST_F(OneShot, OSMChainingTwoOSMs) {
/* Press and release OSM1 */
EXPECT_NO_REPORT(driver);
- osm_key1.press();
- run_one_scan_loop();
- osm_key1.release();
- run_one_scan_loop();
+ tap_key(osm_key1);
VERIFY_AND_CLEAR(driver);
/* Press and relesea OSM2 */
EXPECT_NO_REPORT(driver);
- osm_key2.press();
- run_one_scan_loop();
- osm_key2.release();
- run_one_scan_loop();
+ tap_key(osm_key2);
VERIFY_AND_CLEAR(driver);
/* Press regular key */
@@ -209,22 +197,13 @@ TEST_F(OneShot, OSMDoubleTapNotLockingOSMs) {
/* Press and release OSM1 */
EXPECT_NO_REPORT(driver);
- osm_key1.press();
- run_one_scan_loop();
- osm_key1.release();
- run_one_scan_loop();
+ tap_key(osm_key1);
VERIFY_AND_CLEAR(driver);
/* Press and release OSM2 twice */
EXPECT_NO_REPORT(driver);
- osm_key2.press();
- run_one_scan_loop();
- osm_key2.release();
- run_one_scan_loop();
- osm_key2.press();
- run_one_scan_loop();
- osm_key2.release();
- run_one_scan_loop();
+ tap_key(osm_key2);
+ tap_key(osm_key2);
VERIFY_AND_CLEAR(driver);
/* Press regular key */
@@ -263,10 +242,7 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) {
/* Press and release OSM1 */
EXPECT_NO_REPORT(driver);
- osm_key1.press();
- run_one_scan_loop();
- osm_key1.release();
- run_one_scan_loop();
+ tap_key(osm_key1);
VERIFY_AND_CLEAR(driver);
/* Press and hold OSM2 */
@@ -279,10 +255,7 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) {
/* Press and release regular key */
EXPECT_REPORT(driver, (osm_key1.report_code, osm_key2.report_code, regular_key.report_code)).Times(1);
EXPECT_REPORT(driver, (osm_key2.report_code)).Times(1);
- regular_key.press();
- run_one_scan_loop();
- regular_key.release();
- run_one_scan_loop();
+ tap_key(regular_key);
VERIFY_AND_CLEAR(driver);
/* Release OSM2 */
@@ -362,10 +335,7 @@ TEST_F(OneShot, OSLWithOsmAndAdditionalKeypress) {
/* Press and release OSM */
EXPECT_NO_REPORT(driver);
- osm_key.press();
- run_one_scan_loop();
- osm_key.release();
- run_one_scan_loop();
+ tap_key(osm_key);
EXPECT_TRUE(layer_state_is(1));
VERIFY_AND_CLEAR(driver);
diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp
index 29f7c710a0..06064e77f9 100644
--- a/tests/test_common/keycode_table.cpp
+++ b/tests/test_common/keycode_table.cpp
@@ -569,6 +569,15 @@ std::map<uint16_t, std::string> KEYCODE_ID_TABLE = {
{QK_BACKLIGHT_UP, "QK_BACKLIGHT_UP"},
{QK_BACKLIGHT_STEP, "QK_BACKLIGHT_STEP"},
{QK_BACKLIGHT_TOGGLE_BREATHING, "QK_BACKLIGHT_TOGGLE_BREATHING"},
+ {QK_LED_MATRIX_ON, "QK_LED_MATRIX_ON"},
+ {QK_LED_MATRIX_OFF, "QK_LED_MATRIX_OFF"},
+ {QK_LED_MATRIX_TOGGLE, "QK_LED_MATRIX_TOGGLE"},
+ {QK_LED_MATRIX_MODE_NEXT, "QK_LED_MATRIX_MODE_NEXT"},
+ {QK_LED_MATRIX_MODE_PREVIOUS, "QK_LED_MATRIX_MODE_PREVIOUS"},
+ {QK_LED_MATRIX_BRIGHTNESS_UP, "QK_LED_MATRIX_BRIGHTNESS_UP"},
+ {QK_LED_MATRIX_BRIGHTNESS_DOWN, "QK_LED_MATRIX_BRIGHTNESS_DOWN"},
+ {QK_LED_MATRIX_SPEED_UP, "QK_LED_MATRIX_SPEED_UP"},
+ {QK_LED_MATRIX_SPEED_DOWN, "QK_LED_MATRIX_SPEED_DOWN"},
{RGB_TOG, "RGB_TOG"},
{RGB_MODE_FORWARD, "RGB_MODE_FORWARD"},
{RGB_MODE_REVERSE, "RGB_MODE_REVERSE"},