Fix functions when `NO_ACTION_TAPPING` is defined (#11528)
Drashna Jaelre
2 years ago
committed by
GitHub
parent
8f03657491
commit
48a79b08cc
@ -0,0 +1,21 @@ |
||||
/* Copyright 2017 Fred Sundvik
|
||||
* |
||||
* 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 NO_ACTION_TAPPING |
||||
@ -0,0 +1,18 @@ |
||||
# Copyright 2017 Fred Sundvik
|
||||
#
|
||||
# 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
|
||||
# --------------------------------------------------------------------------------
|
||||
@ -0,0 +1,63 @@ |
||||
/* Copyright 2017 Fred Sundvik
|
||||
* |
||||
* 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_keymap_key.hpp" |
||||
|
||||
using testing::_; |
||||
using testing::InSequence; |
||||
|
||||
class Tapping : public TestFixture {}; |
||||
|
||||
TEST_F(Tapping, TapP_Layer_Tap_KeyReportsKey) { |
||||
TestDriver driver; |
||||
InSequence s; |
||||
auto key_shift_hold_p_tap = KeymapKey(0, 7, 0, LT(1, KC_P)); |
||||
|
||||
set_keymap({key_shift_hold_p_tap}); |
||||
|
||||
key_shift_hold_p_tap.press(); |
||||
EXPECT_REPORT(driver, (KC_P)); |
||||
run_one_scan_loop(); |
||||
|
||||
key_shift_hold_p_tap.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
run_one_scan_loop(); |
||||
VERIFY_AND_CLEAR(driver); |
||||
} |
||||
|
||||
TEST_F(Tapping, HoldP_Layer_Tap_KeyReportsKey) { |
||||
TestDriver driver; |
||||
InSequence s; |
||||
auto mod_tap_hold_key = KeymapKey(0, 7, 0, LT(1, KC_P)); |
||||
|
||||
set_keymap({mod_tap_hold_key}); |
||||
|
||||
mod_tap_hold_key.press(); |
||||
EXPECT_REPORT(driver, (KC_P)); |
||||
|
||||
idle_for(TAPPING_TERM); |
||||
run_one_scan_loop(); |
||||
EXPECT_NO_REPORT(driver); |
||||
|
||||
mod_tap_hold_key.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
run_one_scan_loop(); |
||||
VERIFY_AND_CLEAR(driver); |
||||
} |
||||
@ -0,0 +1,107 @@ |
||||
/* Copyright 2017 Fred Sundvik
|
||||
* |
||||
* 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_keymap_key.hpp" |
||||
|
||||
using testing::_; |
||||
using testing::InSequence; |
||||
|
||||
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}); |
||||
|
||||
key_shift_hold_p_tap.press(); |
||||
EXPECT_REPORT(driver, (KC_P)); |
||||
run_one_scan_loop(); |
||||
|
||||
key_shift_hold_p_tap.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
run_one_scan_loop(); |
||||
VERIFY_AND_CLEAR(driver); |
||||
} |
||||
|
||||
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(); |
||||
EXPECT_REPORT(driver, (KC_P)); |
||||
|
||||
idle_for(TAPPING_TERM); |
||||
run_one_scan_loop(); |
||||
EXPECT_NO_REPORT(driver); |
||||
|
||||
mod_tap_hold_key.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
run_one_scan_loop(); |
||||
VERIFY_AND_CLEAR(driver); |
||||
} |
||||
|
||||
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}); |
||||
|
||||
// Tapping keys does nothing on press
|
||||
key_shift_hold_p_tap.press(); |
||||
EXPECT_REPORT(driver, (KC_P)); |
||||
run_one_scan_loop(); |
||||
|
||||
key_shift_hold_p_tap.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
run_one_scan_loop(); |
||||
|
||||
key_shift_hold_p_tap.press(); |
||||
EXPECT_REPORT(driver, (KC_P)); |
||||
run_one_scan_loop(); |
||||
|
||||
key_shift_hold_p_tap.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
idle_for(TAPPING_TERM + 1); |
||||
|
||||
key_shift_hold_p_tap.press(); |
||||
EXPECT_REPORT(driver, (KC_P)); |
||||
run_one_scan_loop(); |
||||
key_shift_hold_p_tap.release(); |
||||
|
||||
EXPECT_EMPTY_REPORT(driver); |
||||
idle_for(TAPPING_TERM + 1); |
||||
|
||||
key_shift_hold_p_tap.press(); |
||||
// Shouldn't be called here really
|
||||
EXPECT_REPORT(driver, (KC_P)); |
||||
idle_for(TAPPING_TERM); |
||||
|
||||
EXPECT_EMPTY_REPORT(driver); |
||||
key_shift_hold_p_tap.release(); |
||||
run_one_scan_loop(); |
||||
VERIFY_AND_CLEAR(driver); |
||||
} |
||||
@ -0,0 +1,105 @@ |
||||
/* 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 "action_util.h" |
||||
#include "keyboard_report_util.hpp" |
||||
#include "test_common.hpp" |
||||
|
||||
using testing::_; |
||||
using testing::InSequence; |
||||
|
||||
class OneShot : public TestFixture {}; |
||||
|
||||
TEST_F(OneShot, OSMWithoutAdditionalKeypressDoesNothing) { |
||||
TestDriver driver; |
||||
auto osm_key = KeymapKey(0, 0, 0, OSM(MOD_LSFT), KC_LSFT); |
||||
|
||||
set_keymap({osm_key}); |
||||
|
||||
/* Press and release OSM key*/ |
||||
EXPECT_NO_REPORT(driver); |
||||
osm_key.press(); |
||||
EXPECT_REPORT(driver, (osm_key.report_code)); |
||||
run_one_scan_loop(); |
||||
EXPECT_NO_REPORT(driver); |
||||
osm_key.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
run_one_scan_loop(); |
||||
VERIFY_AND_CLEAR(driver); |
||||
} |
||||
|
||||
TEST_F(OneShot, OSL_No_ReportPress) { |
||||
TestDriver driver; |
||||
auto osl_key = KeymapKey{0, 0, 0, OSL(1)}; |
||||
auto empty_key = KeymapKey{0, 1, 0, KC_NO}; |
||||
auto regular_key = KeymapKey{1, 1, 0, KC_A}; |
||||
|
||||
set_keymap({osl_key, empty_key, regular_key}); |
||||
|
||||
/* Press OSL key */ |
||||
EXPECT_NO_REPORT(driver); |
||||
osl_key.press(); |
||||
run_one_scan_loop(); |
||||
VERIFY_AND_CLEAR(driver); |
||||
|
||||
/* Release OSL key */ |
||||
EXPECT_NO_REPORT(driver); |
||||
osl_key.release(); |
||||
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); |
||||
} |
||||
|
||||
TEST_F(OneShot, OSL_ReportPress) { |
||||
TestDriver driver; |
||||
auto osl_key = KeymapKey{0, 0, 0, OSL(1)}; |
||||
auto empty_key = KeymapKey{0, 1, 0, KC_NO}; |
||||
auto regular_key = KeymapKey{1, 1, 0, KC_A}; |
||||
|
||||
set_keymap({osl_key, empty_key, regular_key}); |
||||
|
||||
/* Press OSL key */ |
||||
osl_key.press(); |
||||
run_one_scan_loop(); |
||||
EXPECT_NO_REPORT(driver); |
||||
|
||||
/* Press regular key */ |
||||
regular_key.press(); |
||||
run_one_scan_loop(); |
||||
EXPECT_NO_REPORT(driver); |
||||
|
||||
/* Release regular key */ |
||||
regular_key.release(); |
||||
run_one_scan_loop(); |
||||
EXPECT_NO_REPORT(driver); |
||||
|
||||
/* Release OSL key */ |
||||
osl_key.release(); |
||||
run_one_scan_loop(); |
||||
EXPECT_NO_REPORT(driver); |
||||
VERIFY_AND_CLEAR(driver); |
||||
} |
||||
@ -0,0 +1,22 @@ |
||||
/* Copyright 2017 Fred Sundvik
|
||||
* |
||||
* 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 NO_ACTION_TAPPING |
||||
#define NO_ACTION_TAPPING_MODTAP_MODS |
||||
@ -0,0 +1,18 @@ |
||||
# Copyright 2017 Fred Sundvik
|
||||
#
|
||||
# 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
|
||||
# --------------------------------------------------------------------------------
|
||||
@ -0,0 +1,104 @@ |
||||
/* Copyright 2017 Fred Sundvik
|
||||
* |
||||
* 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_keymap_key.hpp" |
||||
|
||||
using testing::_; |
||||
using testing::InSequence; |
||||
|
||||
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}); |
||||
|
||||
key_shift_hold_p_tap.press(); |
||||
EXPECT_REPORT(driver, (KC_LSFT)); |
||||
run_one_scan_loop(); |
||||
|
||||
key_shift_hold_p_tap.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
run_one_scan_loop(); |
||||
} |
||||
|
||||
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(); |
||||
EXPECT_REPORT(driver, (KC_LSFT)); |
||||
|
||||
idle_for(TAPPING_TERM); |
||||
run_one_scan_loop(); |
||||
EXPECT_NO_REPORT(driver); |
||||
|
||||
mod_tap_hold_key.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
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}); |
||||
|
||||
// Tapping keys does nothing on press
|
||||
key_shift_hold_p_tap.press(); |
||||
EXPECT_REPORT(driver, (KC_LSFT)); |
||||
run_one_scan_loop(); |
||||
|
||||
key_shift_hold_p_tap.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
run_one_scan_loop(); |
||||
|
||||
key_shift_hold_p_tap.press(); |
||||
EXPECT_REPORT(driver, (KC_LSFT)); |
||||
run_one_scan_loop(); |
||||
|
||||
key_shift_hold_p_tap.release(); |
||||
EXPECT_EMPTY_REPORT(driver); |
||||
idle_for(TAPPING_TERM + 1); |
||||
|
||||
key_shift_hold_p_tap.press(); |
||||
EXPECT_REPORT(driver, (KC_LSFT)); |
||||
run_one_scan_loop(); |
||||
key_shift_hold_p_tap.release(); |
||||
|
||||
EXPECT_EMPTY_REPORT(driver); |
||||
idle_for(TAPPING_TERM + 1); |
||||
|
||||
key_shift_hold_p_tap.press(); |
||||
// Shouldn't be called here really
|
||||
EXPECT_REPORT(driver, (KC_LSFT)); |
||||
idle_for(TAPPING_TERM); |
||||
|
||||
EXPECT_EMPTY_REPORT(driver); |
||||
key_shift_hold_p_tap.release(); |
||||
run_one_scan_loop(); |
||||
} |
||||
Loading…
Reference in new issue