From 4e69a8bda6c4003c6b9e33de7db89fe073c970f5 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Jul 2017 22:25:06 +0300 Subject: [PATCH] Add basic timing support, and SFT_T tests Also expose some bugs... --- build_full_test.mk | 2 +- tests/basic/config.h | 1 - tests/basic/keymap.c | 10 ++-- tests/basic/keypress.cpp | 9 +-- tests/basic/tapping.cpp | 96 ++++++++++++++++++++++++++++++ tests/test_common/test_common.h | 24 ++++++++ tests/test_common/test_fixture.cpp | 23 +++++-- tests/test_common/test_fixture.h | 2 + tmk_core/common/test/timer.c | 17 +++--- 9 files changed, 157 insertions(+), 27 deletions(-) create mode 100644 tests/basic/tapping.cpp create mode 100644 tests/test_common/test_common.h diff --git a/build_full_test.mk b/build_full_test.mk index a13628ee769..94356d57529 100644 --- a/build_full_test.mk +++ b/build_full_test.mk @@ -29,4 +29,4 @@ $(TEST)_SRC += $(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp)) $(TEST)_DEFS=$(TMK_COMMON_DEFS) $(TEST)_CONFIG=$(TEST_PATH)/config.h -VPATH+=$(TOP_DIR)/tests/test_common +VPATH+=$(TOP_DIR)/tests/test_common \ No newline at end of file diff --git a/tests/basic/config.h b/tests/basic/config.h index a52d8a4fa01..e5d018a32ac 100644 --- a/tests/basic/config.h +++ b/tests/basic/config.h @@ -20,5 +20,4 @@ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 - #endif /* TESTS_BASIC_CONFIG_H_ */ diff --git a/tests/basic/keymap.c b/tests/basic/keymap.c index e3a60ccc452..358cbdb5998 100644 --- a/tests/basic/keymap.c +++ b/tests/basic/keymap.c @@ -23,10 +23,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = { - // 0 1 2 3 4 5 6 7 8 9 - {KC_A, KC_B, KC_NO, KC_LSFT, KC_RSFT, KC_LCTL, COMBO1, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_C, KC_D, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, + // 0 1 2 3 4 5 6 7 8 9 + {KC_A, KC_B, KC_NO, KC_LSFT, KC_RSFT, KC_LCTL, COMBO1, SFT_T(KC_P), KC_NO, KC_NO}, + {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, + {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, + {KC_C, KC_D, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, }, }; diff --git a/tests/basic/keypress.cpp b/tests/basic/keypress.cpp index 2bb029d884d..2323b7cb44b 100644 --- a/tests/basic/keypress.cpp +++ b/tests/basic/keypress.cpp @@ -14,14 +14,7 @@ * along with this program. If not, see . */ -#include "gtest/gtest.h" -#include "gmock/gmock.h" - -#include "quantum.h" -#include "test_driver.h" -#include "test_matrix.h" -#include "keyboard_report_util.h" -#include "test_fixture.h" +#include "test_common.h" using testing::_; using testing::Return; diff --git a/tests/basic/tapping.cpp b/tests/basic/tapping.cpp new file mode 100644 index 00000000000..c158e17189d --- /dev/null +++ b/tests/basic/tapping.cpp @@ -0,0 +1,96 @@ +/* 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 . + */ + +#include "test_common.h" +#include "action_tapping.h" + +using testing::_; +using testing::InSequence; + +class Tapping : public TestFixture {}; + +TEST_F(Tapping, TapA_SHFT_T_KeyReportsKey) { + TestDriver driver; + InSequence s; + + press_key(7, 0); + // Tapping keys does nothing on press + EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0); + run_one_scan_loop(); + release_key(7, 0); + // First we get the key press + EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_P))); + // Then the release + EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())); + run_one_scan_loop(); +} + +TEST_F(Tapping, HoldA_SHFT_T_KeyReportsShift) { + TestDriver driver; + InSequence s; + + 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_LSFT))); + run_one_scan_loop(); +} + +TEST_F(Tapping, ANewTapWithinTappingTermIsBuggy) { + TestDriver driver; + InSequence s; + + press_key(7, 0); + // Tapping keys does nothing on press + EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0); + run_one_scan_loop(); + release_key(7, 0); + // First we get the key press + EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_P))); + // Then the release + EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())); + run_one_scan_loop(); + + // This sends KC_P, even if it should do nothing + 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(); + 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 + press_key(7, 0); + EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0); + run_one_scan_loop(); + release_key(7, 0); + + // First we get the key press + EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_P))); + // Then the release + EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())); + idle_for(TAPPING_TERM + 1); + + // 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 + press_key(7, 0); + // Shouldn't be called here really + EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).Times(1); + idle_for(TAPPING_TERM); +} diff --git a/tests/test_common/test_common.h b/tests/test_common/test_common.h new file mode 100644 index 00000000000..38eb0ed930b --- /dev/null +++ b/tests/test_common/test_common.h @@ -0,0 +1,24 @@ +/* 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 . + */ + +#include "gtest/gtest.h" +#include "gmock/gmock.h" + +#include "quantum.h" +#include "test_driver.h" +#include "test_matrix.h" +#include "keyboard_report_util.h" +#include "test_fixture.h" \ No newline at end of file diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index eef9b854b70..5ca5247dbf5 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp @@ -3,6 +3,13 @@ #include "test_driver.h" #include "test_matrix.h" #include "keyboard.h" +#include "action.h" +#include "action_tapping.h" + +extern "C" { + void set_time(uint32_t t); + void advance_time(uint32_t ms); +} using testing::_; using testing::AnyNumber; @@ -25,12 +32,20 @@ TestFixture::~TestFixture() { TestDriver driver; clear_all_keys(); // Run for a while to make sure all keys are completely released - // Should probably wait until tapping term etc, has timed out EXPECT_CALL(driver, send_keyboard_mock(_)).Times(AnyNumber()); - for (int i=0; i<100; i++) { - keyboard_task(); - } + idle_for(TAPPING_TERM + 10); testing::Mock::VerifyAndClearExpectations(&driver); // Verify that the matrix really is cleared EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(Between(0, 1)); +} + +void TestFixture::run_one_scan_loop() { + keyboard_task(); + advance_time(1); +} + +void TestFixture::idle_for(uint time) { + for (uint i=0; i