aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-06-26 23:56:01 +0300
committerJack Humbert <jack.humb@gmail.com>2017-07-08 21:59:51 -0400
commit7d7996278571334d04e4a05445ffa4bf341806a2 (patch)
tree67124ebffbae89ef8ec672f105aae98ef62c7911
parent448b91689fc774aded9e646b66256a5c35c3ccf7 (diff)
downloadqmk_firmware-7d7996278571334d04e4a05445ffa4bf341806a2.tar.gz
qmk_firmware-7d7996278571334d04e4a05445ffa4bf341806a2.zip
Move test keymap to keymap.c
-rw-r--r--build_full_test.mk1
-rw-r--r--tests/basic/keymap.c24
-rw-r--r--tests/basic/test.cpp7
3 files changed, 25 insertions, 7 deletions
diff --git a/build_full_test.mk b/build_full_test.mk
index bfd89174d..66ec48a2d 100644
--- a/build_full_test.mk
+++ b/build_full_test.mk
@@ -19,6 +19,7 @@ TEST_PATH=tests/$(TEST)
19 19
20$(TEST)_SRC= \ 20$(TEST)_SRC= \
21 $(TEST_PATH)/test.cpp \ 21 $(TEST_PATH)/test.cpp \
22 $(TEST_PATH)/keymap.c \
22 $(TMK_COMMON_SRC) \ 23 $(TMK_COMMON_SRC) \
23 $(QUANTUM_SRC) \ 24 $(QUANTUM_SRC) \
24 tests/test_common/matrix.c \ 25 tests/test_common/matrix.c \
diff --git a/tests/basic/keymap.c b/tests/basic/keymap.c
new file mode 100644
index 000000000..2afb4d6a9
--- /dev/null
+++ b/tests/basic/keymap.c
@@ -0,0 +1,24 @@
1/* Copyright 2017 Fred Sundvik
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "quantum.h"
18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = {
21 {KC_A, KC_B},
22 {KC_C, KC_D}
23 },
24};
diff --git a/tests/basic/test.cpp b/tests/basic/test.cpp
index 1bd5c2762..f574481f2 100644
--- a/tests/basic/test.cpp
+++ b/tests/basic/test.cpp
@@ -26,13 +26,6 @@
26using testing::_; 26using testing::_;
27using testing::Return; 27using testing::Return;
28 28
29const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
30 [0] = {
31 {KC_A, KC_B},
32 {KC_C, KC_D}
33 },
34};
35
36class KeyPress : public TestFixture {}; 29class KeyPress : public TestFixture {};
37 30
38TEST_F(KeyPress, SendKeyboardIsNotCalledWhenNoKeyIsPressed) { 31TEST_F(KeyPress, SendKeyboardIsNotCalledWhenNoKeyIsPressed) {