From fc4bfbe580c520caed5b6682790019658133f74e Mon Sep 17 00:00:00 2001
From: Fred Sundvik
Date: Sat, 1 Jul 2017 22:46:21 +0300
Subject: Rename tests to start with test_
---
tests/basic/keypress.cpp | 117 ------------------------------------------
tests/basic/tapping.cpp | 96 ----------------------------------
tests/basic/test_keypress.cpp | 117 ++++++++++++++++++++++++++++++++++++++++++
tests/basic/test_tapping.cpp | 96 ++++++++++++++++++++++++++++++++++
4 files changed, 213 insertions(+), 213 deletions(-)
delete mode 100644 tests/basic/keypress.cpp
delete mode 100644 tests/basic/tapping.cpp
create mode 100644 tests/basic/test_keypress.cpp
create mode 100644 tests/basic/test_tapping.cpp
(limited to 'tests/basic')
diff --git a/tests/basic/keypress.cpp b/tests/basic/keypress.cpp
deleted file mode 100644
index 2323b7cb44..0000000000
--- a/tests/basic/keypress.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/* 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"
-
-using testing::_;
-using testing::Return;
-
-class KeyPress : public TestFixture {};
-
-TEST_F(KeyPress, SendKeyboardIsNotCalledWhenNoKeyIsPressed) {
- TestDriver driver;
- EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
- keyboard_task();
-}
-
-TEST_F(KeyPress, CorrectKeyIsReportedWhenPressed) {
- TestDriver driver;
- press_key(0, 0);
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
- keyboard_task();
- release_key(0, 0);
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- keyboard_task();
-}
-
-TEST_F(KeyPress, CorrectKeysAreReportedWhenTwoKeysArePressed) {
- TestDriver driver;
- press_key(1, 0);
- press_key(0, 3);
- //Note that QMK only processes one key at a time
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_B)));
- keyboard_task();
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_B, KC_C)));
- keyboard_task();
- release_key(1, 0);
- release_key(0, 3);
- //Note that the first key released is the first one in the matrix order
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_C)));
- keyboard_task();
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- keyboard_task();
-}
-
-TEST_F(KeyPress, ANonMappedKeyDoesNothing) {
- TestDriver driver;
- press_key(2, 0);
- EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
- keyboard_task();
- keyboard_task();
-}
-
-TEST_F(KeyPress, LeftShiftIsReportedCorrectly) {
- TestDriver driver;
- press_key(3, 0);
- press_key(0, 0);
- // Unfortunately modifiers are also processed in the wrong order
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
- keyboard_task();
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A, KC_LSFT)));
- keyboard_task();
- release_key(0, 0);
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- keyboard_task();
- release_key(3, 0);
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- keyboard_task();
-}
-
-TEST_F(KeyPress, PressLeftShiftAndControl) {
- TestDriver driver;
- press_key(3, 0);
- press_key(5, 0);
- // Unfortunately modifiers are also processed in the wrong order
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- keyboard_task();
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_LCTRL)));
- keyboard_task();
-}
-
-TEST_F(KeyPress, LeftAndRightShiftCanBePressedAtTheSameTime) {
- TestDriver driver;
- press_key(3, 0);
- press_key(4, 0);
- // Unfortunately modifiers are also processed in the wrong order
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- keyboard_task();
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_RSFT)));
- keyboard_task();
-}
-
-TEST_F(KeyPress, RightShiftLeftControlAndCharWithTheSameKey) {
- TestDriver driver;
- press_key(6, 0);
- // BUG: The press is split into two reports
- // BUG: It reports RSFT instead of LSFT
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL, KC_O)));
- keyboard_task();
- release_key(6, 0);
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- keyboard_task();
-}
\ No newline at end of file
diff --git a/tests/basic/tapping.cpp b/tests/basic/tapping.cpp
deleted file mode 100644
index c158e17189..0000000000
--- a/tests/basic/tapping.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 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/basic/test_keypress.cpp b/tests/basic/test_keypress.cpp
new file mode 100644
index 0000000000..2323b7cb44
--- /dev/null
+++ b/tests/basic/test_keypress.cpp
@@ -0,0 +1,117 @@
+/* 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"
+
+using testing::_;
+using testing::Return;
+
+class KeyPress : public TestFixture {};
+
+TEST_F(KeyPress, SendKeyboardIsNotCalledWhenNoKeyIsPressed) {
+ TestDriver driver;
+ EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
+ keyboard_task();
+}
+
+TEST_F(KeyPress, CorrectKeyIsReportedWhenPressed) {
+ TestDriver driver;
+ press_key(0, 0);
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
+ keyboard_task();
+ release_key(0, 0);
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ keyboard_task();
+}
+
+TEST_F(KeyPress, CorrectKeysAreReportedWhenTwoKeysArePressed) {
+ TestDriver driver;
+ press_key(1, 0);
+ press_key(0, 3);
+ //Note that QMK only processes one key at a time
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_B)));
+ keyboard_task();
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_B, KC_C)));
+ keyboard_task();
+ release_key(1, 0);
+ release_key(0, 3);
+ //Note that the first key released is the first one in the matrix order
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_C)));
+ keyboard_task();
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ keyboard_task();
+}
+
+TEST_F(KeyPress, ANonMappedKeyDoesNothing) {
+ TestDriver driver;
+ press_key(2, 0);
+ EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
+ keyboard_task();
+ keyboard_task();
+}
+
+TEST_F(KeyPress, LeftShiftIsReportedCorrectly) {
+ TestDriver driver;
+ press_key(3, 0);
+ press_key(0, 0);
+ // Unfortunately modifiers are also processed in the wrong order
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
+ keyboard_task();
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A, KC_LSFT)));
+ keyboard_task();
+ release_key(0, 0);
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ keyboard_task();
+ release_key(3, 0);
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ keyboard_task();
+}
+
+TEST_F(KeyPress, PressLeftShiftAndControl) {
+ TestDriver driver;
+ press_key(3, 0);
+ press_key(5, 0);
+ // Unfortunately modifiers are also processed in the wrong order
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ keyboard_task();
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_LCTRL)));
+ keyboard_task();
+}
+
+TEST_F(KeyPress, LeftAndRightShiftCanBePressedAtTheSameTime) {
+ TestDriver driver;
+ press_key(3, 0);
+ press_key(4, 0);
+ // Unfortunately modifiers are also processed in the wrong order
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ keyboard_task();
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_RSFT)));
+ keyboard_task();
+}
+
+TEST_F(KeyPress, RightShiftLeftControlAndCharWithTheSameKey) {
+ TestDriver driver;
+ press_key(6, 0);
+ // BUG: The press is split into two reports
+ // BUG: It reports RSFT instead of LSFT
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL, KC_O)));
+ keyboard_task();
+ release_key(6, 0);
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ keyboard_task();
+}
\ No newline at end of file
diff --git a/tests/basic/test_tapping.cpp b/tests/basic/test_tapping.cpp
new file mode 100644
index 0000000000..c158e17189
--- /dev/null
+++ b/tests/basic/test_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);
+}
--
cgit v1.2.3