summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto_shift/test_auto_shift.cpp8
-rw-r--r--tests/autocorrect/test_autocorrect.cpp12
-rw-r--r--tests/basic/test_action_layer.cpp66
-rw-r--r--tests/basic/test_keycode_util.cpp52
-rw-r--r--tests/basic/test_keypress.cpp32
-rw-r--r--tests/basic/test_one_shot_keys.cpp32
-rw-r--r--tests/basic/test_tapping.cpp69
-rw-r--r--tests/caps_word/caps_word_autoshift/test_caps_word_autoshift.cpp6
-rw-r--r--tests/caps_word/caps_word_combo/test_caps_word_combo.cpp8
-rw-r--r--tests/caps_word/caps_word_unicodemap/test_caps_word_unicodemap.cpp4
-rw-r--r--tests/caps_word/test_caps_word.cpp90
-rw-r--r--tests/secure/test_secure.cpp20
-rw-r--r--tests/tap_dance/examples.c22
-rw-r--r--tests/tap_dance/tap_dance_layers/tap_dance_defs.c8
-rw-r--r--tests/tap_hold_configurations/default_mod_tap/config.h2
-rw-r--r--tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp48
-rw-r--r--tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp94
-rw-r--r--tests/tap_hold_configurations/ignore_mod_tap_interrupt/config.h21
-rw-r--r--tests/tap_hold_configurations/ignore_mod_tap_interrupt/test_tap_hold.cpp136
-rw-r--r--tests/tap_hold_configurations/permissive_hold/test_one_shot_keys.cpp8
-rw-r--r--tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp26
-rw-r--r--tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/config.h22
-rw-r--r--tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test.mk18
-rw-r--r--tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp133
-rw-r--r--tests/tap_hold_configurations/quick_tap/config.h (renamed from tests/tap_hold_configurations/tapping_force_hold/config.h)2
-rw-r--r--tests/tap_hold_configurations/quick_tap/test.mk (renamed from tests/tap_hold_configurations/ignore_mod_tap_interrupt/test.mk)0
-rw-r--r--tests/tap_hold_configurations/quick_tap/test_action_layer.cpp (renamed from tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp)8
-rw-r--r--tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp290
-rw-r--r--tests/tap_hold_configurations/retro_tapping/test_tap_hold.cpp4
-rw-r--r--tests/tap_hold_configurations/retro_tapping/test_tapping.cpp22
-rw-r--r--tests/tap_hold_configurations/tapping_force_hold/test.mk18
-rw-r--r--tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp213
-rw-r--r--tests/test_common/keyboard_report_util.cpp45
-rw-r--r--tests/test_common/keycode_table.cpp663
-rw-r--r--tests/test_common/keycode_util.cpp128
-rw-r--r--tests/test_common/keycode_util.hpp5
-rw-r--r--tests/test_common/matrix.c8
-rw-r--r--tests/test_common/test_common.hpp1
-rw-r--r--tests/test_common/test_driver.hpp6
-rw-r--r--tests/test_common/test_fixture.cpp33
-rw-r--r--tests/test_common/test_keymap_key.cpp16
-rw-r--r--tests/test_common/test_keymap_key.hpp16
-rw-r--r--tests/test_common/test_logger.cpp16
-rw-r--r--tests/test_common/test_logger.hpp8
44 files changed, 1612 insertions, 827 deletions
diff --git a/tests/auto_shift/test_auto_shift.cpp b/tests/auto_shift/test_auto_shift.cpp
index a83f436c33..1d80634b2f 100644
--- a/tests/auto_shift/test_auto_shift.cpp
+++ b/tests/auto_shift/test_auto_shift.cpp
@@ -37,14 +37,14 @@ TEST_F(AutoShift, key_release_before_timeout) {
EXPECT_NO_REPORT(driver);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_REPORT(driver, (KC_A));
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(AutoShift, key_release_after_timeout) {
@@ -58,7 +58,7 @@ TEST_F(AutoShift, key_release_after_timeout) {
EXPECT_NO_REPORT(driver);
regular_key.press();
idle_for(AUTO_SHIFT_TIMEOUT);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_REPORT(driver, (KC_LSFT, KC_A));
@@ -66,5 +66,5 @@ TEST_F(AutoShift, key_release_after_timeout) {
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/autocorrect/test_autocorrect.cpp b/tests/autocorrect/test_autocorrect.cpp
index 509c1c9ea4..9b8db3d68d 100644
--- a/tests/autocorrect/test_autocorrect.cpp
+++ b/tests/autocorrect/test_autocorrect.cpp
@@ -51,7 +51,7 @@ TEST_F(AutoCorrect, OnOffToggle) {
autocorrect_toggle();
EXPECT_EQ(autocorrect_is_enabled(), true);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Test that typing "fales" autocorrects to "false"
@@ -80,7 +80,7 @@ TEST_F(AutoCorrect, fales_to_false_autocorrection) {
TapKeys(key_f, key_a, key_l, key_e, key_s);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Test that typing "fales" doesn't autocorrect if disabled
@@ -109,7 +109,7 @@ TEST_F(AutoCorrect, fales_disabled_autocorrect) {
TapKeys(key_f, key_a, key_l, key_e, key_s);
autocorrect_enable();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Test that typing "falsify" doesn't autocorrect if disabled
@@ -139,7 +139,7 @@ TEST_F(AutoCorrect, falsify_should_not_autocorrect) {
TapKeys(key_f, key_a, key_l, key_s, key_i, key_f, key_y);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Test that typing "ture" autocorrect to "true"
@@ -169,7 +169,7 @@ TEST_F(AutoCorrect, ture_to_true_autocorrect) {
TapKeys(key_space, key_t_code, key_u, key_r, key_e);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Test that typing "overture" does not autocorrect
@@ -200,5 +200,5 @@ TEST_F(AutoCorrect, overture_should_not_autocorrect) {
TapKeys(key_o, key_v, key_e, key_r, key_t_code, key_u, key_r, key_e);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/basic/test_action_layer.cpp b/tests/basic/test_action_layer.cpp
index d0a28d42c0..883d99b404 100644
--- a/tests/basic/test_action_layer.cpp
+++ b/tests/basic/test_action_layer.cpp
@@ -28,7 +28,7 @@ TEST_F(ActionLayer, LayerStateDBG) {
layer_state_set(0);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerStateSet) {
@@ -39,7 +39,7 @@ TEST_F(ActionLayer, LayerStateSet) {
layer_state_set(0b001100);
EXPECT_EQ(layer_state, 0b001100);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerStateIs) {
@@ -56,7 +56,7 @@ TEST_F(ActionLayer, LayerStateIs) {
EXPECT_EQ(layer_state_is(1), true);
EXPECT_EQ(layer_state_is(2), false);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerStateCmp) {
@@ -76,7 +76,7 @@ TEST_F(ActionLayer, LayerStateCmp) {
EXPECT_EQ(layer_state_cmp(prev_layer, 1), true);
EXPECT_EQ(layer_state_cmp(prev_layer, 2), false);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerClear) {
@@ -85,7 +85,7 @@ TEST_F(ActionLayer, LayerClear) {
layer_clear();
EXPECT_EQ(layer_state, 0);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerMove) {
@@ -96,7 +96,7 @@ TEST_F(ActionLayer, LayerMove) {
layer_move(3);
EXPECT_EQ(layer_state, 0b1000);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerOn) {
@@ -108,7 +108,7 @@ TEST_F(ActionLayer, LayerOn) {
layer_on(3);
EXPECT_EQ(layer_state, 0b1010);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerOff) {
@@ -121,7 +121,7 @@ TEST_F(ActionLayer, LayerOff) {
layer_off(2);
EXPECT_EQ(layer_state, 0b0010);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, MomentaryLayerDoesNothing) {
@@ -134,12 +134,12 @@ TEST_F(ActionLayer, MomentaryLayerDoesNothing) {
EXPECT_NO_REPORT(driver);
layer_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_NO_REPORT(driver);
layer_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, MomentaryLayerWithKeypress) {
@@ -155,28 +155,28 @@ TEST_F(ActionLayer, MomentaryLayerWithKeypress) {
layer_key.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press key on layer 1 */
EXPECT_REPORT(driver, (KC_B)).Times(1);
regular_key.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release key on layer 1 */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release MO */
EXPECT_NO_REPORT(driver);
layer_key.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(0));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, ToggleLayerDoesNothing) {
@@ -192,14 +192,14 @@ TEST_F(ActionLayer, ToggleLayerDoesNothing) {
layer_key.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release TG. */
EXPECT_NO_REPORT(driver);
layer_key.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, ToggleLayerUpAndDown) {
@@ -216,26 +216,26 @@ TEST_F(ActionLayer, ToggleLayerUpAndDown) {
toggle_layer_1_on_layer_0.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_NO_REPORT(driver);
toggle_layer_1_on_layer_0.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Toggle Layer 0. */
EXPECT_NO_REPORT(driver);
toggle_layer_0_on_layer_1.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(0));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_NO_REPORT(driver);
toggle_layer_0_on_layer_1.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(0));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerTapToggleDoesNothing) {
@@ -251,13 +251,13 @@ TEST_F(ActionLayer, LayerTapToggleDoesNothing) {
layer_key.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_NO_REPORT(driver);
layer_key.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(0));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerTapToggleWithKeypress) {
@@ -275,25 +275,25 @@ TEST_F(ActionLayer, LayerTapToggleWithKeypress) {
layer_key.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_REPORT(driver, (KC_B)).Times(1);
regular_key.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_NO_REPORT(driver);
layer_key.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(0));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) {
@@ -344,19 +344,19 @@ TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) {
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_REPORT(driver, (KC_B)).Times(1);
regular_key.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) {
@@ -373,7 +373,7 @@ TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) {
layer_0_key_0.press();
idle_for(TAPPING_TERM);
EXPECT_TRUE(layer_state_is(0));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press key with layer 1 mapping, result basically expected
* altough more reports are send then necessary. */
@@ -382,14 +382,14 @@ TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) {
layer_1_key_1.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release layer tap key, no report is send because key is still held. */
EXPECT_NO_REPORT(driver);
layer_0_key_0.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(0));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Unregister keycode and modifier. */
EXPECT_REPORT(driver, (KC_RALT)).Times(1);
@@ -397,5 +397,5 @@ TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) {
layer_1_key_1.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(0));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/basic/test_keycode_util.cpp b/tests/basic/test_keycode_util.cpp
new file mode 100644
index 0000000000..693334676e
--- /dev/null
+++ b/tests/basic/test_keycode_util.cpp
@@ -0,0 +1,52 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "test_common.hpp"
+
+class KeycodeToIdentifierSuite : public ::testing::TestWithParam<std::pair<std::uint16_t, std::string>> {};
+
+TEST_P(KeycodeToIdentifierSuite, ConversionTests) {
+ ASSERT_EQ(get_keycode_identifier_or_default(GetParam().first), GetParam().second);
+}
+
+INSTANTIATE_TEST_CASE_P(ConversionTestsP, KeycodeToIdentifierSuite,
+ // clang-format off
+::testing::Values(
+ // Goto layer
+ std::make_pair(TO(0), "TO(0)"),
+ std::make_pair(TO(0x1F), "TO(31)"),
+ // Momentary switch layer
+ std::make_pair(MO(0), "MO(0)"),
+ std::make_pair(MO(0x1F), "MO(31)"),
+ // Set default layer
+ std::make_pair(DF(0), "DF(0)"),
+ std::make_pair(DF(0x1F), "DF(31)"),
+ // Toggle layer
+ std::make_pair(TG(0), "TG(0)"),
+ std::make_pair(TG(0x1F), "TG(31)"),
+ // One-shot layer
+ std::make_pair(OSL(0), "OSL(0)"),
+ std::make_pair(OSL(0x1F), "OSL(31)"),
+ // One-shot mod
+ std::make_pair(OSM(MOD_LSFT), "OSM(MOD_LSFT)"),
+ std::make_pair(OSM(MOD_LSFT | MOD_LCTL), "OSM(MOD_LCTL | MOD_LSFT)"),
+ // Layer Mod
+ std::make_pair(LM(0, MOD_LSFT), "LM(0, MOD_LSFT)"),
+ std::make_pair(LM(0xF, MOD_LSFT), "LM(15, MOD_LSFT)"),
+ std::make_pair(LM(0xF, MOD_LSFT | MOD_LCTL), "LM(15, MOD_LCTL | MOD_LSFT)"),
+ // Layer tap toggle
+ std::make_pair(TT(0), "TT(0)"),
+ std::make_pair(TT(0x1F), "TT(31)"),
+ // Layer tap
+ std::make_pair(LT(0, KC_A), "LT(0, KC_A)"),
+ std::make_pair(LT(0xF, KC_SPACE), "LT(15, KC_SPACE)"),
+ std::make_pair(LT(1, KC_SPC), "LT(1, KC_SPACE)"),
+ // Mod tap
+ std::make_pair(MT(MOD_LCTL, KC_A), "MT(MOD_LCTL, KC_A)"),
+ std::make_pair(MT(MOD_LCTL | MOD_LSFT, KC_A), "MT(MOD_LCTL | MOD_LSFT, KC_A)"),
+ std::make_pair(ALT_T(KC_TAB), "MT(MOD_LALT, KC_TAB)"),
+ // Mods
+ std::make_pair(LCTL(KC_A), "QK_MODS(KC_A, QK_LCTL)"),
+ std::make_pair(HYPR(KC_SPACE), "QK_MODS(KC_SPACE, QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI)")
+));
+// clang-format on
diff --git a/tests/basic/test_keypress.cpp b/tests/basic/test_keypress.cpp
index 6d5b502a00..34682654b0 100644
--- a/tests/basic/test_keypress.cpp
+++ b/tests/basic/test_keypress.cpp
@@ -175,23 +175,23 @@ TEST_F(KeyPress, PressPlusEqualReleaseBeforePress) {
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_EQUAL));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_plus.release();
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
EXPECT_EMPTY_REPORT(driver);
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_eql.press();
EXPECT_REPORT(driver, (key_eql.report_code));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_eql.release();
EXPECT_EMPTY_REPORT(driver);
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(KeyPress, PressPlusEqualDontReleaseBeforePress) {
@@ -206,24 +206,24 @@ TEST_F(KeyPress, PressPlusEqualDontReleaseBeforePress) {
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_EQUAL));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_eql.press();
EXPECT_EMPTY_REPORT(driver);
EXPECT_REPORT(driver, (KC_EQUAL));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_plus.release();
// BUG: Should really still return KC_EQUAL, but this is fine too
EXPECT_EMPTY_REPORT(driver);
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_eql.release();
EXPECT_NO_REPORT(driver);
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(KeyPress, PressEqualPlusReleaseBeforePress) {
@@ -237,24 +237,24 @@ TEST_F(KeyPress, PressEqualPlusReleaseBeforePress) {
key_eql.press();
EXPECT_REPORT(driver, (KC_EQUAL));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_eql.release();
EXPECT_EMPTY_REPORT(driver);
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_plus.press();
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_EQUAL));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_plus.release();
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
EXPECT_EMPTY_REPORT(driver);
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(KeyPress, PressEqualPlusDontReleaseBeforePress) {
@@ -268,7 +268,7 @@ TEST_F(KeyPress, PressEqualPlusDontReleaseBeforePress) {
key_eql.press();
EXPECT_REPORT(driver, (KC_EQUAL));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_plus.press();
// BUG: The sequence is a bit strange, but it works, the end result is that
@@ -277,16 +277,16 @@ TEST_F(KeyPress, PressEqualPlusDontReleaseBeforePress) {
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
EXPECT_REPORT(driver, (KC_LEFT_SHIFT, KC_EQUAL));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_eql.release();
// I guess it's fine to still report shift here
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
key_plus.release();
EXPECT_EMPTY_REPORT(driver);
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/basic/test_one_shot_keys.cpp b/tests/basic/test_one_shot_keys.cpp
index bb14221140..2401c2c837 100644
--- a/tests/basic/test_one_shot_keys.cpp
+++ b/tests/basic/test_one_shot_keys.cpp
@@ -36,12 +36,12 @@ TEST_F(OneShot, OSMWithoutAdditionalKeypressDoesNothing) {
run_one_scan_loop();
osm_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* OSM are added when an actual report is send */
EXPECT_REPORT(driver, (osm_key.report_code));
send_keyboard_report();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Make unit-test pass */
clear_oneshot_mods();
@@ -62,19 +62,19 @@ TEST_P(OneShotParametrizedTestFixture, OSMExpiredDoesNothing) {
run_one_scan_loop();
osm_key.release();
idle_for(ONESHOT_TIMEOUT);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_REPORT(driver, (regular_key.report_code)).Times(1);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
#endif
@@ -92,19 +92,19 @@ TEST_P(OneShotParametrizedTestFixture, OSMWithAdditionalKeypress) {
run_one_scan_loop();
osm_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_REPORT(driver, (osm_key.report_code, regular_key.report_code)).Times(1);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_P(OneShotParametrizedTestFixture, OSMAsRegularModifierWithAdditionalKeypress) {
@@ -120,26 +120,26 @@ TEST_P(OneShotParametrizedTestFixture, OSMAsRegularModifierWithAdditionalKeypres
EXPECT_NO_REPORT(driver);
osm_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_NO_REPORT(driver);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_NO_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release OSM */
EXPECT_REPORT(driver, (regular_key.report_code, osm_key.report_code)).Times(1);
EXPECT_EMPTY_REPORT(driver);
osm_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// clang-format off
@@ -172,24 +172,24 @@ TEST_F(OneShot, OSLWithAdditionalKeypress) {
EXPECT_NO_REPORT(driver);
osl_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release OSL key */
EXPECT_NO_REPORT(driver);
osl_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_REPORT(driver, (regular_key.report_code)).Times(1);
EXPECT_EMPTY_REPORT(driver);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_NO_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/basic/test_tapping.cpp b/tests/basic/test_tapping.cpp
index 6ff9cfe22b..3246f9cdfb 100644
--- a/tests/basic/test_tapping.cpp
+++ b/tests/basic/test_tapping.cpp
@@ -121,3 +121,72 @@ TEST_F(Tapping, ANewTapWithinTappingTermIsBuggy) {
key_shift_hold_p_tap.release();
run_one_scan_loop();
}
+
+TEST_F(Tapping, TapA_CTL_T_KeyWhileReleasingShift) {
+ TestDriver driver;
+ InSequence s;
+ auto shift_key = KeymapKey(0, 7, 0, KC_LSFT);
+ auto mod_tap_hold_key = KeymapKey(0, 8, 0, CTL_T(KC_P));
+
+ set_keymap({shift_key, mod_tap_hold_key});
+
+ shift_key.press();
+ // Shift is reported
+ EXPECT_REPORT(driver, (KC_LSFT));
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ mod_tap_hold_key.press();
+ // Tapping keys does nothing on press
+ EXPECT_NO_REPORT(driver);
+ run_one_scan_loop();
+
+ shift_key.release();
+ // Releasing shift is delayed while tapping is in progress
+ EXPECT_NO_REPORT(driver);
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ mod_tap_hold_key.release();
+ // Releasing mod-tap key reports the tap and releases shift
+ EXPECT_REPORT(driver, (KC_LSFT, KC_P));
+ EXPECT_REPORT(driver, (KC_P));
+ EXPECT_EMPTY_REPORT(driver);
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(Tapping, TapA_CTL_T_KeyWhileReleasingLayer) {
+ TestDriver driver;
+ InSequence s;
+ auto layer_key = KeymapKey(0, 7, 0, MO(1));
+ auto trans_key = KeymapKey(1, 7, 0, KC_TRNS);
+ auto mod_tap_hold_key0 = KeymapKey(0, 8, 0, CTL_T(KC_P));
+ auto mod_tap_hold_key1 = KeymapKey(1, 8, 0, CTL_T(KC_Q));
+
+ set_keymap({layer_key, trans_key, mod_tap_hold_key0, mod_tap_hold_key1});
+
+ layer_key.press();
+ // Pressing the layer key does nothing
+ EXPECT_NO_REPORT(driver);
+ run_one_scan_loop();
+
+ mod_tap_hold_key1.press();
+ // Tapping layer 1 mod-tap key does nothing on press
+ EXPECT_NO_REPORT(driver);
+ run_one_scan_loop();
+
+ layer_key.release();
+ // Releasing layer is delayed while tapping is in progress
+ EXPECT_NO_REPORT(driver);
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ mod_tap_hold_key1.release();
+ // Releasing mod-tap key reports the tap of the layer 1 key
+ // If delayed layer release is broken, this reports the layer 0 key
+ EXPECT_REPORT(driver, (KC_Q));
+ EXPECT_EMPTY_REPORT(driver);
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+}
diff --git a/tests/caps_word/caps_word_autoshift/test_caps_word_autoshift.cpp b/tests/caps_word/caps_word_autoshift/test_caps_word_autoshift.cpp
index ba21c527a6..01b1a78a5f 100644
--- a/tests/caps_word/caps_word_autoshift/test_caps_word_autoshift.cpp
+++ b/tests/caps_word/caps_word_autoshift/test_caps_word_autoshift.cpp
@@ -64,7 +64,7 @@ TEST_F(CapsWord, AutoShiftKeys) {
tap_key(key_spc);
tap_key(key_a);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Test Caps Word + Auto Shift where keys A and B are rolled.
@@ -104,7 +104,7 @@ TEST_F(CapsWord, AutoShiftRolledShiftedKeys) {
run_one_scan_loop();
caps_word_off();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Tests that with tap-hold keys with Retro Shift, letter keys are shifted by
@@ -133,5 +133,5 @@ TEST_F(CapsWord, RetroShiftKeys) {
tap_key(key_modtap_a); // Tap A quickly.
EXPECT_EQ(is_caps_word_on(), true);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp b/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp
index 3a0530b854..0876cc91a3 100644
--- a/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp
+++ b/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp
@@ -102,7 +102,7 @@ TEST_P(CapsWord, SingleCombo) {
EXPECT_TRUE(is_caps_word_on());
caps_word_off();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Test a longer 4-key combo.
@@ -123,7 +123,7 @@ TEST_P(CapsWord, LongerCombo) {
EXPECT_TRUE(is_caps_word_on());
caps_word_off();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Test with two overlapping combos on regular keys:
@@ -161,7 +161,7 @@ TEST_P(CapsWord, ComboRegularKeys) {
tap_key(key_a);
EXPECT_FALSE(is_caps_word_on());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Test where combo chords involve tap-hold keys:
@@ -194,7 +194,7 @@ TEST_P(CapsWord, ComboModTapKey) {
EXPECT_TRUE(is_caps_word_on());
caps_word_off();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// clang-format off
diff --git a/tests/caps_word/caps_word_unicodemap/test_caps_word_unicodemap.cpp b/tests/caps_word/caps_word_unicodemap/test_caps_word_unicodemap.cpp
index fb8f9333bb..01cdfd6408 100644
--- a/tests/caps_word/caps_word_unicodemap/test_caps_word_unicodemap.cpp
+++ b/tests/caps_word/caps_word_unicodemap/test_caps_word_unicodemap.cpp
@@ -93,7 +93,7 @@ TEST_F(CapsWord, ShiftedUnicodeMapKey) {
tap_keys(key_delta, key_spc, key_delta);
EXPECT_EQ(is_caps_word_on(), false);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Tests typing U_ENDASH while Caps Word is on.
@@ -117,5 +117,5 @@ TEST_F(CapsWord, UnshiftedUnicodeMapKey) {
tap_key(key_dash);
EXPECT_EQ(is_caps_word_on(), true);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/caps_word/test_caps_word.cpp b/tests/caps_word/test_caps_word.cpp
index 3d0735d8c2..6d38b383f3 100644
--- a/tests/caps_word/test_caps_word.cpp
+++ b/tests/caps_word/test_caps_word.cpp
@@ -90,7 +90,7 @@ TEST_F(CapsWord, OnOffToggleFuns) {
caps_word_toggle();
EXPECT_EQ(is_caps_word_on(), false);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Tests the default `caps_word_press_user()` function.
@@ -133,7 +133,7 @@ TEST_F(CapsWord, CapswrdKey) {
tap_key(key_capswrd); // Tap the QK_CAPS_WORD_TOGGLE key again.
EXPECT_EQ(is_caps_word_on(), false);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Tests that being idle for CAPS_WORD_IDLE_TIMEOUT turns off Caps Word.
@@ -157,7 +157,7 @@ TEST_F(CapsWord, IdleTimeout) {
caps_word_on();
tap_key(key_a);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
idle_for(CAPS_WORD_IDLE_TIMEOUT);
run_one_scan_loop();
@@ -171,7 +171,7 @@ TEST_F(CapsWord, IdleTimeout) {
EXPECT_REPORT(driver, (KC_A));
tap_key(key_a);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Tests that typing "A, 4, A, 4" produces "Shift+A, 4, Shift+A, 4".
@@ -201,7 +201,7 @@ TEST_F(CapsWord, ShiftsLettersButNotDigits) {
caps_word_on();
tap_keys(key_a, key_4, key_a, key_4);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Tests that typing "A, Space, A" produces "Shift+A, Space, A".
@@ -230,7 +230,7 @@ TEST_F(CapsWord, SpaceTurnsOffCapsWord) {
caps_word_on();
tap_keys(key_a, key_spc, key_a);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Tests that typing "AltGr + A" produces "Shift + AltGr + A".
@@ -260,7 +260,7 @@ TEST_F(CapsWord, ShiftsAltGrSymbols) {
run_one_scan_loop();
key_altgr.release();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Tests typing "AltGr + A" using a mod-tap key.
@@ -291,7 +291,7 @@ TEST_F(CapsWord, ShiftsModTapAltGrSymbols) {
key_altgr_t.release();
EXPECT_TRUE(is_caps_word_on());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
struct CapsWordPressUserParams {
@@ -326,7 +326,7 @@ TEST_P(CapsWordPressUser, KeyCode) {
EXPECT_EQ(passed_keycode, GetParam().expected_passed_keycode);
EXPECT_EQ(is_caps_word_on(), GetParam().continues_caps_word);
clear_oneshot_mods();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
const uint16_t LT_1_KC_A = LT(1, KC_A);
@@ -431,7 +431,7 @@ TEST_P(CapsWordBothShifts, PressLRLR) {
EXPECT_EQ(is_caps_word_on(), true);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Pressing shifts as "Left down, Right down, Right up, Left up".
@@ -468,7 +468,7 @@ TEST_P(CapsWordBothShifts, PressLRRL) {
EXPECT_EQ(is_caps_word_on(), true);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// clang-format off
@@ -505,7 +505,8 @@ class CapsWordDoubleTapShift : public ::testing::WithParamInterface<CapsWordDoub
TEST_P(CapsWordDoubleTapShift, Activation) {
TestDriver driver;
KeymapKey left_shift(0, 0, 0, GetParam().left_shift_keycode);
- set_keymap({left_shift});
+ KeymapKey esc(0, 0, 1, KC_ESCAPE);
+ set_keymap({left_shift, esc});
// clang-format off
EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
@@ -523,7 +524,13 @@ TEST_P(CapsWordDoubleTapShift, Activation) {
EXPECT_EQ(is_caps_word_on(), true);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
+
+ // We have to manually reset the internal state of the caps word state
+ // machine at this point. This due to imperfect test isolation which can't
+ // reset the caps word double shift timer on test case setup.
+ idle_for(CAPS_WORD_IDLE_TIMEOUT);
+ tap_key(esc);
}
// Double tap doesn't count if another key is pressed between the taps.
@@ -555,7 +562,7 @@ TEST_P(CapsWordDoubleTapShift, Interrupted) {
EXPECT_EQ(is_caps_word_on(), false); // Caps Word is still off.
clear_oneshot_mods();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// Double tap doesn't count if taps are more than tapping term apart.
@@ -578,7 +585,7 @@ TEST_P(CapsWordDoubleTapShift, SlowTaps) {
EXPECT_EQ(is_caps_word_on(), false); // Caps Word is still off.
clear_oneshot_mods();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// clang-format off
@@ -591,6 +598,57 @@ INSTANTIATE_TEST_CASE_P(
),
CapsWordDoubleTapShiftParams::GetName
);
-// clang-format on
+// Tests that holding a OSL keeps caps word active and shifts keys on the layer that need to be shifted.
+TEST_F(CapsWord, IgnoresOSLHold) {
+ TestDriver driver;
+ KeymapKey key_a(0, 0, 0, KC_A);
+ KeymapKey key_osl(0, 1, 0, OSL(1));
+ KeymapKey key_b(1, 0, 0, KC_B);
+ set_keymap({key_a, key_osl, key_b});
+
+ // Allow any number of reports with no keys or only modifiers.
+ // clang-format off
+ EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
+ KeyboardReport(),
+ KeyboardReport(KC_LSFT))))
+ .Times(AnyNumber());
+
+ EXPECT_REPORT(driver, (KC_LSFT, KC_B));
+ caps_word_on();
+
+ key_osl.press();
+ run_one_scan_loop();
+ tap_key(key_b);
+ key_osl.release();
+ run_one_scan_loop();
+
+ VERIFY_AND_CLEAR(driver);
+}
+
+// Tests that tapping a OSL keeps caps word active and shifts keys on the layer that need to be shifted.
+TEST_F(CapsWord, IgnoresOSLTap) {
+ TestDriver driver;
+ KeymapKey key_a(0, 0, 0, KC_A);
+ KeymapKey key_osl(0, 1, 0, OSL(1));
+ KeymapKey key_b(1, 0, 0, KC_B);
+ set_keymap({key_a, key_osl, key_b});
+
+ // Allow any number of reports with no keys or only modifiers.
+ // clang-format off
+ EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
+ KeyboardReport(),
+ KeyboardReport(KC_LSFT))))
+ .Times(AnyNumber());
+
+ EXPECT_REPORT(driver, (KC_LSFT, KC_B));
+ caps_word_on();
+
+ tap_key(key_osl);
+ tap_key(key_b);
+ run_one_scan_loop();
+
+ VERIFY_AND_CLEAR(driver);
+}
+// clang-format on
} // namespace
diff --git a/tests/secure/test_secure.cpp b/tests/secure/test_secure.cpp
index 6ca98d78f3..3162e9d5df 100644
--- a/tests/secure/test_secure.cpp
+++ b/tests/secure/test_secure.cpp
@@ -43,7 +43,7 @@ TEST_F(Secure, test_lock) {
secure_lock();
EXPECT_FALSE(secure_is_unlocked());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Secure, test_unlock_timeout) {
@@ -58,7 +58,7 @@ TEST_F(Secure, test_unlock_timeout) {
idle_for(SECURE_IDLE_TIMEOUT + 1);
EXPECT_FALSE(secure_is_unlocked());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Secure, test_unlock_request) {
@@ -80,7 +80,7 @@ TEST_F(Secure, test_unlock_request) {
tap_keys(key_a, key_b, key_c, key_d);
EXPECT_TRUE(secure_is_unlocked());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Secure, test_unlock_request_fail) {
@@ -108,7 +108,7 @@ TEST_F(Secure, test_unlock_request_fail) {
tap_keys(key_e, key_a, key_b, key_c, key_d);
EXPECT_FALSE(secure_is_unlocked());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Secure, test_unlock_request_timeout) {
@@ -124,7 +124,7 @@ TEST_F(Secure, test_unlock_request_timeout) {
EXPECT_FALSE(secure_is_unlocking());
EXPECT_FALSE(secure_is_unlocked());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Secure, test_unlock_request_fail_mid) {
@@ -151,7 +151,7 @@ TEST_F(Secure, test_unlock_request_fail_mid) {
EXPECT_FALSE(secure_is_unlocking());
EXPECT_FALSE(secure_is_unlocked());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Secure, test_unlock_request_fail_out_of_order) {
@@ -179,7 +179,7 @@ TEST_F(Secure, test_unlock_request_fail_out_of_order) {
EXPECT_FALSE(secure_is_unlocking());
EXPECT_FALSE(secure_is_unlocked());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Secure, test_unlock_request_on_layer) {
@@ -206,7 +206,7 @@ TEST_F(Secure, test_unlock_request_on_layer) {
EXPECT_TRUE(secure_is_unlocked());
EXPECT_FALSE(layer_state_is(1));
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Secure, test_unlock_request_mid_stroke) {
@@ -231,7 +231,7 @@ TEST_F(Secure, test_unlock_request_mid_stroke) {
tap_keys(key_a, key_b, key_c, key_d);
EXPECT_TRUE(secure_is_unlocked());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Secure, test_unlock_request_mods) {
@@ -256,5 +256,5 @@ TEST_F(Secure, test_unlock_request_mods) {
tap_keys(key_a, key_b, key_c, key_d);
EXPECT_TRUE(secure_is_unlocked());
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/tap_dance/examples.c b/tests/tap_dance/examples.c
index 4a5be41b08..af74388209 100644
--- a/tests/tap_dance/examples.c
+++ b/tests/tap_dance/examples.c
@@ -23,7 +23,7 @@
// Example 1
-void dance_egg(qk_tap_dance_state_t *state, void *user_data) {
+void dance_egg(tap_dance_state_t *state, void *user_data) {
if (state->count >= 100) {
// SEND_STRING("Safety dance!");
tap_code(KC_C);
@@ -34,7 +34,7 @@ void dance_egg(qk_tap_dance_state_t *state, void *user_data) {
// Example 2
-void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
+void dance_flsh_each(tap_dance_state_t *state, void *user_data) {
switch (state->count) {
case 1:
register_code(KC_3);
@@ -54,14 +54,14 @@ void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
+void dance_flsh_finished(tap_dance_state_t *state, void *user_data) {
if (state->count >= 4) {
// reset_keyboard();
tap_code(KC_R);
}
}
-void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
+void dance_flsh_reset(tap_dance_state_t *state, void *user_data) {
unregister_code(KC_1);
// wait_ms(50);
unregister_code(KC_2);
@@ -79,7 +79,7 @@ typedef struct {
} tap_dance_tap_hold_t;
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- qk_tap_dance_action_t *action;
+ tap_dance_action_t *action;
switch (keycode) {
case TD(CT_CLN):
@@ -92,7 +92,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
-void tap_dance_tap_hold_finished(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_tap_hold_finished(tap_dance_state_t *state, void *user_data) {
tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data;
if (state->pressed) {
@@ -110,7 +110,7 @@ void tap_dance_tap_hold_finished(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void tap_dance_tap_hold_reset(qk_tap_dance_state_t *state, void *user_data) {
+void tap_dance_tap_hold_reset(tap_dance_state_t *state, void *user_data) {
tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data;
if (tap_hold->held) {
@@ -142,7 +142,7 @@ typedef struct {
td_state_t state;
} td_tap_t;
-td_state_t cur_dance(qk_tap_dance_state_t *state) {
+td_state_t cur_dance(tap_dance_state_t *state) {
if (state->count == 1) {
if (state->interrupted || !state->pressed) return TD_SINGLE_TAP;
else return TD_SINGLE_HOLD;
@@ -163,7 +163,7 @@ static td_tap_t xtap_state = {
.state = TD_NONE
};
-void x_finished(qk_tap_dance_state_t *state, void *user_data) {
+void x_finished(tap_dance_state_t *state, void *user_data) {
xtap_state.state = cur_dance(state);
switch (xtap_state.state) {
case TD_SINGLE_TAP: register_code(KC_X); break;
@@ -175,7 +175,7 @@ void x_finished(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void x_reset(qk_tap_dance_state_t *state, void *user_data) {
+void x_reset(tap_dance_state_t *state, void *user_data) {
switch (xtap_state.state) {
case TD_SINGLE_TAP: unregister_code(KC_X); break;
case TD_SINGLE_HOLD: unregister_code(KC_LCTL); break;
@@ -188,7 +188,7 @@ void x_reset(qk_tap_dance_state_t *state, void *user_data) {
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
[CT_EGG] = ACTION_TAP_DANCE_FN(dance_egg),
[CT_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED(dance_flsh_each, dance_flsh_finished, dance_flsh_reset),
diff --git a/tests/tap_dance/tap_dance_layers/tap_dance_defs.c b/tests/tap_dance/tap_dance_layers/tap_dance_defs.c
index 5ec900c041..fbe37f7ed0 100644
--- a/tests/tap_dance/tap_dance_layers/tap_dance_defs.c
+++ b/tests/tap_dance/tap_dance_layers/tap_dance_defs.c
@@ -43,7 +43,7 @@ enum lt_app_state {
static enum lt_app_state saved_lt_app_state;
-static enum lt_app_state get_lt_app_state(qk_tap_dance_state_t *state) {
+static enum lt_app_state get_lt_app_state(tap_dance_state_t *state) {
if (state->count == 1) {
if (!state->pressed) {
return LTA_SINGLE_TAP;
@@ -57,7 +57,7 @@ static enum lt_app_state get_lt_app_state(qk_tap_dance_state_t *state) {
}
}
-static void lt_app_finished(qk_tap_dance_state_t *state, void *user_data) {
+static void lt_app_finished(tap_dance_state_t *state, void *user_data) {
saved_lt_app_state = get_lt_app_state(state);
switch (saved_lt_app_state) {
case LTA_NONE:
@@ -74,7 +74,7 @@ static void lt_app_finished(qk_tap_dance_state_t *state, void *user_data) {
}
}
-static void lt_app_reset(qk_tap_dance_state_t *state, void *user_data) {
+static void lt_app_reset(tap_dance_state_t *state, void *user_data) {
switch (saved_lt_app_state) {
case LTA_NONE:
break;
@@ -90,7 +90,7 @@ static void lt_app_reset(qk_tap_dance_state_t *state, void *user_data) {
}
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_L_MOVE] = ACTION_TAP_DANCE_LAYER_MOVE(KC_APP, 1),
[TD_L_TOGG] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_APP, 1),
[TD_LT_APP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lt_app_finished, lt_app_reset),
diff --git a/tests/tap_hold_configurations/default_mod_tap/config.h b/tests/tap_hold_configurations/default_mod_tap/config.h
index 5955b8600a..f22448845e 100644
--- a/tests/tap_hold_configurations/default_mod_tap/config.h
+++ b/tests/tap_hold_configurations/default_mod_tap/config.h
@@ -18,4 +18,4 @@
#include "test_common.h"
-#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file
+#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp b/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp
index b70efe4aed..6d82af6725 100644
--- a/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/default_mod_tap/test_tap_hold.cpp
@@ -38,19 +38,19 @@ TEST_F(DefaultTapHold, tap_regular_key_while_mod_tap_key_is_held) {
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key. */
EXPECT_NO_REPORT(driver);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key. */
EXPECT_NO_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_REPORT(driver, (KC_P));
@@ -59,14 +59,14 @@ TEST_F(DefaultTapHold, tap_regular_key_while_mod_tap_key_is_held) {
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Idle for tapping term of mod tap hold key. */
idle_for(TAPPING_TERM - 3);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
-TEST_F(DefaultTapHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
+TEST_F(DefaultTapHold, tap_a_mod_tap_key_while_another_mod_tap_key_is_held) {
TestDriver driver;
InSequence s;
auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
@@ -78,19 +78,19 @@ TEST_F(DefaultTapHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
EXPECT_NO_REPORT(driver);
first_mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press second tap-hold key */
EXPECT_NO_REPORT(driver);
second_mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release second tap-hold key */
EXPECT_NO_REPORT(driver);
second_mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release first mod-tap-hold key */
EXPECT_REPORT(driver, (KC_P));
@@ -99,7 +99,7 @@ TEST_F(DefaultTapHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
EXPECT_EMPTY_REPORT(driver);
first_mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(DefaultTapHold, tap_regular_key_while_layer_tap_key_is_held) {
@@ -115,19 +115,19 @@ TEST_F(DefaultTapHold, tap_regular_key_while_layer_tap_key_is_held) {
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_NO_REPORT(driver);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_NO_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release layer-tap-hold key */
EXPECT_REPORT(driver, (KC_P));
@@ -136,7 +136,7 @@ TEST_F(DefaultTapHold, tap_regular_key_while_layer_tap_key_is_held) {
EXPECT_EMPTY_REPORT(driver);
layer_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(DefaultTapHold, tap_mod_tap_hold_key_two_times) {
@@ -150,26 +150,26 @@ TEST_F(DefaultTapHold, tap_mod_tap_hold_key_two_times) {
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_REPORT(driver, (KC_P));
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press mod-tap-hold key again. */
EXPECT_REPORT(driver, (KC_P));
mod_tap_hold_key.press();
idle_for(TAPPING_TERM);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(DefaultTapHold, tap_mod_tap_hold_key_twice_and_hold_on_second_time) {
@@ -183,26 +183,26 @@ TEST_F(DefaultTapHold, tap_mod_tap_hold_key_twice_and_hold_on_second_time) {
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_REPORT(driver, (KC_P));
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press mod-tap-hold key again. */
EXPECT_REPORT(driver, (KC_P));
mod_tap_hold_key.press();
idle_for(TAPPING_TERM);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(DefaultTapHold, tap_and_hold_mod_tap_hold_key) {
@@ -216,11 +216,11 @@ TEST_F(DefaultTapHold, tap_and_hold_mod_tap_hold_key) {
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
mod_tap_hold_key.press();
idle_for(TAPPING_TERM + 1);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp b/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp
index e77c756624..84a6f6996d 100644
--- a/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/hold_on_other_key_press/test_tap_hold.cpp
@@ -38,26 +38,26 @@ TEST_F(HoldOnOtherKeyPress, short_distinct_taps_of_mod_tap_key_and_regular_key)
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_REPORT(driver, (KC_P));
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key. */
EXPECT_REPORT(driver, (KC_A));
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key. */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, long_distinct_taps_of_mod_tap_key_and_regular_key) {
@@ -72,30 +72,30 @@ TEST_F(HoldOnOtherKeyPress, long_distinct_taps_of_mod_tap_key_and_regular_key) {
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Idle for tapping term of mod tap hold key. */
EXPECT_REPORT(driver, (KC_LSFT));
idle_for(TAPPING_TERM + 1);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key. */
EXPECT_REPORT(driver, (KC_A));
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key. */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, short_distinct_taps_of_layer_tap_key_and_regular_key) {
@@ -111,26 +111,26 @@ TEST_F(HoldOnOtherKeyPress, short_distinct_taps_of_layer_tap_key_and_regular_key
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release layer-tap-hold key. */
EXPECT_REPORT(driver, (KC_P));
EXPECT_EMPTY_REPORT(driver);
layer_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key. */
EXPECT_REPORT(driver, (KC_A));
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key. */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, long_distinct_taps_of_layer_tap_key_and_regular_key) {
@@ -146,30 +146,30 @@ TEST_F(HoldOnOtherKeyPress, long_distinct_taps_of_layer_tap_key_and_regular_key)
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Idle for tapping term of layer tap hold key. */
EXPECT_NO_REPORT(driver);
idle_for(TAPPING_TERM + 1);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release layer-tap-hold key. */
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key. */
EXPECT_REPORT(driver, (KC_A));
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key. */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, tap_regular_key_while_mod_tap_key_is_held) {
@@ -184,30 +184,30 @@ TEST_F(HoldOnOtherKeyPress, tap_regular_key_while_mod_tap_key_is_held) {
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key. */
EXPECT_REPORT(driver, (KC_LSFT));
EXPECT_REPORT(driver, (KC_A, KC_LSFT));
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key. */
EXPECT_REPORT(driver, (KC_LSFT));
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Idle for tapping term of mod tap hold key. */
idle_for(TAPPING_TERM - 3);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, tap_a_mod_tap_key_while_another_mod_tap_key_is_held) {
@@ -222,26 +222,26 @@ TEST_F(HoldOnOtherKeyPress, tap_a_mod_tap_key_while_another_mod_tap_key_is_held)
EXPECT_NO_REPORT(driver);
first_mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press second tap-hold key */
EXPECT_REPORT(driver, (KC_LSFT));
second_mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release second tap-hold key */
EXPECT_REPORT(driver, (KC_A, KC_LSFT));
EXPECT_REPORT(driver, (KC_LSFT));
second_mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release first mod-tap-hold key */
EXPECT_EMPTY_REPORT(driver);
first_mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, tap_regular_key_while_layer_tap_key_is_held) {
@@ -257,25 +257,25 @@ TEST_F(HoldOnOtherKeyPress, tap_regular_key_while_layer_tap_key_is_held) {
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_REPORT(driver, (KC_B));
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release layer-tap-hold key */
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, nested_tap_of_layer_0_layer_tap_keys) {
@@ -293,25 +293,25 @@ TEST_F(HoldOnOtherKeyPress, nested_tap_of_layer_0_layer_tap_keys) {
EXPECT_NO_REPORT(driver);
first_layer_tap_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press second layer-tap key */
EXPECT_REPORT(driver, (KC_Q));
second_layer_tap_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release second layer-tap key */
EXPECT_EMPTY_REPORT(driver);
second_layer_tap_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release first layer-tap key */
EXPECT_NO_REPORT(driver);
first_layer_tap_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, nested_tap_of_layer_tap_keys) {
@@ -331,26 +331,26 @@ TEST_F(HoldOnOtherKeyPress, nested_tap_of_layer_tap_keys) {
EXPECT_NO_REPORT(driver);
first_key_layer_0.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press second layer-tap key */
EXPECT_NO_REPORT(driver);
second_key_layer_0.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release second layer-tap key */
EXPECT_REPORT(driver, (KC_Q));
EXPECT_EMPTY_REPORT(driver);
second_key_layer_0.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release first layer-tap key */
EXPECT_NO_REPORT(driver);
first_key_layer_0.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, roll_mod_tap_key_with_regular_key) {
@@ -365,26 +365,26 @@ TEST_F(HoldOnOtherKeyPress, roll_mod_tap_key_with_regular_key) {
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key. */
EXPECT_REPORT(driver, (KC_LSFT));
EXPECT_REPORT(driver, (KC_A, KC_LSFT));
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
EXPECT_REPORT(driver, (KC_A));
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key. */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(HoldOnOtherKeyPress, roll_layer_tap_key_with_regular_key) {
@@ -401,23 +401,23 @@ TEST_F(HoldOnOtherKeyPress, roll_layer_tap_key_with_regular_key) {
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_REPORT(driver, (KC_B));
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release layer-tap-hold key */
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/config.h b/tests/tap_hold_configurations/ignore_mod_tap_interrupt/config.h
deleted file mode 100644
index 5955b8600a..0000000000
--- a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Stefan Kerkmann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "test_common.h"
-
-#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file
diff --git a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test_tap_hold.cpp b/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test_tap_hold.cpp
deleted file mode 100644
index 319de61070..0000000000
--- a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test_tap_hold.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Copyright 2021 Stefan Kerkmann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "keyboard_report_util.hpp"
-#include "keycode.h"
-#include "test_common.hpp"
-#include "action_tapping.h"
-#include "test_fixture.hpp"
-#include "test_keymap_key.hpp"
-
-using testing::_;
-using testing::InSequence;
-
-class IgnoreModTapInterrupt : public TestFixture {};
-
-TEST_F(IgnoreModTapInterrupt, tap_regular_key_while_mod_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
- auto regular_key = KeymapKey(0, 2, 0, KC_A);
-
- set_keymap({mod_tap_hold_key, regular_key});
-
- /* Press mod-tap-hold key */
- EXPECT_NO_REPORT(driver);
- mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press regular key */
- EXPECT_NO_REPORT(driver);
- regular_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release regular key */
- EXPECT_NO_REPORT(driver);
- regular_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release mod-tap-hold key */
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_REPORT(driver, (KC_A, KC_P));
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_EMPTY_REPORT(driver);
- mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
-
-TEST_F(IgnoreModTapInterrupt, tap_mod_tap_key_while_mod_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
- auto second_mod_tap_hold_key = KeymapKey(0, 2, 0, RSFT_T(KC_A));
-
- set_keymap({first_mod_tap_hold_key, second_mod_tap_hold_key});
-
- /* Press first mod-tap-hold key */
- EXPECT_NO_REPORT(driver);
- first_mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press second tap-hold key */
- EXPECT_NO_REPORT(driver);
- second_mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release second tap-hold key */
- EXPECT_NO_REPORT(driver);
- second_mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release first mod-tap-hold key */
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_REPORT(driver, (KC_A, KC_P));
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_EMPTY_REPORT(driver);
- first_mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
-
-TEST_F(IgnoreModTapInterrupt, tap_regular_key_while_layer_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P));
- auto regular_key = KeymapKey(0, 2, 0, KC_A);
- auto layer_key = KeymapKey(1, 2, 0, KC_B);
-
- set_keymap({layer_tap_hold_key, regular_key, layer_key});
-
- /* Press layer-tap-hold key */
- EXPECT_NO_REPORT(driver);
- layer_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press regular key */
- EXPECT_NO_REPORT(driver);
- regular_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release regular key */
- EXPECT_NO_REPORT(driver);
- regular_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release layer-tap-hold key */
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_REPORT(driver, (KC_P, regular_key.report_code));
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_EMPTY_REPORT(driver);
- layer_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
diff --git a/tests/tap_hold_configurations/permissive_hold/test_one_shot_keys.cpp b/tests/tap_hold_configurations/permissive_hold/test_one_shot_keys.cpp
index 1328b5fc0f..81f7fe718e 100644
--- a/tests/tap_hold_configurations/permissive_hold/test_one_shot_keys.cpp
+++ b/tests/tap_hold_configurations/permissive_hold/test_one_shot_keys.cpp
@@ -35,26 +35,26 @@ TEST_P(OneShotParametrizedTestFixture, OSMAsRegularModifierWithAdditionalKeypres
EXPECT_NO_REPORT(driver);
osm_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_NO_REPORT(driver);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
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);
+ VERIFY_AND_CLEAR(driver);
/* Release OSM */
EXPECT_EMPTY_REPORT(driver).Times(1);
osm_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
// clang-format off
diff --git a/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp b/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp
index 74e81f347f..8acae6ae67 100644
--- a/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp
@@ -37,13 +37,13 @@ TEST_F(PermissiveHold, tap_regular_key_while_mod_tap_key_is_held) {
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_NO_REPORT(driver);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
@@ -51,16 +51,16 @@ TEST_F(PermissiveHold, tap_regular_key_while_mod_tap_key_is_held) {
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key */
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
-TEST_F(PermissiveHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
+TEST_F(PermissiveHold, tap_a_mod_tap_key_while_another_mod_tap_key_is_held) {
TestDriver driver;
InSequence s;
auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
@@ -72,13 +72,13 @@ TEST_F(PermissiveHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
EXPECT_NO_REPORT(driver);
first_mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press second mod-tap-hold key */
EXPECT_NO_REPORT(driver);
second_mod_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release second mod-tap-hold key */
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
@@ -86,13 +86,13 @@ TEST_F(PermissiveHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
second_mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release first mod-tap-hold key */
EXPECT_EMPTY_REPORT(driver);
first_mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(PermissiveHold, tap_regular_key_while_layer_tap_key_is_held) {
@@ -108,24 +108,24 @@ TEST_F(PermissiveHold, tap_regular_key_while_layer_tap_key_is_held) {
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press regular key */
EXPECT_NO_REPORT(driver);
regular_key.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release regular key */
EXPECT_REPORT(driver, (layer_key.report_code));
EXPECT_EMPTY_REPORT(driver);
regular_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release layer-tap-hold key */
EXPECT_NO_REPORT(driver);
layer_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/config.h b/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/config.h
deleted file mode 100644
index a6abd50bbe..0000000000
--- a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Stefan Kerkmann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "test_common.h"
-
-#define IGNORE_MOD_TAP_INTERRUPT
-#define PERMISSIVE_HOLD \ No newline at end of file
diff --git a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test.mk b/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test.mk
deleted file mode 100644
index efecca2c22..0000000000
--- a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 Stefan Kerkmann
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# --------------------------------------------------------------------------------
-# Keep this file, even if it is empty, as a marker that this folder contains tests
-# --------------------------------------------------------------------------------
diff --git a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp b/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp
deleted file mode 100644
index ee7e707c94..0000000000
--- a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-
-/* Copyright 2021 Stefan Kerkmann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "keyboard_report_util.hpp"
-#include "keycode.h"
-#include "test_common.hpp"
-#include "action_tapping.h"
-#include "test_fixture.hpp"
-#include "test_keymap_key.hpp"
-
-using testing::_;
-using testing::InSequence;
-
-class PermissiveHold_IgnoreModTapInterrupt : public TestFixture {};
-
-TEST_F(PermissiveHold_IgnoreModTapInterrupt, tap_regular_key_while_mod_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
- auto regular_key = KeymapKey(0, 2, 0, KC_A);
-
- set_keymap({mod_tap_hold_key, regular_key});
-
- /* Press mod-tap-hold key */
- EXPECT_NO_REPORT(driver);
- mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press regular key */
- EXPECT_NO_REPORT(driver);
- regular_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release regular key */
- EXPECT_REPORT(driver, (KC_LSFT));
- EXPECT_REPORT(driver, (KC_LSFT, KC_A));
- EXPECT_REPORT(driver, (KC_LSFT));
- regular_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release mod-tap-hold key */
- EXPECT_EMPTY_REPORT(driver);
- mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
-
-TEST_F(PermissiveHold_IgnoreModTapInterrupt, tap_mod_tap_key_while_mod_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
- auto second_mod_tap_hold_key = KeymapKey(0, 2, 0, RSFT_T(KC_A));
-
- set_keymap({first_mod_tap_hold_key, second_mod_tap_hold_key});
-
- /* Press first mod-tap-hold key */
- EXPECT_NO_REPORT(driver);
- first_mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press second tap-hold key */
- EXPECT_NO_REPORT(driver);
- second_mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release second tap-hold key */
- EXPECT_REPORT(driver, (KC_LSFT));
- EXPECT_REPORT(driver, (KC_LSFT, KC_A));
- EXPECT_REPORT(driver, (KC_LSFT));
- second_mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release first mod-tap-hold key */
- EXPECT_EMPTY_REPORT(driver);
- first_mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
-
-TEST_F(PermissiveHold_IgnoreModTapInterrupt, tap_regular_key_while_layer_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P));
- auto regular_key = KeymapKey(0, 2, 0, KC_A);
- auto layer_key = KeymapKey(1, 2, 0, KC_B);
-
- set_keymap({layer_tap_hold_key, regular_key, layer_key});
-
- /* Press layer-tap-hold key */
- EXPECT_NO_REPORT(driver);
- layer_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press regular key */
- EXPECT_NO_REPORT(driver);
- regular_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release regular key */
- EXPECT_REPORT(driver, (KC_B));
- EXPECT_EMPTY_REPORT(driver);
- regular_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release layer-tap-hold key */
- EXPECT_NO_REPORT(driver);
- layer_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
diff --git a/tests/tap_hold_configurations/tapping_force_hold/config.h b/tests/tap_hold_configurations/quick_tap/config.h
index 3b4646338a..cd82d3b5a5 100644
--- a/tests/tap_hold_configurations/tapping_force_hold/config.h
+++ b/tests/tap_hold_configurations/quick_tap/config.h
@@ -18,4 +18,4 @@
#include "test_common.h"
-#define TAPPING_FORCE_HOLD \ No newline at end of file
+#define QUICK_TAP_TERM 100
diff --git a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test.mk b/tests/tap_hold_configurations/quick_tap/test.mk
index efecca2c22..efecca2c22 100644
--- a/tests/tap_hold_configurations/ignore_mod_tap_interrupt/test.mk
+++ b/tests/tap_hold_configurations/quick_tap/test.mk
diff --git a/tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp b/tests/tap_hold_configurations/quick_tap/test_action_layer.cpp
index 965c702d7a..44dd14c033 100644
--- a/tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp
+++ b/tests/tap_hold_configurations/quick_tap/test_action_layer.cpp
@@ -40,6 +40,8 @@ TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) {
run_one_scan_loop();
expect_layer_state(0);
+ idle_for(QUICK_TAP_TERM + 10);
+
layer_key.press();
run_one_scan_loop();
layer_key.release();
@@ -64,17 +66,17 @@ TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) {
run_one_scan_loop();
expect_layer_state(0);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_REPORT(driver, (KC_A)).Times(1);
regular_key.press();
run_one_scan_loop();
expect_layer_state(0);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_EMPTY_REPORT(driver).Times(1);
regular_key.release();
run_one_scan_loop();
expect_layer_state(0);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
new file mode 100644
index 0000000000..8ec6ea62a3
--- /dev/null
+++ b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
@@ -0,0 +1,290 @@
+/* Copyright 2021 Stefan Kerkmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "action_tapping.h"
+#include "test_fixture.hpp"
+#include "test_keymap_key.hpp"
+
+using testing::_;
+using testing::InSequence;
+
+class QuickTap : public TestFixture {};
+
+TEST_F(QuickTap, tap_regular_key_while_mod_tap_key_is_held) {
+ TestDriver driver;
+ InSequence s;
+ auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+ auto regular_key = KeymapKey(0, 2, 0, KC_A);
+
+ set_keymap({mod_tap_key, regular_key});
+
+ /* Press mod-tap key. */
+ EXPECT_NO_REPORT(driver);
+ mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Press regular key. */
+ EXPECT_NO_REPORT(driver);
+ regular_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release regular key. */
+ EXPECT_NO_REPORT(driver);
+ regular_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release mod-tap key. */
+ EXPECT_REPORT(driver, (KC_LSFT));
+ mod_tap_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Idle for tapping term of mod tap hold key. */
+ EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+ EXPECT_REPORT(driver, (KC_LSFT));
+ EXPECT_EMPTY_REPORT(driver);
+ idle_for(TAPPING_TERM - 3);
+ VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(QuickTap, tap_mod_tap_key_while_mod_tap_key_is_held) {
+ TestDriver driver;
+ InSequence s;
+ auto first_mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+ auto second_mod_tap_key = KeymapKey(0, 2, 0, RSFT_T(KC_A));
+
+ set_keymap({first_mod_tap_key, second_mod_tap_key});
+
+ /* Press first mod-tap key */
+ EXPECT_NO_REPORT(driver);
+ first_mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Press second mod-tap key */
+ EXPECT_NO_REPORT(driver);
+ second_mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release second tap-hold key */
+ EXPECT_NO_REPORT(driver);
+ second_mod_tap_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release first mod-tap key */
+ EXPECT_REPORT(driver, (KC_LSFT));
+ first_mod_tap_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Idle for tapping term of first mod-tap key. */
+ EXPECT_REPORT(driver, (KC_LSFT, KC_A));
+ EXPECT_REPORT(driver, (KC_LSFT));
+ EXPECT_EMPTY_REPORT(driver);
+ idle_for(TAPPING_TERM - 3);
+ VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(QuickTap, tap_regular_key_while_layer_tap_key_is_held) {
+ TestDriver driver;
+ InSequence s;
+ auto layer_tap_key = KeymapKey(0, 1, 0, LT(1, KC_P));
+ auto regular_key = KeymapKey(0, 2, 0, KC_A);
+ auto layer_key = KeymapKey(1, 2, 0, KC_B);
+
+ set_keymap({layer_tap_key, regular_key, layer_key});
+
+ /* Press layer-tap key */
+ EXPECT_NO_REPORT(driver);
+ layer_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Press regular key */
+ EXPECT_NO_REPORT(driver);
+ regular_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release regular key */
+ EXPECT_NO_REPORT(driver);
+ regular_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release layer-tap key */
+ EXPECT_REPORT(driver, (KC_P));
+ EXPECT_REPORT(driver, (KC_A, KC_P));
+ EXPECT_REPORT(driver, (KC_P));
+ EXPECT_EMPTY_REPORT(driver);
+ layer_tap_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(QuickTap, tap_key_and_tap_again_before_quick_tap_term) {
+ TestDriver driver;
+ InSequence s;
+ auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+
+ set_keymap({mod_tap_key});
+
+ /* Press mod-tap key. */
+ EXPECT_NO_REPORT(driver);
+ mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release mod-tap key. */
+ EXPECT_REPORT(driver, (KC_P));
+ EXPECT_EMPTY_REPORT(driver);
+ mod_tap_key.release();
+ idle_for(QUICK_TAP_TERM - 10);
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Press and tap mod-tap key again. */
+ EXPECT_REPORT(driver, (KC_P));
+ mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release mod-tap key. */
+ EXPECT_EMPTY_REPORT(driver);
+ mod_tap_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(QuickTap, tap_key_and_hold_again_before_quick_tap_term) {
+ TestDriver driver;
+ InSequence s;
+ auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+
+ set_keymap({mod_tap_key});
+
+ /* Press mod-tap key. */
+ EXPECT_NO_REPORT(driver);
+ mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release mod-tap key. */
+ EXPECT_REPORT(driver, (KC_P));
+ EXPECT_EMPTY_REPORT(driver);
+ mod_tap_key.release();
+ idle_for(QUICK_TAP_TERM - 10);
+ VERIFY_AND_CLEAR(driver);
+
+ /* Press and hold mod-tap key again. */
+ EXPECT_REPORT(driver, (KC_P));
+ mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Wait until tapping term expired */
+ EXPECT_NO_REPORT(driver);
+ idle_for(TAPPING_TERM);
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release mod-tap key. */
+ EXPECT_EMPTY_REPORT(driver);
+ mod_tap_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(QuickTap, tap_key_and_tap_again_after_quick_tap_term) {
+ TestDriver driver;
+ InSequence s;
+ auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+
+ set_keymap({mod_tap_key});
+
+ /* Press mod-tap key. */
+ EXPECT_NO_REPORT(driver);
+ mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release mod-tap key. */
+ EXPECT_REPORT(driver, (KC_P));
+ EXPECT_EMPTY_REPORT(driver);
+ mod_tap_key.release();
+ idle_for(QUICK_TAP_TERM + 10);
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Press mod-tap key again. */
+ EXPECT_NO_REPORT(driver);
+ mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release mod-tap key. */
+ EXPECT_REPORT(driver, (KC_P));
+ EXPECT_EMPTY_REPORT(driver);
+ mod_tap_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(QuickTap, tap_key_and_hold_again_after_quick_tap_term) {
+ TestDriver driver;
+ InSequence s;
+ auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
+
+ set_keymap({mod_tap_key});
+
+ /* Press mod-tap key. */
+ EXPECT_NO_REPORT(driver);
+ mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release mod-tap key. */
+ EXPECT_REPORT(driver, (KC_P));
+ EXPECT_EMPTY_REPORT(driver);
+ mod_tap_key.release();
+ idle_for(QUICK_TAP_TERM + 10);
+ VERIFY_AND_CLEAR(driver);
+
+ /* Press and hold mod-tap key again. */
+ EXPECT_NO_REPORT(driver);
+ mod_tap_key.press();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+
+ /* Wait until tapping term expired */
+ EXPECT_REPORT(driver, (KC_LSFT));
+ idle_for(TAPPING_TERM);
+ VERIFY_AND_CLEAR(driver);
+
+ /* Release mod-tap key. */
+ EXPECT_EMPTY_REPORT(driver);
+ mod_tap_key.release();
+ run_one_scan_loop();
+ VERIFY_AND_CLEAR(driver);
+}
diff --git a/tests/tap_hold_configurations/retro_tapping/test_tap_hold.cpp b/tests/tap_hold_configurations/retro_tapping/test_tap_hold.cpp
index e08c600dbd..2b49cddcce 100644
--- a/tests/tap_hold_configurations/retro_tapping/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/retro_tapping/test_tap_hold.cpp
@@ -38,7 +38,7 @@ TEST_F(RetroTapping, tap_and_hold_mod_tap_hold_key) {
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
idle_for(TAPPING_TERM);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod-tap-hold key. */
/* TODO: Why is LSHIFT send at all? */
@@ -48,5 +48,5 @@ TEST_F(RetroTapping, tap_and_hold_mod_tap_hold_key) {
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/tap_hold_configurations/retro_tapping/test_tapping.cpp b/tests/tap_hold_configurations/retro_tapping/test_tapping.cpp
index 42139d50da..db81c39101 100644
--- a/tests/tap_hold_configurations/retro_tapping/test_tapping.cpp
+++ b/tests/tap_hold_configurations/retro_tapping/test_tapping.cpp
@@ -35,18 +35,18 @@ TEST_F(Tapping, HoldA_SHFT_T_KeyReportsShift) {
EXPECT_NO_REPORT(driver);
mod_tap_hold_key.press();
idle_for(TAPPING_TERM);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_REPORT(driver, (KC_LSFT));
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
EXPECT_EMPTY_REPORT(driver);
EXPECT_REPORT(driver, (KC_P));
EXPECT_EMPTY_REPORT(driver);
mod_tap_hold_key.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
TEST_F(Tapping, ANewTapWithinTappingTermIsBuggy) {
@@ -60,45 +60,45 @@ TEST_F(Tapping, ANewTapWithinTappingTermIsBuggy) {
EXPECT_NO_REPORT(driver);
key_shift_hold_p_tap.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod_tap_hold key */
EXPECT_REPORT(driver, (KC_P));
EXPECT_EMPTY_REPORT(driver);
key_shift_hold_p_tap.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press mod_tap_hold key again */
EXPECT_REPORT(driver, (KC_P));
key_shift_hold_p_tap.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod_tap_hold key again */
EXPECT_EMPTY_REPORT(driver);
key_shift_hold_p_tap.release();
idle_for(TAPPING_TERM + 1);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press mod_tap_hold key again */
EXPECT_NO_REPORT(driver);
key_shift_hold_p_tap.press();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod_tap_hold key again */
EXPECT_REPORT(driver, (KC_P));
EXPECT_EMPTY_REPORT(driver);
key_shift_hold_p_tap.release();
idle_for(TAPPING_TERM + 1);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Press mod_tap_hold key again */
EXPECT_NO_REPORT(driver);
key_shift_hold_p_tap.press();
idle_for(TAPPING_TERM);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Release mod_tap_hold key again */
/* TODO: Why is KC_LSFT send? */
@@ -108,5 +108,5 @@ TEST_F(Tapping, ANewTapWithinTappingTermIsBuggy) {
EXPECT_EMPTY_REPORT(driver);
key_shift_hold_p_tap.release();
run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
}
diff --git a/tests/tap_hold_configurations/tapping_force_hold/test.mk b/tests/tap_hold_configurations/tapping_force_hold/test.mk
deleted file mode 100644
index efecca2c22..0000000000
--- a/tests/tap_hold_configurations/tapping_force_hold/test.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 Stefan Kerkmann
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# --------------------------------------------------------------------------------
-# Keep this file, even if it is empty, as a marker that this folder contains tests
-# --------------------------------------------------------------------------------
diff --git a/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp b/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp
deleted file mode 100644
index 604f9a4a54..0000000000
--- a/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-
-/* Copyright 2021 Stefan Kerkmann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "keyboard_report_util.hpp"
-#include "keycode.h"
-#include "test_common.hpp"
-#include "action_tapping.h"
-#include "test_fixture.hpp"
-#include "test_keymap_key.hpp"
-
-using testing::_;
-using testing::InSequence;
-
-class TappingForceHold : public TestFixture {};
-
-TEST_F(TappingForceHold, tap_regular_key_while_mod_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
- auto regular_key = KeymapKey(0, 2, 0, KC_A);
-
- set_keymap({mod_tap_hold_key, regular_key});
-
- /* Press mod-tap-hold key. */
- EXPECT_NO_REPORT(driver);
- mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press regular key. */
- EXPECT_NO_REPORT(driver);
- regular_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release regular key. */
- EXPECT_NO_REPORT(driver);
- regular_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release mod-tap-hold key. */
- EXPECT_REPORT(driver, (KC_LSFT));
- mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Idle for tapping term of mod tap hold key. */
- EXPECT_REPORT(driver, (KC_LSFT, KC_A));
- EXPECT_REPORT(driver, (KC_LSFT));
- EXPECT_EMPTY_REPORT(driver);
- idle_for(TAPPING_TERM - 3);
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
-
-TEST_F(TappingForceHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto first_mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
- auto second_mod_tap_hold_key = KeymapKey(0, 2, 0, RSFT_T(KC_A));
-
- set_keymap({first_mod_tap_hold_key, second_mod_tap_hold_key});
-
- /* Press first mod-tap-hold key */
- EXPECT_NO_REPORT(driver);
- first_mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press second tap-hold key */
- EXPECT_NO_REPORT(driver);
- second_mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release second tap-hold key */
- EXPECT_NO_REPORT(driver);
- second_mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release first mod-tap-hold key */
- EXPECT_REPORT(driver, (KC_LSFT));
- first_mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Idle for tapping term of first mod tap hold key. */
- EXPECT_REPORT(driver, (KC_LSFT, KC_A));
- EXPECT_REPORT(driver, (KC_LSFT));
- EXPECT_EMPTY_REPORT(driver);
- idle_for(TAPPING_TERM - 3);
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
-
-TEST_F(TappingForceHold, tap_regular_key_while_layer_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto layer_tap_hold_key = KeymapKey(0, 1, 0, LT(1, KC_P));
- auto regular_key = KeymapKey(0, 2, 0, KC_A);
- auto layer_key = KeymapKey(1, 2, 0, KC_B);
-
- set_keymap({layer_tap_hold_key, regular_key, layer_key});
-
- /* Press layer-tap-hold key */
- EXPECT_NO_REPORT(driver);
- layer_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press regular key */
- EXPECT_NO_REPORT(driver);
- regular_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release regular key */
- EXPECT_NO_REPORT(driver);
- regular_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release layer-tap-hold key */
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_REPORT(driver, (KC_A, KC_P));
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_EMPTY_REPORT(driver);
- layer_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
-
-TEST_F(TappingForceHold, tap_mod_tap_hold_key_two_times) {
- TestDriver driver;
- InSequence s;
- auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
-
- set_keymap({mod_tap_hold_key});
-
- /* Press mod-tap-hold key. */
- EXPECT_NO_REPORT(driver);
- mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release mod-tap-hold key. */
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_EMPTY_REPORT(driver);
- mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press mod-tap-hold key again. */
- EXPECT_NO_REPORT(driver);
- mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release mod-tap-hold key. */
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_EMPTY_REPORT(driver);
- mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
-
-TEST_F(TappingForceHold, tap_mod_tap_hold_key_twice_and_hold_on_second_time) {
- TestDriver driver;
- InSequence s;
- auto mod_tap_hold_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
-
- set_keymap({mod_tap_hold_key});
-
- /* Press mod-tap-hold key. */
- EXPECT_NO_REPORT(driver);
- mod_tap_hold_key.press();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release mod-tap-hold key. */
- EXPECT_REPORT(driver, (KC_P));
- EXPECT_EMPTY_REPORT(driver);
- mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Press mod-tap-hold key again. */
- EXPECT_NO_REPORT(driver);
- mod_tap_hold_key.press();
- idle_for(TAPPING_TERM);
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- /* Release mod-tap-hold key. */
- EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
- EXPECT_EMPTY_REPORT(driver);
- mod_tap_hold_key.release();
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-}
diff --git a/tests/test_common/keyboard_report_util.cpp b/tests/test_common/keyboard_report_util.cpp
index 7908e64f7f..2de1af2301 100644
--- a/tests/test_common/keyboard_report_util.cpp
+++ b/tests/test_common/keyboard_report_util.cpp
@@ -15,11 +15,16 @@
*/
#include "keyboard_report_util.hpp"
+#include <cstdint>
#include <vector>
#include <algorithm>
+
using namespace testing;
+extern std::map<uint16_t, std::string> KEYCODE_ID_TABLE;
+
namespace {
+
std::vector<uint8_t> get_keys(const report_keyboard_t& report) {
std::vector<uint8_t> result;
#if defined(NKRO_ENABLE)
@@ -36,6 +41,19 @@ std::vector<uint8_t> get_keys(const report_keyboard_t& report) {
std::sort(result.begin(), result.end());
return result;
}
+
+std::vector<uint8_t> get_mods(const report_keyboard_t& report) {
+ std::vector<uint8_t> result;
+ for (size_t i = 0; i < 8; i++) {
+ if (report.mods & (1 << i)) {
+ uint8_t code = KC_LEFT_CTRL + i;
+ result.emplace_back(code);
+ }
+ }
+ std::sort(result.begin(), result.end());
+ return result;
+}
+
} // namespace
bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs) {
@@ -44,21 +62,36 @@ bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs) {
return lhs.mods == rhs.mods && lhskeys == rhskeys;
}
-std::ostream& operator<<(std::ostream& stream, const report_keyboard_t& report) {
+std::ostream& operator<<(std::ostream& os, const report_keyboard_t& report) {
auto keys = get_keys(report);
+ auto mods = get_mods(report);
- // TODO: This should probably print friendly names for the keys
- stream << "Keyboard Report: Mods (" << (uint32_t)report.mods << ") Keys (";
+ os << std::setw(10) << std::left << "report: ";
+
+ if (!keys.size() && !mods.size()) {
+ return os << "empty" << std::endl;
+ }
+ os << "(";
for (auto key = keys.cbegin(); key != keys.cend();) {
- stream << +(*key);
+ os << KEYCODE_ID_TABLE.at(*key);
key++;
if (key != keys.cend()) {
- stream << ",";
+ os << ", ";
+ }
+ }
+
+ os << ") [";
+
+ for (auto mod = mods.cbegin(); mod != mods.cend();) {
+ os << KEYCODE_ID_TABLE.at(*mod);
+ mod++;
+ if (mod != mods.cend()) {
+ os << ", ";
}
}
- return stream << ")" << std::endl;
+ return os << "]" << std::endl;
}
KeyboardReportMatcher::KeyboardReportMatcher(const std::vector<uint8_t>& keys) {
diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp
new file mode 100644
index 0000000000..63350c272d
--- /dev/null
+++ b/tests/test_common/keycode_table.cpp
@@ -0,0 +1,663 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*******************************************************************************
+ 88888888888 888 d8b .d888 d8b 888 d8b
+ 888 888 Y8P d88P" Y8P 888 Y8P
+ 888 888 888 888
+ 888 88888b. 888 .d8888b 888888 888 888 .d88b. 888 .d8888b
+ 888 888 "88b 888 88K 888 888 888 d8P Y8b 888 88K
+ 888 888 888 888 "Y8888b. 888 888 888 88888888 888 "Y8888b.
+ 888 888 888 888 X88 888 888 888 Y8b. 888 X88
+ 888 888 888 888 88888P' 888 888 888 "Y8888 888 88888P'
+ 888 888
+ 888 888
+ 888 888
+ .d88b. .d88b. 88888b. .d88b. 888d888 8888b. 888888 .d88b. .d88888
+ d88P"88b d8P Y8b 888 "88b d8P Y8b 888P" "88b 888 d8P Y8b d88" 888
+ 888 888 88888888 888 888 88888888 888 .d888888 888 88888888 888 888
+ Y88b 888 Y8b. 888 888 Y8b. 888 888 888 Y88b. Y8b. Y88b 888
+ "Y88888 "Y8888 888 888 "Y8888 888 "Y888888 "Y888 "Y8888 "Y88888
+ 888
+ Y8b d88P
+ "Y88P"
+*******************************************************************************/
+
+// clang-format off
+extern "C" {
+#include <keycode.h>
+}
+#include <map>
+#include <string>
+#include <cstdint>
+
+std::map<uint16_t, std::string> KEYCODE_ID_TABLE = {
+ {KC_NO, "KC_NO"},
+ {KC_TRANSPARENT, "KC_TRANSPARENT"},
+ {KC_A, "KC_A"},
+ {KC_B, "KC_B"},
+ {KC_C, "KC_C"},
+ {KC_D, "KC_D"},
+ {KC_E, "KC_E"},
+ {KC_F, "KC_F"},
+ {KC_G, "KC_G"},
+ {KC_H, "KC_H"},
+ {KC_I, "KC_I"},
+ {KC_J, "KC_J"},
+ {KC_K, "KC_K"},
+ {KC_L, "KC_L"},
+ {KC_M, "KC_M"},
+ {KC_N, "KC_N"},
+ {KC_O, "KC_O"},
+ {KC_P, "KC_P"},
+ {KC_Q, "KC_Q"},
+ {KC_R, "KC_R"},
+ {KC_S, "KC_S"},
+ {KC_T, "KC_T"},
+ {KC_U, "KC_U"},
+ {KC_V, "KC_V"},
+ {KC_W, "KC_W"},
+ {KC_X, "KC_X"},
+ {KC_Y, "KC_Y"},
+ {KC_Z, "KC_Z"},
+ {KC_1, "KC_1"},
+ {KC_2, "KC_2"},
+ {KC_3, "KC_3"},
+ {KC_4, "KC_4"},
+ {KC_5, "KC_5"},
+ {KC_6, "KC_6"},
+ {KC_7, "KC_7"},
+ {KC_8, "KC_8"},
+ {KC_9, "KC_9"},
+ {KC_0, "KC_0"},
+ {KC_ENTER, "KC_ENTER"},
+ {KC_ESCAPE, "KC_ESCAPE"},
+ {KC_BACKSPACE, "KC_BACKSPACE"},
+ {KC_TAB, "KC_TAB"},
+ {KC_SPACE, "KC_SPACE"},
+ {KC_MINUS, "KC_MINUS"},
+ {KC_EQUAL, "KC_EQUAL"},
+ {KC_LEFT_BRACKET, "KC_LEFT_BRACKET"},
+ {KC_RIGHT_BRACKET, "KC_RIGHT_BRACKET"},
+ {KC_BACKSLASH, "KC_BACKSLASH"},
+ {KC_NONUS_HASH, "KC_NONUS_HASH"},
+ {KC_SEMICOLON, "KC_SEMICOLON"},
+ {KC_QUOTE, "KC_QUOTE"},
+ {KC_GRAVE, "KC_GRAVE"},
+ {KC_COMMA, "KC_COMMA"},
+ {KC_DOT, "KC_DOT"},
+ {KC_SLASH, "KC_SLASH"},
+ {KC_CAPS_LOCK, "KC_CAPS_LOCK"},
+ {KC_F1, "KC_F1"},
+ {KC_F2, "KC_F2"},
+ {KC_F3, "KC_F3"},
+ {KC_F4, "KC_F4"},
+ {KC_F5, "KC_F5"},
+ {KC_F6, "KC_F6"},
+ {KC_F7, "KC_F7"},
+ {KC_F8, "KC_F8"},
+ {KC_F9, "KC_F9"},
+ {KC_F10, "KC_F10"},
+ {KC_F11, "KC_F11"},
+ {KC_F12, "KC_F12"},
+ {KC_PRINT_SCREEN, "KC_PRINT_SCREEN"},
+ {KC_SCROLL_LOCK, "KC_SCROLL_LOCK"},
+ {KC_PAUSE, "KC_PAUSE"},
+ {KC_INSERT, "KC_INSERT"},
+ {KC_HOME, "KC_HOME"},
+ {KC_PAGE_UP, "KC_PAGE_UP"},
+ {KC_DELETE, "KC_DELETE"},
+ {KC_END, "KC_END"},
+ {KC_PAGE_DOWN, "KC_PAGE_DOWN"},
+ {KC_RIGHT, "KC_RIGHT"},
+ {KC_LEFT, "KC_LEFT"},
+ {KC_DOWN, "KC_DOWN"},
+ {KC_UP, "KC_UP"},
+ {KC_NUM_LOCK, "KC_NUM_LOCK"},
+ {KC_KP_SLASH, "KC_KP_SLASH"},
+ {KC_KP_ASTERISK, "KC_KP_ASTERISK"},
+ {KC_KP_MINUS, "KC_KP_MINUS"},
+ {KC_KP_PLUS, "KC_KP_PLUS"},
+ {KC_KP_ENTER, "KC_KP_ENTER"},
+ {KC_KP_1, "KC_KP_1"},
+ {KC_KP_2, "KC_KP_2"},
+ {KC_KP_3, "KC_KP_3"},
+ {KC_KP_4, "KC_KP_4"},
+ {KC_KP_5, "KC_KP_5"},
+ {KC_KP_6, "KC_KP_6"},
+ {KC_KP_7, "KC_KP_7"},
+ {KC_KP_8, "KC_KP_8"},
+ {KC_KP_9, "KC_KP_9"},
+ {KC_KP_0, "KC_KP_0"},
+ {KC_KP_DOT, "KC_KP_DOT"},
+ {KC_NONUS_BACKSLASH, "KC_NONUS_BACKSLASH"},
+ {KC_APPLICATION, "KC_APPLICATION"},
+ {KC_KB_POWER, "KC_KB_POWER"},
+ {KC_KP_EQUAL, "KC_KP_EQUAL"},
+ {KC_F13, "KC_F13"},
+ {KC_F14, "KC_F14"},
+ {KC_F15, "KC_F15"},
+ {KC_F16, "KC_F16"},
+ {KC_F17, "KC_F17"},
+ {KC_F18, "KC_F18"},
+ {KC_F19, "KC_F19"},
+ {KC_F20, "KC_F20"},
+ {KC_F21, "KC_F21"},
+ {KC_F22, "KC_F22"},
+ {KC_F23, "KC_F23"},
+ {KC_F24, "KC_F24"},
+ {KC_EXECUTE, "KC_EXECUTE"},
+ {KC_HELP, "KC_HELP"},
+ {KC_MENU, "KC_MENU"},
+ {KC_SELECT, "KC_SELECT"},
+ {KC_STOP, "KC_STOP"},
+ {KC_AGAIN, "KC_AGAIN"},
+ {KC_UNDO, "KC_UNDO"},
+ {KC_CUT, "KC_CUT"},
+ {KC_COPY, "KC_COPY"},
+ {KC_PASTE, "KC_PASTE"},
+ {KC_FIND, "KC_FIND"},
+ {KC_KB_MUTE, "KC_KB_MUTE"},
+ {KC_KB_VOLUME_UP, "KC_KB_VOLUME_UP"},
+ {KC_KB_VOLUME_DOWN, "KC_KB_VOLUME_DOWN"},
+ {KC_LOCKING_CAPS_LOCK, "KC_LOCKING_CAPS_LOCK"},
+ {KC_LOCKING_NUM_LOCK, "KC_LOCKING_NUM_LOCK"},
+ {KC_LOCKING_SCROLL_LOCK, "KC_LOCKING_SCROLL_LOCK"},
+ {KC_KP_COMMA, "KC_KP_COMMA"},
+ {KC_KP_EQUAL_AS400, "KC_KP_EQUAL_AS400"},
+ {KC_INTERNATIONAL_1, "KC_INTERNATIONAL_1"},
+ {KC_INTERNATIONAL_2, "KC_INTERNATIONAL_2"},
+ {KC_INTERNATIONAL_3, "KC_INTERNATIONAL_3"},
+ {KC_INTERNATIONAL_4, "KC_INTERNATIONAL_4"},
+ {KC_INTERNATIONAL_5, "KC_INTERNATIONAL_5"},
+ {KC_INTERNATIONAL_6, "KC_INTERNATIONAL_6"},
+ {KC_INTERNATIONAL_7, "KC_INTERNATIONAL_7"},
+ {KC_INTERNATIONAL_8, "KC_INTERNATIONAL_8"},
+ {KC_INTERNATIONAL_9, "KC_INTERNATIONAL_9"},
+ {KC_LANGUAGE_1, "KC_LANGUAGE_1"},
+ {KC_LANGUAGE_2, "KC_LANGUAGE_2"},
+ {KC_LANGUAGE_3, "KC_LANGUAGE_3"},
+ {KC_LANGUAGE_4, "KC_LANGUAGE_4"},
+ {KC_LANGUAGE_5, "KC_LANGUAGE_5"},
+ {KC_LANGUAGE_6, "KC_LANGUAGE_6"},
+ {KC_LANGUAGE_7, "KC_LANGUAGE_7"},
+ {KC_LANGUAGE_8, "KC_LANGUAGE_8"},
+ {KC_LANGUAGE_9, "KC_LANGUAGE_9"},
+ {KC_ALTERNATE_ERASE, "KC_ALTERNATE_ERASE"},
+ {KC_SYSTEM_REQUEST, "KC_SYSTEM_REQUEST"},
+ {KC_CANCEL, "KC_CANCEL"},
+ {KC_CLEAR, "KC_CLEAR"},
+ {KC_PRIOR, "KC_PRIOR"},
+ {KC_RETURN, "KC_RETURN"},
+ {KC_SEPARATOR, "KC_SEPARATOR"},
+ {KC_OUT, "KC_OUT"},
+ {KC_OPER, "KC_OPER"},
+ {KC_CLEAR_AGAIN, "KC_CLEAR_AGAIN"},
+ {KC_CRSEL, "KC_CRSEL"},
+ {KC_EXSEL, "KC_EXSEL"},
+ {KC_SYSTEM_POWER, "KC_SYSTEM_POWER"},
+ {KC_SYSTEM_SLEEP, "KC_SYSTEM_SLEEP"},
+ {KC_SYSTEM_WAKE, "KC_SYSTEM_WAKE"},
+ {KC_AUDIO_MUTE, "KC_AUDIO_MUTE"},
+ {KC_AUDIO_VOL_UP, "KC_AUDIO_VOL_UP"},
+ {KC_AUDIO_VOL_DOWN, "KC_AUDIO_VOL_DOWN"},
+ {KC_MEDIA_NEXT_TRACK, "KC_MEDIA_NEXT_TRACK"},
+ {KC_MEDIA_PREV_TRACK, "KC_MEDIA_PREV_TRACK"},
+ {KC_MEDIA_STOP, "KC_MEDIA_STOP"},
+ {KC_MEDIA_PLAY_PAUSE, "KC_MEDIA_PLAY_PAUSE"},
+ {KC_MEDIA_SELECT, "KC_MEDIA_SELECT"},
+ {KC_MEDIA_EJECT, "KC_MEDIA_EJECT"},
+ {KC_MAIL, "KC_MAIL"},
+ {KC_CALCULATOR, "KC_CALCULATOR"},
+ {KC_MY_COMPUTER, "KC_MY_COMPUTER"},
+ {KC_WWW_SEARCH, "KC_WWW_SEARCH"},
+ {KC_WWW_HOME, "KC_WWW_HOME"},
+ {KC_WWW_BACK, "KC_WWW_BACK"},
+ {KC_WWW_FORWARD, "KC_WWW_FORWARD"},
+ {KC_WWW_STOP, "KC_WWW_STOP"},
+ {KC_WWW_REFRESH, "KC_WWW_REFRESH"},
+ {KC_WWW_FAVORITES, "KC_WWW_FAVORITES"},
+ {KC_MEDIA_FAST_FORWARD, "KC_MEDIA_FAST_FORWARD"},
+ {KC_MEDIA_REWIND, "KC_MEDIA_REWIND"},
+ {KC_BRIGHTNESS_UP, "KC_BRIGHTNESS_UP"},
+ {KC_BRIGHTNESS_DOWN, "KC_BRIGHTNESS_DOWN"},
+ {KC_CONTROL_PANEL, "KC_CONTROL_PANEL"},
+ {KC_ASSISTANT, "KC_ASSISTANT"},
+ {KC_MS_UP, "KC_MS_UP"},
+ {KC_MS_DOWN, "KC_MS_DOWN"},
+ {KC_MS_LEFT, "KC_MS_LEFT"},
+ {KC_MS_RIGHT, "KC_MS_RIGHT"},
+ {KC_MS_BTN1, "KC_MS_BTN1"},
+ {KC_MS_BTN2, "KC_MS_BTN2"},
+ {KC_MS_BTN3, "KC_MS_BTN3"},
+ {KC_MS_BTN4, "KC_MS_BTN4"},
+ {KC_MS_BTN5, "KC_MS_BTN5"},
+ {KC_MS_BTN6, "KC_MS_BTN6"},
+ {KC_MS_BTN7, "KC_MS_BTN7"},
+ {KC_MS_BTN8, "KC_MS_BTN8"},
+ {KC_MS_WH_UP, "KC_MS_WH_UP"},
+ {KC_MS_WH_DOWN, "KC_MS_WH_DOWN"},
+ {KC_MS_WH_LEFT, "KC_MS_WH_LEFT"},
+ {KC_MS_WH_RIGHT, "KC_MS_WH_RIGHT"},
+ {KC_MS_ACCEL0, "KC_MS_ACCEL0"},
+ {KC_MS_ACCEL1, "KC_MS_ACCEL1"},
+ {KC_MS_ACCEL2, "KC_MS_ACCEL2"},
+ {KC_LEFT_CTRL, "KC_LEFT_CTRL"},
+ {KC_LEFT_SHIFT, "KC_LEFT_SHIFT"},
+ {KC_LEFT_ALT, "KC_LEFT_ALT"},
+ {KC_LEFT_GUI, "KC_LEFT_GUI"},
+ {KC_RIGHT_CTRL, "KC_RIGHT_CTRL"},
+ {KC_RIGHT_SHIFT, "KC_RIGHT_SHIFT"},
+ {KC_RIGHT_ALT, "KC_RIGHT_ALT"},
+ {KC_RIGHT_GUI, "KC_RIGHT_GUI"},
+ {SH_TG, "SH_TG"},
+ {SH_TT, "SH_TT"},
+ {SH_MON, "SH_MON"},
+ {SH_MOFF, "SH_MOFF"},
+ {SH_OFF, "SH_OFF"},
+ {SH_ON, "SH_ON"},
+ {SH_OS, "SH_OS"},
+ {MAGIC_SWAP_CONTROL_CAPSLOCK, "MAGIC_SWAP_CONTROL_CAPSLOCK"},
+ {MAGIC_UNSWAP_CONTROL_CAPSLOCK, "MAGIC_UNSWAP_CONTROL_CAPSLOCK"},
+ {MAGIC_TOGGLE_CONTROL_CAPSLOCK, "MAGIC_TOGGLE_CONTROL_CAPSLOCK"},
+ {MAGIC_UNCAPSLOCK_TO_CONTROL, "MAGIC_UNCAPSLOCK_TO_CONTROL"},
+ {MAGIC_CAPSLOCK_TO_CONTROL, "MAGIC_CAPSLOCK_TO_CONTROL"},
+ {MAGIC_SWAP_LALT_LGUI, "MAGIC_SWAP_LALT_LGUI"},
+ {MAGIC_UNSWAP_LALT_LGUI, "MAGIC_UNSWAP_LALT_LGUI"},
+ {MAGIC_SWAP_RALT_RGUI, "MAGIC_SWAP_RALT_RGUI"},
+ {MAGIC_UNSWAP_RALT_RGUI, "MAGIC_UNSWAP_RALT_RGUI"},
+ {MAGIC_UNNO_GUI, "MAGIC_UNNO_GUI"},
+ {MAGIC_NO_GUI, "MAGIC_NO_GUI"},
+ {MAGIC_TOGGLE_GUI, "MAGIC_TOGGLE_GUI"},
+ {MAGIC_SWAP_GRAVE_ESC, "MAGIC_SWAP_GRAVE_ESC"},
+ {MAGIC_UNSWAP_GRAVE_ESC, "MAGIC_UNSWAP_GRAVE_ESC"},
+ {MAGIC_SWAP_BACKSLASH_BACKSPACE, "MAGIC_SWAP_BACKSLASH_BACKSPACE"},
+ {MAGIC_UNSWAP_BACKSLASH_BACKSPACE, "MAGIC_UNSWAP_BACKSLASH_BACKSPACE"},
+ {MAGIC_TOGGLE_BACKSLASH_BACKSPACE, "MAGIC_TOGGLE_BACKSLASH_BACKSPACE"},
+ {MAGIC_HOST_NKRO, "MAGIC_HOST_NKRO"},
+ {MAGIC_UNHOST_NKRO, "MAGIC_UNHOST_NKRO"},
+ {MAGIC_TOGGLE_NKRO, "MAGIC_TOGGLE_NKRO"},
+ {MAGIC_SWAP_ALT_GUI, "MAGIC_SWAP_ALT_GUI"},
+ {MAGIC_UNSWAP_ALT_GUI, "MAGIC_UNSWAP_ALT_GUI"},
+ {MAGIC_TOGGLE_ALT_GUI, "MAGIC_TOGGLE_ALT_GUI"},
+ {MAGIC_SWAP_LCTL_LGUI, "MAGIC_SWAP_LCTL_LGUI"},
+ {MAGIC_UNSWAP_LCTL_LGUI, "MAGIC_UNSWAP_LCTL_LGUI"},
+ {MAGIC_SWAP_RCTL_RGUI, "MAGIC_SWAP_RCTL_RGUI"},
+ {MAGIC_UNSWAP_RCTL_RGUI, "MAGIC_UNSWAP_RCTL_RGUI"},
+ {MAGIC_SWAP_CTL_GUI, "MAGIC_SWAP_CTL_GUI"},
+ {MAGIC_UNSWAP_CTL_GUI, "MAGIC_UNSWAP_CTL_GUI"},
+ {MAGIC_TOGGLE_CTL_GUI, "MAGIC_TOGGLE_CTL_GUI"},
+ {MAGIC_EE_HANDS_LEFT, "MAGIC_EE_HANDS_LEFT"},
+ {MAGIC_EE_HANDS_RIGHT, "MAGIC_EE_HANDS_RIGHT"},
+ {MAGIC_SWAP_ESCAPE_CAPSLOCK, "MAGIC_SWAP_ESCAPE_CAPSLOCK"},
+ {MAGIC_UNSWAP_ESCAPE_CAPSLOCK, "MAGIC_UNSWAP_ESCAPE_CAPSLOCK"},
+ {MAGIC_TOGGLE_ESCAPE_CAPSLOCK, "MAGIC_TOGGLE_ESCAPE_CAPSLOCK"},
+ {QK_MIDI_ON, "QK_MIDI_ON"},
+ {QK_MIDI_OFF, "QK_MIDI_OFF"},
+ {QK_MIDI_TOGGLE, "QK_MIDI_TOGGLE"},
+ {QK_MIDI_NOTE_C_0, "QK_MIDI_NOTE_C_0"},
+ {QK_MIDI_NOTE_C_SHARP_0, "QK_MIDI_NOTE_C_SHARP_0"},
+ {QK_MIDI_NOTE_D_0, "QK_MIDI_NOTE_D_0"},
+ {QK_MIDI_NOTE_D_SHARP_0, "QK_MIDI_NOTE_D_SHARP_0"},
+ {QK_MIDI_NOTE_E_0, "QK_MIDI_NOTE_E_0"},
+ {QK_MIDI_NOTE_F_0, "QK_MIDI_NOTE_F_0"},
+ {QK_MIDI_NOTE_F_SHARP_0, "QK_MIDI_NOTE_F_SHARP_0"},
+ {QK_MIDI_NOTE_G_0, "QK_MIDI_NOTE_G_0"},
+ {QK_MIDI_NOTE_G_SHARP_0, "QK_MIDI_NOTE_G_SHARP_0"},
+ {QK_MIDI_NOTE_A_0, "QK_MIDI_NOTE_A_0"},
+ {QK_MIDI_NOTE_A_SHARP_0, "QK_MIDI_NOTE_A_SHARP_0"},
+ {QK_MIDI_NOTE_B_0, "QK_MIDI_NOTE_B_0"},
+ {QK_MIDI_NOTE_C_1, "QK_MIDI_NOTE_C_1"},
+ {QK_MIDI_NOTE_C_SHARP_1, "QK_MIDI_NOTE_C_SHARP_1"},
+ {QK_MIDI_NOTE_D_1, "QK_MIDI_NOTE_D_1"},
+ {QK_MIDI_NOTE_D_SHARP_1, "QK_MIDI_NOTE_D_SHARP_1"},
+ {QK_MIDI_NOTE_E_1, "QK_MIDI_NOTE_E_1"},
+ {QK_MIDI_NOTE_F_1, "QK_MIDI_NOTE_F_1"},
+ {QK_MIDI_NOTE_F_SHARP_1, "QK_MIDI_NOTE_F_SHARP_1"},
+ {QK_MIDI_NOTE_G_1, "QK_MIDI_NOTE_G_1"},
+ {QK_MIDI_NOTE_G_SHARP_1, "QK_MIDI_NOTE_G_SHARP_1"},
+ {QK_MIDI_NOTE_A_1, "QK_MIDI_NOTE_A_1"},
+ {QK_MIDI_NOTE_A_SHARP_1, "QK_MIDI_NOTE_A_SHARP_1"},
+ {QK_MIDI_NOTE_B_1, "QK_MIDI_NOTE_B_1"},
+ {QK_MIDI_NOTE_C_2, "QK_MIDI_NOTE_C_2"},
+ {QK_MIDI_NOTE_C_SHARP_2, "QK_MIDI_NOTE_C_SHARP_2"},
+ {QK_MIDI_NOTE_D_2, "QK_MIDI_NOTE_D_2"},
+ {QK_MIDI_NOTE_D_SHARP_2, "QK_MIDI_NOTE_D_SHARP_2"},
+ {QK_MIDI_NOTE_E_2, "QK_MIDI_NOTE_E_2"},
+ {QK_MIDI_NOTE_F_2, "QK_MIDI_NOTE_F_2"},
+ {QK_MIDI_NOTE_F_SHARP_2, "QK_MIDI_NOTE_F_SHARP_2"},
+ {QK_MIDI_NOTE_G_2, "QK_MIDI_NOTE_G_2"},
+ {QK_MIDI_NOTE_G_SHARP_2, "QK_MIDI_NOTE_G_SHARP_2"},
+ {QK_MIDI_NOTE_A_2, "QK_MIDI_NOTE_A_2"},
+ {QK_MIDI_NOTE_A_SHARP_2, "QK_MIDI_NOTE_A_SHARP_2"},
+ {QK_MIDI_NOTE_B_2, "QK_MIDI_NOTE_B_2"},
+ {QK_MIDI_NOTE_C_3, "QK_MIDI_NOTE_C_3"},
+ {QK_MIDI_NOTE_C_SHARP_3, "QK_MIDI_NOTE_C_SHARP_3"},
+ {QK_MIDI_NOTE_D_3, "QK_MIDI_NOTE_D_3"},
+ {QK_MIDI_NOTE_D_SHARP_3, "QK_MIDI_NOTE_D_SHARP_3"},
+ {QK_MIDI_NOTE_E_3, "QK_MIDI_NOTE_E_3"},
+ {QK_MIDI_NOTE_F_3, "QK_MIDI_NOTE_F_3"},
+ {QK_MIDI_NOTE_F_SHARP_3, "QK_MIDI_NOTE_F_SHARP_3"},
+ {QK_MIDI_NOTE_G_3, "QK_MIDI_NOTE_G_3"},
+ {QK_MIDI_NOTE_G_SHARP_3, "QK_MIDI_NOTE_G_SHARP_3"},
+ {QK_MIDI_NOTE_A_3, "QK_MIDI_NOTE_A_3"},
+ {QK_MIDI_NOTE_A_SHARP_3, "QK_MIDI_NOTE_A_SHARP_3"},
+ {QK_MIDI_NOTE_B_3, "QK_MIDI_NOTE_B_3"},
+ {QK_MIDI_NOTE_C_4, "QK_MIDI_NOTE_C_4"},
+ {QK_MIDI_NOTE_C_SHARP_4, "QK_MIDI_NOTE_C_SHARP_4"},
+ {QK_MIDI_NOTE_D_4, "QK_MIDI_NOTE_D_4"},
+ {QK_MIDI_NOTE_D_SHARP_4, "QK_MIDI_NOTE_D_SHARP_4"},
+ {QK_MIDI_NOTE_E_4, "QK_MIDI_NOTE_E_4"},
+ {QK_MIDI_NOTE_F_4, "QK_MIDI_NOTE_F_4"},
+ {QK_MIDI_NOTE_F_SHARP_4, "QK_MIDI_NOTE_F_SHARP_4"},
+ {QK_MIDI_NOTE_G_4, "QK_MIDI_NOTE_G_4"},
+ {QK_MIDI_NOTE_G_SHARP_4, "QK_MIDI_NOTE_G_SHARP_4"},
+ {QK_MIDI_NOTE_A_4, "QK_MIDI_NOTE_A_4"},
+ {QK_MIDI_NOTE_A_SHARP_4, "QK_MIDI_NOTE_A_SHARP_4"},
+ {QK_MIDI_NOTE_B_4, "QK_MIDI_NOTE_B_4"},
+ {QK_MIDI_NOTE_C_5, "QK_MIDI_NOTE_C_5"},
+ {QK_MIDI_NOTE_C_SHARP_5, "QK_MIDI_NOTE_C_SHARP_5"},
+ {QK_MIDI_NOTE_D_5, "QK_MIDI_NOTE_D_5"},
+ {QK_MIDI_NOTE_D_SHARP_5, "QK_MIDI_NOTE_D_SHARP_5"},
+ {QK_MIDI_NOTE_E_5, "QK_MIDI_NOTE_E_5"},
+ {QK_MIDI_NOTE_F_5, "QK_MIDI_NOTE_F_5"},
+ {QK_MIDI_NOTE_F_SHARP_5, "QK_MIDI_NOTE_F_SHARP_5"},
+ {QK_MIDI_NOTE_G_5, "QK_MIDI_NOTE_G_5"},
+ {QK_MIDI_NOTE_G_SHARP_5, "QK_MIDI_NOTE_G_SHARP_5"},
+ {QK_MIDI_NOTE_A_5, "QK_MIDI_NOTE_A_5"},
+ {QK_MIDI_NOTE_A_SHARP_5, "QK_MIDI_NOTE_A_SHARP_5"},
+ {QK_MIDI_NOTE_B_5, "QK_MIDI_NOTE_B_5"},
+ {QK_MIDI_OCTAVE_N2, "QK_MIDI_OCTAVE_N2"},
+ {QK_MIDI_OCTAVE_N1, "QK_MIDI_OCTAVE_N1"},
+ {QK_MIDI_OCTAVE_0, "QK_MIDI_OCTAVE_0"},
+ {QK_MIDI_OCTAVE_1, "QK_MIDI_OCTAVE_1"},
+ {QK_MIDI_OCTAVE_2, "QK_MIDI_OCTAVE_2"},
+ {QK_MIDI_OCTAVE_3, "QK_MIDI_OCTAVE_3"},
+ {QK_MIDI_OCTAVE_4, "QK_MIDI_OCTAVE_4"},
+ {QK_MIDI_OCTAVE_5, "QK_MIDI_OCTAVE_5"},
+ {QK_MIDI_OCTAVE_6, "QK_MIDI_OCTAVE_6"},
+ {QK_MIDI_OCTAVE_7, "QK_MIDI_OCTAVE_7"},
+ {QK_MIDI_OCTAVE_DOWN, "QK_MIDI_OCTAVE_DOWN"},
+ {QK_MIDI_OCTAVE_UP, "QK_MIDI_OCTAVE_UP"},
+ {QK_MIDI_TRANSPOSE_N6, "QK_MIDI_TRANSPOSE_N6"},
+ {QK_MIDI_TRANSPOSE_N5, "QK_MIDI_TRANSPOSE_N5"},
+ {QK_MIDI_TRANSPOSE_N4, "QK_MIDI_TRANSPOSE_N4"},
+ {QK_MIDI_TRANSPOSE_N3, "QK_MIDI_TRANSPOSE_N3"},
+ {QK_MIDI_TRANSPOSE_N2, "QK_MIDI_TRANSPOSE_N2"},
+ {QK_MIDI_TRANSPOSE_N1, "QK_MIDI_TRANSPOSE_N1"},
+ {QK_MIDI_TRANSPOSE_0, "QK_MIDI_TRANSPOSE_0"},
+ {QK_MIDI_TRANSPOSE_1, "QK_MIDI_TRANSPOSE_1"},
+ {QK_MIDI_TRANSPOSE_2, "QK_MIDI_TRANSPOSE_2"},
+ {QK_MIDI_TRANSPOSE_3, "QK_MIDI_TRANSPOSE_3"},
+ {QK_MIDI_TRANSPOSE_4, "QK_MIDI_TRANSPOSE_4"},
+ {QK_MIDI_TRANSPOSE_5, "QK_MIDI_TRANSPOSE_5"},
+ {QK_MIDI_TRANSPOSE_6, "QK_MIDI_TRANSPOSE_6"},
+ {QK_MIDI_TRANSPOSE_DOWN, "QK_MIDI_TRANSPOSE_DOWN"},
+ {QK_MIDI_TRANSPOSE_UP, "QK_MIDI_TRANSPOSE_UP"},
+ {QK_MIDI_VELOCITY_0, "QK_MIDI_VELOCITY_0"},
+ {QK_MIDI_VELOCITY_1, "QK_MIDI_VELOCITY_1"},
+ {QK_MIDI_VELOCITY_2, "QK_MIDI_VELOCITY_2"},
+ {QK_MIDI_VELOCITY_3, "QK_MIDI_VELOCITY_3"},
+ {QK_MIDI_VELOCITY_4, "QK_MIDI_VELOCITY_4"},
+ {QK_MIDI_VELOCITY_5, "QK_MIDI_VELOCITY_5"},
+ {QK_MIDI_VELOCITY_6, "QK_MIDI_VELOCITY_6"},
+ {QK_MIDI_VELOCITY_7, "QK_MIDI_VELOCITY_7"},
+ {QK_MIDI_VELOCITY_8, "QK_MIDI_VELOCITY_8"},
+ {QK_MIDI_VELOCITY_9, "QK_MIDI_VELOCITY_9"},
+ {QK_MIDI_VELOCITY_10, "QK_MIDI_VELOCITY_10"},
+ {QK_MIDI_VELOCITY_DOWN, "QK_MIDI_VELOCITY_DOWN"},
+ {QK_MIDI_VELOCITY_UP, "QK_MIDI_VELOCITY_UP"},
+ {QK_MIDI_CHANNEL_1, "QK_MIDI_CHANNEL_1"},
+ {QK_MIDI_CHANNEL_2, "QK_MIDI_CHANNEL_2"},
+ {QK_MIDI_CHANNEL_3, "QK_MIDI_CHANNEL_3"},
+ {QK_MIDI_CHANNEL_4, "QK_MIDI_CHANNEL_4"},
+ {QK_MIDI_CHANNEL_5, "QK_MIDI_CHANNEL_5"},
+ {QK_MIDI_CHANNEL_6, "QK_MIDI_CHANNEL_6"},
+ {QK_MIDI_CHANNEL_7, "QK_MIDI_CHANNEL_7"},
+ {QK_MIDI_CHANNEL_8, "QK_MIDI_CHANNEL_8"},
+ {QK_MIDI_CHANNEL_9, "QK_MIDI_CHANNEL_9"},
+ {QK_MIDI_CHANNEL_10, "QK_MIDI_CHANNEL_10"},
+ {QK_MIDI_CHANNEL_11, "QK_MIDI_CHANNEL_11"},
+ {QK_MIDI_CHANNEL_12, "QK_MIDI_CHANNEL_12"},
+ {QK_MIDI_CHANNEL_13, "QK_MIDI_CHANNEL_13"},
+ {QK_MIDI_CHANNEL_14, "QK_MIDI_CHANNEL_14"},
+ {QK_MIDI_CHANNEL_15, "QK_MIDI_CHANNEL_15"},
+ {QK_MIDI_CHANNEL_16, "QK_MIDI_CHANNEL_16"},
+ {QK_MIDI_CHANNEL_DOWN, "QK_MIDI_CHANNEL_DOWN"},
+ {QK_MIDI_CHANNEL_UP, "QK_MIDI_CHANNEL_UP"},
+ {QK_MIDI_ALL_NOTES_OFF, "QK_MIDI_ALL_NOTES_OFF"},
+ {QK_MIDI_SUSTAIN, "QK_MIDI_SUSTAIN"},
+ {QK_MIDI_PORTAMENTO, "QK_MIDI_PORTAMENTO"},
+ {QK_MIDI_SOSTENUTO, "QK_MIDI_SOSTENUTO"},
+ {QK_MIDI_SOFT, "QK_MIDI_SOFT"},
+ {QK_MIDI_LEGATO, "QK_MIDI_LEGATO"},
+ {QK_MIDI_MODULATION, "QK_MIDI_MODULATION"},
+ {QK_MIDI_MODULATION_SPEED_DOWN, "QK_MIDI_MODULATION_SPEED_DOWN"},
+ {QK_MIDI_MODULATION_SPEED_UP, "QK_MIDI_MODULATION_SPEED_UP"},
+ {QK_MIDI_PITCH_BEND_DOWN, "QK_MIDI_PITCH_BEND_DOWN"},
+ {QK_MIDI_PITCH_BEND_UP, "QK_MIDI_PITCH_BEND_UP"},
+ {SQ_ON, "SQ_ON"},
+ {SQ_OFF, "SQ_OFF"},
+ {SQ_TOG, "SQ_TOG"},
+ {SQ_TMPD, "SQ_TMPD"},
+ {SQ_TMPU, "SQ_TMPU"},
+ {SQ_RESD, "SQ_RESD"},
+ {SQ_RESU, "SQ_RESU"},
+ {SQ_SALL, "SQ_SALL"},
+ {SQ_SCLR, "SQ_SCLR"},
+ {QK_JOYSTICK_BUTTON_0, "QK_JOYSTICK_BUTTON_0"},
+ {QK_JOYSTICK_BUTTON_1, "QK_JOYSTICK_BUTTON_1"},
+ {QK_JOYSTICK_BUTTON_2, "QK_JOYSTICK_BUTTON_2"},
+ {QK_JOYSTICK_BUTTON_3, "QK_JOYSTICK_BUTTON_3"},
+ {QK_JOYSTICK_BUTTON_4, "QK_JOYSTICK_BUTTON_4"},
+ {QK_JOYSTICK_BUTTON_5, "QK_JOYSTICK_BUTTON_5"},
+ {QK_JOYSTICK_BUTTON_6, "QK_JOYSTICK_BUTTON_6"},
+ {QK_JOYSTICK_BUTTON_7, "QK_JOYSTICK_BUTTON_7"},
+ {QK_JOYSTICK_BUTTON_8, "QK_JOYSTICK_BUTTON_8"},
+ {QK_JOYSTICK_BUTTON_9, "QK_JOYSTICK_BUTTON_9"},
+ {QK_JOYSTICK_BUTTON_10, "QK_JOYSTICK_BUTTON_10"},
+ {QK_JOYSTICK_BUTTON_11, "QK_JOYSTICK_BUTTON_11"},
+ {QK_JOYSTICK_BUTTON_12, "QK_JOYSTICK_BUTTON_12"},
+ {QK_JOYSTICK_BUTTON_13, "QK_JOYSTICK_BUTTON_13"},
+ {QK_JOYSTICK_BUTTON_14, "QK_JOYSTICK_BUTTON_14"},
+ {QK_JOYSTICK_BUTTON_15, "QK_JOYSTICK_BUTTON_15"},
+ {QK_JOYSTICK_BUTTON_16, "QK_JOYSTICK_BUTTON_16"},
+ {QK_JOYSTICK_BUTTON_17, "QK_JOYSTICK_BUTTON_17"},
+ {QK_JOYSTICK_BUTTON_18, "QK_JOYSTICK_BUTTON_18"},
+ {QK_JOYSTICK_BUTTON_19, "QK_JOYSTICK_BUTTON_19"},
+ {QK_JOYSTICK_BUTTON_20, "QK_JOYSTICK_BUTTON_20"},
+ {QK_JOYSTICK_BUTTON_21, "QK_JOYSTICK_BUTTON_21"},
+ {QK_JOYSTICK_BUTTON_22, "QK_JOYSTICK_BUTTON_22"},
+ {QK_JOYSTICK_BUTTON_23, "QK_JOYSTICK_BUTTON_23"},
+ {QK_JOYSTICK_BUTTON_24, "QK_JOYSTICK_BUTTON_24"},
+ {QK_JOYSTICK_BUTTON_25, "QK_JOYSTICK_BUTTON_25"},
+ {QK_JOYSTICK_BUTTON_26, "QK_JOYSTICK_BUTTON_26"},
+ {QK_JOYSTICK_BUTTON_27, "QK_JOYSTICK_BUTTON_27"},
+ {QK_JOYSTICK_BUTTON_28, "QK_JOYSTICK_BUTTON_28"},
+ {QK_JOYSTICK_BUTTON_29, "QK_JOYSTICK_BUTTON_29"},
+ {QK_JOYSTICK_BUTTON_30, "QK_JOYSTICK_BUTTON_30"},
+ {QK_JOYSTICK_BUTTON_31, "QK_JOYSTICK_BUTTON_31"},
+ {QK_PROGRAMMABLE_BUTTON_1, "QK_PROGRAMMABLE_BUTTON_1"},
+ {QK_PROGRAMMABLE_BUTTON_2, "QK_PROGRAMMABLE_BUTTON_2"},
+ {QK_PROGRAMMABLE_BUTTON_3, "QK_PROGRAMMABLE_BUTTON_3"},
+ {QK_PROGRAMMABLE_BUTTON_4, "QK_PROGRAMMABLE_BUTTON_4"},
+ {QK_PROGRAMMABLE_BUTTON_5, "QK_PROGRAMMABLE_BUTTON_5"},
+ {QK_PROGRAMMABLE_BUTTON_6, "QK_PROGRAMMABLE_BUTTON_6"},
+ {QK_PROGRAMMABLE_BUTTON_7, "QK_PROGRAMMABLE_BUTTON_7"},
+ {QK_PROGRAMMABLE_BUTTON_8, "QK_PROGRAMMABLE_BUTTON_8"},
+ {QK_PROGRAMMABLE_BUTTON_9, "QK_PROGRAMMABLE_BUTTON_9"},
+ {QK_PROGRAMMABLE_BUTTON_10, "QK_PROGRAMMABLE_BUTTON_10"},
+ {QK_PROGRAMMABLE_BUTTON_11, "QK_PROGRAMMABLE_BUTTON_11"},
+ {QK_PROGRAMMABLE_BUTTON_12, "QK_PROGRAMMABLE_BUTTON_12"},
+ {QK_PROGRAMMABLE_BUTTON_13, "QK_PROGRAMMABLE_BUTTON_13"},
+ {QK_PROGRAMMABLE_BUTTON_14, "QK_PROGRAMMABLE_BUTTON_14"},
+ {QK_PROGRAMMABLE_BUTTON_15, "QK_PROGRAMMABLE_BUTTON_15"},
+ {QK_PROGRAMMABLE_BUTTON_16, "QK_PROGRAMMABLE_BUTTON_16"},
+ {QK_PROGRAMMABLE_BUTTON_17, "QK_PROGRAMMABLE_BUTTON_17"},
+ {QK_PROGRAMMABLE_BUTTON_18, "QK_PROGRAMMABLE_BUTTON_18"},
+ {QK_PROGRAMMABLE_BUTTON_19, "QK_PROGRAMMABLE_BUTTON_19"},
+ {QK_PROGRAMMABLE_BUTTON_20, "QK_PROGRAMMABLE_BUTTON_20"},
+ {QK_PROGRAMMABLE_BUTTON_21, "QK_PROGRAMMABLE_BUTTON_21"},
+ {QK_PROGRAMMABLE_BUTTON_22, "QK_PROGRAMMABLE_BUTTON_22"},
+ {QK_PROGRAMMABLE_BUTTON_23, "QK_PROGRAMMABLE_BUTTON_23"},
+ {QK_PROGRAMMABLE_BUTTON_24, "QK_PROGRAMMABLE_BUTTON_24"},
+ {QK_PROGRAMMABLE_BUTTON_25, "QK_PROGRAMMABLE_BUTTON_25"},
+ {QK_PROGRAMMABLE_BUTTON_26, "QK_PROGRAMMABLE_BUTTON_26"},
+ {QK_PROGRAMMABLE_BUTTON_27, "QK_PROGRAMMABLE_BUTTON_27"},
+ {QK_PROGRAMMABLE_BUTTON_28, "QK_PROGRAMMABLE_BUTTON_28"},
+ {QK_PROGRAMMABLE_BUTTON_29, "QK_PROGRAMMABLE_BUTTON_29"},
+ {QK_PROGRAMMABLE_BUTTON_30, "QK_PROGRAMMABLE_BUTTON_30"},
+ {QK_PROGRAMMABLE_BUTTON_31, "QK_PROGRAMMABLE_BUTTON_31"},
+ {QK_PROGRAMMABLE_BUTTON_32, "QK_PROGRAMMABLE_BUTTON_32"},
+ {QK_AUDIO_ON, "QK_AUDIO_ON"},
+ {QK_AUDIO_OFF, "QK_AUDIO_OFF"},
+ {QK_AUDIO_TOGGLE, "QK_AUDIO_TOGGLE"},
+ {QK_AUDIO_CLICKY_TOGGLE, "QK_AUDIO_CLICKY_TOGGLE"},
+ {QK_AUDIO_CLICKY_ON, "QK_AUDIO_CLICKY_ON"},
+ {QK_AUDIO_CLICKY_OFF, "QK_AUDIO_CLICKY_OFF"},
+ {QK_AUDIO_CLICKY_UP, "QK_AUDIO_CLICKY_UP"},
+ {QK_AUDIO_CLICKY_DOWN, "QK_AUDIO_CLICKY_DOWN"},
+ {QK_AUDIO_CLICKY_RESET, "QK_AUDIO_CLICKY_RESET"},
+ {QK_MUSIC_ON, "QK_MUSIC_ON"},
+ {QK_MUSIC_OFF, "QK_MUSIC_OFF"},
+ {QK_MUSIC_TOGGLE, "QK_MUSIC_TOGGLE"},
+ {QK_MUSIC_MODE_NEXT, "QK_MUSIC_MODE_NEXT"},
+ {QK_AUDIO_VOICE_NEXT, "QK_AUDIO_VOICE_NEXT"},
+ {QK_AUDIO_VOICE_PREVIOUS, "QK_AUDIO_VOICE_PREVIOUS"},
+ {QK_STENO_BOLT, "QK_STENO_BOLT"},
+ {QK_STENO_GEMINI, "QK_STENO_GEMINI"},
+ {QK_STENO_COMB, "QK_STENO_COMB"},
+ {QK_STENO_COMB_MAX, "QK_STENO_COMB_MAX"},
+ {QK_MACRO_0, "QK_MACRO_0"},
+ {QK_MACRO_1, "QK_MACRO_1"},
+ {QK_MACRO_2, "QK_MACRO_2"},
+ {QK_MACRO_3, "QK_MACRO_3"},
+ {QK_MACRO_4, "QK_MACRO_4"},
+ {QK_MACRO_5, "QK_MACRO_5"},
+ {QK_MACRO_6, "QK_MACRO_6"},
+ {QK_MACRO_7, "QK_MACRO_7"},
+ {QK_MACRO_8, "QK_MACRO_8"},
+ {QK_MACRO_9, "QK_MACRO_9"},
+ {QK_MACRO_10, "QK_MACRO_10"},
+ {QK_MACRO_11, "QK_MACRO_11"},
+ {QK_MACRO_12, "QK_MACRO_12"},
+ {QK_MACRO_13, "QK_MACRO_13"},
+ {QK_MACRO_14, "QK_MACRO_14"},
+ {QK_MACRO_15, "QK_MACRO_15"},
+ {QK_MACRO_16, "QK_MACRO_16"},
+ {QK_MACRO_17, "QK_MACRO_17"},
+ {QK_MACRO_18, "QK_MACRO_18"},
+ {QK_MACRO_19, "QK_MACRO_19"},
+ {QK_MACRO_20, "QK_MACRO_20"},
+ {QK_MACRO_21, "QK_MACRO_21"},
+ {QK_MACRO_22, "QK_MACRO_22"},
+ {QK_MACRO_23, "QK_MACRO_23"},
+ {QK_MACRO_24, "QK_MACRO_24"},
+ {QK_MACRO_25, "QK_MACRO_25"},
+ {QK_MACRO_26, "QK_MACRO_26"},
+ {QK_MACRO_27, "QK_MACRO_27"},
+ {QK_MACRO_28, "QK_MACRO_28"},
+ {QK_MACRO_29, "QK_MACRO_29"},
+ {QK_MACRO_30, "QK_MACRO_30"},
+ {QK_MACRO_31, "QK_MACRO_31"},
+ {QK_BACKLIGHT_ON, "QK_BACKLIGHT_ON"},
+ {QK_BACKLIGHT_OFF, "QK_BACKLIGHT_OFF"},
+ {QK_BACKLIGHT_TOGGLE, "QK_BACKLIGHT_TOGGLE"},
+ {QK_BACKLIGHT_DOWN, "QK_BACKLIGHT_DOWN"},
+ {QK_BACKLIGHT_UP, "QK_BACKLIGHT_UP"},
+ {QK_BACKLIGHT_STEP, "QK_BACKLIGHT_STEP"},
+ {QK_BACKLIGHT_TOGGLE_BREATHING, "QK_BACKLIGHT_TOGGLE_BREATHING"},
+ {RGB_TOG, "RGB_TOG"},
+ {RGB_MODE_FORWARD, "RGB_MODE_FORWARD"},
+ {RGB_MODE_REVERSE, "RGB_MODE_REVERSE"},
+ {RGB_HUI, "RGB_HUI"},
+ {RGB_HUD, "RGB_HUD"},
+ {RGB_SAI, "RGB_SAI"},
+ {RGB_SAD, "RGB_SAD"},
+ {RGB_VAI, "RGB_VAI"},
+ {RGB_VAD, "RGB_VAD"},
+ {RGB_SPI, "RGB_SPI"},
+ {RGB_SPD, "RGB_SPD"},
+ {RGB_MODE_PLAIN, "RGB_MODE_PLAIN"},
+ {RGB_MODE_BREATHE, "RGB_MODE_BREATHE"},
+ {RGB_MODE_RAINBOW, "RGB_MODE_RAINBOW"},
+ {RGB_MODE_SWIRL, "RGB_MODE_SWIRL"},
+ {RGB_MODE_SNAKE, "RGB_MODE_SNAKE"},
+ {RGB_MODE_KNIGHT, "RGB_MODE_KNIGHT"},
+ {RGB_MODE_XMAS, "RGB_MODE_XMAS"},
+ {RGB_MODE_GRADIENT, "RGB_MODE_GRADIENT"},
+ {RGB_MODE_RGBTEST, "RGB_MODE_RGBTEST"},
+ {RGB_MODE_TWINKLE, "RGB_MODE_TWINKLE"},
+ {QK_BOOTLOADER, "QK_BOOTLOADER"},
+ {QK_REBOOT, "QK_REBOOT"},
+ {QK_DEBUG_TOGGLE, "QK_DEBUG_TOGGLE"},
+ {QK_CLEAR_EEPROM, "QK_CLEAR_EEPROM"},
+ {QK_MAKE, "QK_MAKE"},
+ {QK_AUTO_SHIFT_DOWN, "QK_AUTO_SHIFT_DOWN"},
+ {QK_AUTO_SHIFT_UP, "QK_AUTO_SHIFT_UP"},
+ {QK_AUTO_SHIFT_REPORT, "QK_AUTO_SHIFT_REPORT"},
+ {QK_AUTO_SHIFT_ON, "QK_AUTO_SHIFT_ON"},
+ {QK_AUTO_SHIFT_OFF, "QK_AUTO_SHIFT_OFF"},
+ {QK_AUTO_SHIFT_TOGGLE, "QK_AUTO_SHIFT_TOGGLE"},
+ {QK_GRAVE_ESCAPE, "QK_GRAVE_ESCAPE"},
+ {QK_VELOCIKEY_TOGGLE, "QK_VELOCIKEY_TOGGLE"},
+ {QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN, "QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN"},
+ {QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE, "QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE"},
+ {QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN, "QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN"},
+ {QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE, "QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE"},
+ {QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN, "QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN"},
+ {QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE, "QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE"},
+ {QK_SPACE_CADET_RIGHT_SHIFT_ENTER, "QK_SPACE_CADET_RIGHT_SHIFT_ENTER"},
+ {QK_OUTPUT_AUTO, "QK_OUTPUT_AUTO"},
+ {QK_OUTPUT_USB, "QK_OUTPUT_USB"},
+ {QK_OUTPUT_BLUETOOTH, "QK_OUTPUT_BLUETOOTH"},
+ {QK_UNICODE_MODE_NEXT, "QK_UNICODE_MODE_NEXT"},
+ {QK_UNICODE_MODE_PREVIOUS, "QK_UNICODE_MODE_PREVIOUS"},
+ {QK_UNICODE_MODE_MACOS, "QK_UNICODE_MODE_MACOS"},
+ {QK_UNICODE_MODE_LINUX, "QK_UNICODE_MODE_LINUX"},
+ {QK_UNICODE_MODE_WINDOWS, "QK_UNICODE_MODE_WINDOWS"},
+ {QK_UNICODE_MODE_BSD, "QK_UNICODE_MODE_BSD"},
+ {QK_UNICODE_MODE_WINCOMPOSE, "QK_UNICODE_MODE_WINCOMPOSE"},
+ {QK_UNICODE_MODE_EMACS, "QK_UNICODE_MODE_EMACS"},
+ {QK_HAPTIC_ON, "QK_HAPTIC_ON"},
+ {QK_HAPTIC_OFF, "QK_HAPTIC_OFF"},
+ {QK_HAPTIC_TOGGLE, "QK_HAPTIC_TOGGLE"},
+ {QK_HAPTIC_RESET, "QK_HAPTIC_RESET"},
+ {QK_HAPTIC_FEEDBACK_TOGGLE, "QK_HAPTIC_FEEDBACK_TOGGLE"},
+ {QK_HAPTIC_BUZZ_TOGGLE, "QK_HAPTIC_BUZZ_TOGGLE"},
+ {QK_HAPTIC_MODE_NEXT, "QK_HAPTIC_MODE_NEXT"},
+ {QK_HAPTIC_MODE_PREVIOUS, "QK_HAPTIC_MODE_PREVIOUS"},
+ {QK_HAPTIC_CONTINUOUS_TOGGLE, "QK_HAPTIC_CONTINUOUS_TOGGLE"},
+ {QK_HAPTIC_CONTINUOUS_UP, "QK_HAPTIC_CONTINUOUS_UP"},
+ {QK_HAPTIC_CONTINUOUS_DOWN, "QK_HAPTIC_CONTINUOUS_DOWN"},
+ {QK_HAPTIC_DWELL_UP, "QK_HAPTIC_DWELL_UP"},
+ {QK_HAPTIC_DWELL_DOWN, "QK_HAPTIC_DWELL_DOWN"},
+ {QK_COMBO_ON, "QK_COMBO_ON"},
+ {QK_COMBO_OFF, "QK_COMBO_OFF"},
+ {QK_COMBO_TOGGLE, "QK_COMBO_TOGGLE"},
+ {QK_DYNAMIC_MACRO_RECORD_START_1, "QK_DYNAMIC_MACRO_RECORD_START_1"},
+ {QK_DYNAMIC_MACRO_RECORD_START_2, "QK_DYNAMIC_MACRO_RECORD_START_2"},
+ {QK_DYNAMIC_MACRO_RECORD_STOP, "QK_DYNAMIC_MACRO_RECORD_STOP"},
+ {QK_DYNAMIC_MACRO_PLAY_1, "QK_DYNAMIC_MACRO_PLAY_1"},
+ {QK_DYNAMIC_MACRO_PLAY_2, "QK_DYNAMIC_MACRO_PLAY_2"},
+ {QK_LEADER, "QK_LEADER"},
+ {QK_LOCK, "QK_LOCK"},
+ {QK_ONE_SHOT_ON, "QK_ONE_SHOT_ON"},
+ {QK_ONE_SHOT_OFF, "QK_ONE_SHOT_OFF"},
+ {QK_ONE_SHOT_TOGGLE, "QK_ONE_SHOT_TOGGLE"},
+ {QK_KEY_OVERRIDE_TOGGLE, "QK_KEY_OVERRIDE_TOGGLE"},
+ {QK_KEY_OVERRIDE_ON, "QK_KEY_OVERRIDE_ON"},
+ {QK_KEY_OVERRIDE_OFF, "QK_KEY_OVERRIDE_OFF"},
+ {QK_SECURE_LOCK, "QK_SECURE_LOCK"},
+ {QK_SECURE_UNLOCK, "QK_SECURE_UNLOCK"},
+ {QK_SECURE_TOGGLE, "QK_SECURE_TOGGLE"},
+ {QK_SECURE_REQUEST, "QK_SECURE_REQUEST"},
+ {QK_DYNAMIC_TAPPING_TERM_PRINT, "QK_DYNAMIC_TAPPING_TERM_PRINT"},
+ {QK_DYNAMIC_TAPPING_TERM_UP, "QK_DYNAMIC_TAPPING_TERM_UP"},
+ {QK_DYNAMIC_TAPPING_TERM_DOWN, "QK_DYNAMIC_TAPPING_TERM_DOWN"},
+ {QK_CAPS_WORD_TOGGLE, "QK_CAPS_WORD_TOGGLE"},
+ {QK_AUTOCORRECT_ON, "QK_AUTOCORRECT_ON"},
+ {QK_AUTOCORRECT_OFF, "QK_AUTOCORRECT_OFF"},
+ {QK_AUTOCORRECT_TOGGLE, "QK_AUTOCORRECT_TOGGLE"},
+ {SAFE_RANGE, "SAFE_RANGE"},
+};
diff --git a/tests/test_common/keycode_util.cpp b/tests/test_common/keycode_util.cpp
new file mode 100644
index 0000000000..9f88d40ec7
--- /dev/null
+++ b/tests/test_common/keycode_util.cpp
@@ -0,0 +1,128 @@
+#include "keycode_util.hpp"
+#include <cstdint>
+extern "C" {
+#include "action_code.h"
+#include "keycode.h"
+#include "quantum_keycodes.h"
+#include "util.h"
+}
+#include <string>
+#include <iomanip>
+#include <map>
+
+extern std::map<uint16_t, std::string> KEYCODE_ID_TABLE;
+
+std::string get_mods(uint8_t mods) {
+ std::stringstream s;
+ if ((mods & MOD_RCTL) == MOD_RCTL) {
+ s << XSTR(MOD_RCTL) << " | ";
+ } else if ((mods & MOD_LCTL) == MOD_LCTL) {
+ s << XSTR(MOD_LCTL) << " | ";
+ }
+
+ if ((mods & MOD_RSFT) == MOD_RSFT) {
+ s << XSTR(MOD_RSFT) << " | ";
+ } else if ((mods & MOD_LSFT) == MOD_LSFT) {
+ s << XSTR(MOD_LSFT) << " | ";
+ }
+
+ if ((mods & MOD_RALT) == MOD_RALT) {
+ s << XSTR(MOD_RALT) << " | ";
+ } else if ((mods & MOD_LALT) == MOD_LALT) {
+ s << XSTR(MOD_LALT) << " | ";
+ }
+
+ if ((mods & MOD_RGUI) == MOD_RGUI) {
+ s << XSTR(MOD_RGUI) << " | ";
+ } else if ((mods & MOD_LGUI) == MOD_LGUI) {
+ s << XSTR(MOD_LGUI) << " | ";
+ }
+
+ auto _mods = s.str();
+
+ if (_mods.size()) {
+ _mods.resize(_mods.size() - 3);
+ }
+
+ return std::string(_mods);
+}
+
+std::string get_qk_mods(uint16_t keycode) {
+ std::stringstream s;
+ if ((keycode & QK_RCTL) == QK_RCTL) {
+ s << XSTR(QK_RCTL) << " | ";
+ } else if ((keycode & QK_LCTL) == QK_LCTL) {
+ s << XSTR(QK_LCTL) << " | ";
+ }
+
+ if ((keycode & QK_RSFT) == QK_RSFT) {
+ s << XSTR(QK_RSFT) << " | ";
+ } else if ((keycode & QK_LSFT) == QK_LSFT) {
+ s << XSTR(QK_LSFT) << " | ";
+ }
+
+ if ((keycode & QK_RALT) == QK_RALT) {
+ s << XSTR(QK_RALT) << " | ";
+ } else if ((keycode & QK_LALT) == QK_LALT) {
+ s << XSTR(QK_LALT) << " | ";
+ }
+
+ if ((keycode & QK_RGUI) == QK_RGUI) {
+ s << XSTR(QK_RGUI) << " | ";
+ } else if ((keycode & QK_LGUI) == QK_LGUI) {
+ s << XSTR(QK_LGUI) << " | ";
+ }
+
+ auto _mods = s.str();
+
+ if (_mods.size()) {
+ _mods.resize(_mods.size() - 3);
+ }
+
+ return std::string(_mods);
+}
+
+std::string generate_identifier(uint16_t kc) {
+ std::stringstream s;
+ if (IS_QK_MOD_TAP(kc)) {
+ s << "MT(" << get_mods(QK_MOD_TAP_GET_MODS(kc)) << ", " << KEYCODE_ID_TABLE.at(kc & 0xFF) << ")";
+ } else if (IS_QK_LAYER_TAP(kc)) {
+ s << "LT(" << +QK_LAYER_TAP_GET_LAYER(kc) << ", " << KEYCODE_ID_TABLE.at(kc & 0xFF) << ")";
+ } else if (IS_QK_TO(kc)) {
+ s << "TO(" << +QK_TO_GET_LAYER(kc) << ")";
+ } else if (IS_QK_MOMENTARY(kc)) {
+ s << "MO(" << +QK_MOMENTARY_GET_LAYER(kc) << ")";
+ } else if (IS_QK_DEF_LAYER(kc)) {
+ s << "DF(" << +QK_DEF_LAYER_GET_LAYER(kc) << ")";
+ } else if (IS_QK_TOGGLE_LAYER(kc)) {
+ s << "TG(" << +QK_TOGGLE_LAYER_GET_LAYER(kc) << ")";
+ } else if (IS_QK_LAYER_TAP_TOGGLE(kc)) {
+ s << "TT(" << +QK_LAYER_TAP_TOGGLE_GET_LAYER(kc) << ")";
+ } else if (IS_QK_ONE_SHOT_LAYER(kc)) {
+ s << "OSL(" << +QK_ONE_SHOT_LAYER_GET_LAYER(kc) << ")";
+ } else if (IS_QK_LAYER_MOD(kc)) {
+ s << "LM(" << +QK_LAYER_MOD_GET_LAYER(kc) << ", " << get_mods(QK_LAYER_MOD_GET_MODS(kc)) << ")";
+ } else if (IS_QK_ONE_SHOT_MOD(kc)) {
+ s << "OSM(" << get_mods(QK_ONE_SHOT_MOD_GET_MODS(kc)) << ")";
+ } else if (IS_QK_MODS(kc)) {
+ s << "QK_MODS(" << KEYCODE_ID_TABLE.at(QK_MODS_GET_BASIC_KEYCODE(kc)) << ", " << get_qk_mods(kc) << ")";
+ } else if (IS_QK_TAP_DANCE(kc)) {
+ s << "TD(" << +(kc & 0xFF) << ")";
+ } else {
+ // Fallback - we didn't found any matching keycode, generate the hex representation.
+ s << "unknown keycode: 0x" << std::hex << kc << ". Add conversion to " << XSTR(generate_identifier);
+ }
+
+ return std::string(s.str());
+}
+
+std::string get_keycode_identifier_or_default(uint16_t keycode) {
+ auto identifier = KEYCODE_ID_TABLE.find(keycode);
+ if (identifier != KEYCODE_ID_TABLE.end()) {
+ return identifier->second;
+ }
+
+ KEYCODE_ID_TABLE[keycode] = generate_identifier(keycode);
+
+ return KEYCODE_ID_TABLE[keycode];
+}
diff --git a/tests/test_common/keycode_util.hpp b/tests/test_common/keycode_util.hpp
new file mode 100644
index 0000000000..d5a520d4b2
--- /dev/null
+++ b/tests/test_common/keycode_util.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <string>
+
+std::string get_keycode_identifier_or_default(uint16_t keycode);
diff --git a/tests/test_common/matrix.c b/tests/test_common/matrix.c
index 7b24d560e3..45e76d32c5 100644
--- a/tests/test_common/matrix.c
+++ b/tests/test_common/matrix.c
@@ -41,11 +41,15 @@ void matrix_init_kb(void) {}
void matrix_scan_kb(void) {}
void press_key(uint8_t col, uint8_t row) {
- matrix[row] |= 1 << col;
+ matrix[row] |= (matrix_row_t)1 << col;
}
void release_key(uint8_t col, uint8_t row) {
- matrix[row] &= ~(1 << col);
+ matrix[row] &= ~((matrix_row_t)1 << col);
+}
+
+bool matrix_is_on(uint8_t row, uint8_t col) {
+ return (matrix[row] & ((matrix_row_t)1 << col));
}
void clear_all_keys(void) {
diff --git a/tests/test_common/test_common.hpp b/tests/test_common/test_common.hpp
index a88fa8d7b8..295a6083cd 100644
--- a/tests/test_common/test_common.hpp
+++ b/tests/test_common/test_common.hpp
@@ -22,5 +22,6 @@ extern "C" {
}
#include "test_driver.hpp"
#include "test_matrix.h"
+#include "test_keymap_key.hpp"
#include "keyboard_report_util.hpp"
#include "test_fixture.hpp"
diff --git a/tests/test_common/test_driver.hpp b/tests/test_common/test_driver.hpp
index 982aec6c83..8d09e44840 100644
--- a/tests/test_common/test_driver.hpp
+++ b/tests/test_common/test_driver.hpp
@@ -98,6 +98,12 @@ class TestDriver {
*/
#define EXPECT_NO_REPORT(driver) EXPECT_ANY_REPORT(driver).Times(0)
+/**
+ * @brief Verify and clear all gmock expectations that have been setup until
+ * this point.
+ */
+#define VERIFY_AND_CLEAR(driver) testing::Mock::VerifyAndClearExpectations(&driver)
+
namespace internal {
void expect_unicode_code_point(TestDriver& driver, uint32_t code_point);
} // namespace internal
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index 44694cd390..76daa625ad 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -12,6 +12,7 @@
#include "test_logger.hpp"
#include "test_matrix.h"
#include "test_keymap_key.hpp"
+#include "timer.h"
extern "C" {
#include "action.h"
@@ -41,7 +42,7 @@ extern "C" uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t position) {
}
void TestFixture::SetUpTestCase() {
- test_logger.info() << "TestFixture setup-up start." << std::endl;
+ test_logger.info() << "test fixture setup-up start." << std::endl;
// The following is enough to bootstrap the values set in main
eeconfig_init_quantum();
@@ -50,17 +51,19 @@ void TestFixture::SetUpTestCase() {
TestDriver driver;
keyboard_init();
- test_logger.info() << "TestFixture setup-up end." << std::endl;
+ test_logger.info() << "test fixture setup-up end." << std::endl;
}
void TestFixture::TearDownTestCase() {}
TestFixture::TestFixture() {
m_this = this;
+ timer_clear();
+ test_logger.info() << "tapping term is " << +GET_TAPPING_TERM(KC_TRANSPARENT, &(keyrecord_t){}) << "ms" << std::endl;
}
TestFixture::~TestFixture() {
- test_logger.info() << "TestFixture clean-up start." << std::endl;
+ test_logger.info() << "test fixture clean-up start." << std::endl;
TestDriver driver;
/* Reset keyboard state. */
@@ -79,23 +82,21 @@ TestFixture::~TestFixture() {
#endif
idle_for(TAPPING_TERM * 10);
- testing::Mock::VerifyAndClearExpectations(&driver);
+ VERIFY_AND_CLEAR(driver);
/* Verify that the matrix really is cleared */
EXPECT_NO_REPORT(driver);
idle_for(TAPPING_TERM * 10);
- testing::Mock::VerifyAndClearExpectations(&driver);
-
+ VERIFY_AND_CLEAR(driver);
m_this = nullptr;
- test_logger.info() << "TestFixture clean-up end." << std::endl;
-
+ test_logger.info() << "test fixture clean-up end." << std::endl;
print_test_log();
}
void TestFixture::add_key(KeymapKey key) {
if (this->find_key(key.layer, key.position)) {
- FAIL() << "Key is already mapped for layer " << +key.layer << " and (column,row) (" << +key.position.col << "," << +key.position.row << ")";
+ FAIL() << "key is already mapped for layer " << +key.layer << " and (column,row) (" << +key.position.col << "," << +key.position.row << ")";
}
this->keymap.push_back(key);
@@ -149,7 +150,7 @@ void TestFixture::get_keycode(const layer_t layer, const keypos_t position, uint
/* See if this is done in hardware as well, because this is 100% out of bounds reads on all QMK keebs out there. */
auto msg = [&]() {
std::stringstream msg;
- msg << "Keycode for position (" << +position.col << "," << +position.row << ") requested! This is out of bounds." << std::endl;
+ msg << "keycode for position (" << +position.col << "," << +position.row << ") requested! This is out of bounds." << std::endl;
return msg.str();
}();
@@ -164,17 +165,18 @@ void TestFixture::get_keycode(const layer_t layer, const keypos_t position, uint
return;
}
- FAIL() << "No key is mapped for layer " << +layer << " and (column,row) " << +position.col << "," << +position.row << ")";
+ FAIL() << "no key is mapped for layer " << +layer << " and (column,row) " << +position.col << "," << +position.row << ")";
}
void TestFixture::run_one_scan_loop() {
- keyboard_task();
- advance_time(1);
+ this->idle_for(1);
}
void TestFixture::idle_for(unsigned time) {
+ test_logger.trace() << +time << " keyboard task " << (time > 1 ? "loops" : "loop") << std::endl;
for (unsigned i = 0; i < time; i++) {
- run_one_scan_loop();
+ keyboard_task();
+ advance_time(1);
}
}
@@ -182,12 +184,13 @@ void TestFixture::print_test_log() const {
const ::testing::TestInfo* const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
if (HasFailure()) {
std::cerr << test_info->test_case_name() << "." << test_info->name() << " failed!" << std::endl;
+ test_logger.print_header();
test_logger.print_log();
}
test_logger.reset();
}
void TestFixture::expect_layer_state(layer_t layer_state) const {
- test_logger.trace() << "Layer state: (" << +layer_state << ") Highest layer bit: (" << +get_highest_layer(layer_state) << ")" << std::endl;
+ test_logger.trace() << "layer state: (" << +layer_state << ") highest layer bit: (" << +get_highest_layer(layer_state) << ")" << std::endl;
EXPECT_TRUE(layer_state_is(layer_state));
}
diff --git a/tests/test_common/test_keymap_key.cpp b/tests/test_common/test_keymap_key.cpp
index 878ae097bf..63ae29975b 100644
--- a/tests/test_common/test_keymap_key.cpp
+++ b/tests/test_common/test_keymap_key.cpp
@@ -15,16 +15,26 @@
*/
#include "test_keymap_key.hpp"
+#include <cstdint>
+#include <ios>
+#include "matrix.h"
#include "test_logger.hpp"
#include "gtest/gtest-message.h"
#include "gtest/gtest.h"
+#include "timer.h"
void KeymapKey::press() {
- test_logger.trace() << "Key pressed: (" << +this->position.col << "," << +this->position.row << ")" << std::endl;
+ EXPECT_FALSE(matrix_is_on(position.row, position.col)) << "tried to press key " << this->name << " that was already pressed! Check the test code." << std::endl;
+
press_key(this->position.col, this->position.row);
+ this->timestamp_pressed = timer_read32();
+ test_logger.trace() << std::setw(10) << std::left << "pressed: " << this->name << std::endl;
}
void KeymapKey::release() {
- test_logger.trace() << "Key released: (" << +this->position.col << "," << +this->position.row << ")" << std::endl;
+ EXPECT_TRUE(matrix_is_on(this->position.row, this->position.col)) << "tried to release key " << this->name << " that wasn't pressed before! Check the test code." << std::endl;
+
release_key(this->position.col, this->position.row);
-} \ No newline at end of file
+ uint32_t now = timer_read32();
+ test_logger.trace() << std::setw(10) << std::left << "released: " << this->name << " was pressed for " << now - this->timestamp_pressed << "ms" << std::endl;
+}
diff --git a/tests/test_common/test_keymap_key.hpp b/tests/test_common/test_keymap_key.hpp
index 7861cb4a32..37b4c827e4 100644
--- a/tests/test_common/test_keymap_key.hpp
+++ b/tests/test_common/test_keymap_key.hpp
@@ -16,6 +16,9 @@
#pragma once
+#include <cstddef>
+#include <string>
+#include "keycode_util.hpp"
extern "C" {
#include "keyboard.h"
#include "test_matrix.h"
@@ -26,8 +29,13 @@ extern "C" {
typedef uint8_t layer_t;
struct KeymapKey {
- KeymapKey(layer_t layer, uint8_t col, uint8_t row, uint16_t keycode) : layer(layer), position({.col = col, .row = row}), code(keycode), report_code(keycode) { validate(); }
- KeymapKey(layer_t layer, uint8_t col, uint8_t row, uint16_t keycode, uint16_t report_code) : layer(layer), position({.col = col, .row = row}), code(keycode), report_code(report_code) { validate(); }
+ KeymapKey(layer_t layer, uint8_t col, uint8_t row, uint16_t keycode) : layer(layer), position({.col = col, .row = row}), code(keycode), report_code(keycode), name(get_keycode_identifier_or_default(keycode)) {
+ validate();
+ }
+
+ KeymapKey(layer_t layer, uint8_t col, uint8_t row, uint16_t keycode, uint16_t report_code) : layer(layer), position({.col = col, .row = row}), code(keycode), report_code(report_code), name{get_keycode_identifier_or_default(keycode)} {
+ validate();
+ }
void press();
void release();
@@ -35,6 +43,7 @@ struct KeymapKey {
const layer_t layer;
const keypos_t position;
const uint16_t code;
+ std::string name;
/* Sometimes the keycode does not match the code that is send in the usb report, so we provide it here. */
const uint16_t report_code;
@@ -43,4 +52,5 @@ struct KeymapKey {
assert(position.col <= MATRIX_COLS);
assert(position.row <= MATRIX_ROWS);
}
-}; \ No newline at end of file
+ uint32_t timestamp_pressed;
+};
diff --git a/tests/test_common/test_logger.cpp b/tests/test_common/test_logger.cpp
index efc7719d13..0ff4e686ee 100644
--- a/tests/test_common/test_logger.cpp
+++ b/tests/test_common/test_logger.cpp
@@ -14,30 +14,40 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <iomanip>
#include <iostream>
#include "test_logger.hpp"
+#include "timer.h"
TestLogger test_logger;
TestLogger& TestLogger::info() {
*this << "[ INFO ] ";
- return *this;
+ return this->timestamp();
}
TestLogger& TestLogger::trace() {
*this << "[ TRACE ] ";
- return *this;
+ return this->timestamp();
}
TestLogger& TestLogger::error() {
*this << "[ ERROR ] ";
- return *this;
+ return this->timestamp();
}
+TestLogger& TestLogger::timestamp() {
+ *this << std::setw(6) << timer_read32() << " ";
+ return *this;
+}
void TestLogger::reset() {
this->m_log.str("");
};
+void TestLogger::print_header() {
+ std::cerr << "[ LEVEL ] [TIME] [EVENT]" << std::endl;
+}
+
void TestLogger::print_log() {
std::cerr << this->m_log.str();
}
diff --git a/tests/test_common/test_logger.hpp b/tests/test_common/test_logger.hpp
index 348af7fab8..4964583ded 100644
--- a/tests/test_common/test_logger.hpp
+++ b/tests/test_common/test_logger.hpp
@@ -25,11 +25,13 @@ class TestLogger : public std::ostream {
TestLogger& info();
TestLogger& trace();
TestLogger& error();
- void print_log();
- void reset();
+ void print_log();
+ void print_header();
+ void reset();
private:
+ TestLogger& timestamp();
std::stringbuf m_log;
};
-extern TestLogger test_logger; \ No newline at end of file
+extern TestLogger test_logger;