summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorprecondition <57645186+precondition@users.noreply.github.com>2023-04-03 07:32:47 +0200
committerGitHub <noreply@github.com>2023-04-03 15:32:47 +1000
commit1899793f27c9b165b55b28b086bd989f12baf137 (patch)
treee7b366bd5f04daa69387738b1de322f39d6bd304 /tests
parent47a51fda5dea81775ade0c936aeccc1ed6ebc53a (diff)
Make IGNORE_MOD_TAP_INTERRUPT the default behaviour for mod-taps (#20211)
Diffstat (limited to 'tests')
-rw-r--r--tests/tap_hold_configurations/default_mod_tap/config.h2
-rw-r--r--tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp80
2 files changed, 0 insertions, 82 deletions
diff --git a/tests/tap_hold_configurations/default_mod_tap/config.h b/tests/tap_hold_configurations/default_mod_tap/config.h
index f22448845e..6d872dd57b 100644
--- a/tests/tap_hold_configurations/default_mod_tap/config.h
+++ b/tests/tap_hold_configurations/default_mod_tap/config.h
@@ -17,5 +17,3 @@
#pragma once
#include "test_common.h"
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
index 8ec6ea62a3..dda58463fb 100644
--- a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
+++ b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
@@ -27,86 +27,6 @@ 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;