1 files changed, 11 insertions, 37 deletions

diff --git a/tests/basic/test_tapping.cpp b/tests/basic/test_tapping.cpp
index 181b7ca89e..88ab97eb6e 100644
--- a/tests/basic/test_tapping.cpp
+++ b/tests/basic/test_tapping.cpp
@@ -14,11 +14,8 @@
  * 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_keymap_key.hpp"
 
 using testing::_;
 using testing::InSequence;
@@ -28,19 +25,14 @@ class Tapping : public TestFixture {};
 TEST_F(Tapping, TapA_SHFT_T_KeyReportsKey) {
     TestDriver driver;
     InSequence s;
-    auto       key_shift_hold_p_tap = KeymapKey(0, 7, 0, SFT_T(KC_P));
-
-    set_keymap({key_shift_hold_p_tap});
 
+    press_key(7, 0);
     // Tapping keys does nothing on press
-    key_shift_hold_p_tap.press();
     EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     run_one_scan_loop();
-
+    release_key(7, 0);
     // First we get the key press
-    key_shift_hold_p_tap.release();
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_P)));
-
     // Then the release
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     run_one_scan_loop();
@@ -49,38 +41,25 @@ TEST_F(Tapping, TapA_SHFT_T_KeyReportsKey) {
 TEST_F(Tapping, HoldA_SHFT_T_KeyReportsShift) {
     TestDriver driver;
     InSequence s;
-    auto       mod_tap_hold_key = KeymapKey(0, 7, 0, SFT_T(KC_P));
-
-    set_keymap({mod_tap_hold_key});
-
-    mod_tap_hold_key.press();
 
+    press_key(7, 0);
     // Tapping keys does nothing on press
     EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     idle_for(TAPPING_TERM);
-
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
     run_one_scan_loop();
-
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
-    mod_tap_hold_key.release();
-    run_one_scan_loop();
 }
 
 TEST_F(Tapping, ANewTapWithinTappingTermIsBuggy) {
     // See issue #1478 for more information
     TestDriver driver;
     InSequence s;
-    auto       key_shift_hold_p_tap = KeymapKey(0, 7, 0, SFT_T(KC_P));
-
-    set_keymap({key_shift_hold_p_tap});
 
+    press_key(7, 0);
     // Tapping keys does nothing on press
-    key_shift_hold_p_tap.press();
     EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     run_one_scan_loop();
-    key_shift_hold_p_tap.release();
-
+    release_key(7, 0);
     // First we get the key press
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_P)));
     // Then the release
@@ -88,20 +67,19 @@ TEST_F(Tapping, ANewTapWithinTappingTermIsBuggy) {
     run_one_scan_loop();
 
     // This sends KC_P, even if it should do nothing
-    key_shift_hold_p_tap.press();
+    press_key(7, 0);
     // This test should not succed if everything works correctly
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_P)));
     run_one_scan_loop();
-
-    key_shift_hold_p_tap.release();
+    release_key(7, 0);
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     idle_for(TAPPING_TERM + 1);
 
     // On the other hand, nothing is sent if we are outside the tapping term
-    key_shift_hold_p_tap.press();
+    press_key(7, 0);
     EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     run_one_scan_loop();
-    key_shift_hold_p_tap.release();
+    release_key(7, 0);
 
     // First we get the key press
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_P)));
@@ -112,12 +90,8 @@ TEST_F(Tapping, ANewTapWithinTappingTermIsBuggy) {
     // Now we are geting into strange territory, as the hold registers too early here
     // But the stranges part is:
     // If TAPPING_TERM + 1 above is changed to TAPPING_TERM or TAPPING_TERM + 2 it doesn't
-    key_shift_hold_p_tap.press();
+    press_key(7, 0);
     // Shouldn't be called here really
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT))).Times(1);
     idle_for(TAPPING_TERM);
-
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
-    key_shift_hold_p_tap.release();
-    run_one_scan_loop();
-}
\ No newline at end of file
+}