Add a test fixture

It only initializes QMK once, and clears the matrix after each test.
master
Fred Sundvik 2017-06-18 23:49:38 +03:00
parent e85b185796
commit 36f820be7e
6 changed files with 80 additions and 15 deletions

View File

@ -23,7 +23,8 @@ $(TEST)_SRC= \
$(QUANTUM_SRC) \ $(QUANTUM_SRC) \
tests/test_common/matrix.c \ tests/test_common/matrix.c \
tests/test_common/test_driver.cpp \ tests/test_common/test_driver.cpp \
tests/test_common/keyboard_report_util.cpp tests/test_common/keyboard_report_util.cpp \
tests/test_common/test_fixture.cpp
$(TEST)_DEFS=$(TMK_COMMON_DEFS) $(TEST)_DEFS=$(TMK_COMMON_DEFS)
$(TEST)_CONFIG=$(TEST_PATH)/config.h $(TEST)_CONFIG=$(TEST_PATH)/config.h
VPATH+=$(TOP_DIR)/tests/test_common VPATH+=$(TOP_DIR)/tests/test_common

View File

@ -18,10 +18,10 @@
#include "gmock/gmock.h" #include "gmock/gmock.h"
#include "quantum.h" #include "quantum.h"
#include "keyboard.h"
#include "test_driver.h" #include "test_driver.h"
#include "test_matrix.h" #include "test_matrix.h"
#include "keyboard_report_util.h" #include "keyboard_report_util.h"
#include "test_fixture.h"
using testing::_; using testing::_;
using testing::Return; using testing::Return;
@ -33,35 +33,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}, },
}; };
TEST(KeyPress, SendKeyboardIsNotCalledWhenNoKeyIsPressed) { class KeyPress : public TestFixture {};
TEST_F(KeyPress, SendKeyboardIsNotCalledWhenNoKeyIsPressed) {
TestDriver driver; TestDriver driver;
EXPECT_CALL(driver, send_keyboard_mock(_));
keyboard_init();
EXPECT_CALL(driver, keyboard_leds_mock()).WillRepeatedly(Return(0)); EXPECT_CALL(driver, keyboard_leds_mock()).WillRepeatedly(Return(0));
EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0); EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
keyboard_task(); keyboard_task();
} }
TEST(KeyPress, CorrectKeyIsReportedWhenPressed) { TEST_F(KeyPress, CorrectKeyIsReportedWhenPressed) {
TestDriver driver; TestDriver driver;
EXPECT_CALL(driver, send_keyboard_mock(_));
keyboard_init();
press_key(0, 0); press_key(0, 0);
EXPECT_CALL(driver, keyboard_leds_mock()).WillRepeatedly(Return(0)); EXPECT_CALL(driver, keyboard_leds_mock()).WillRepeatedly(Return(0));
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A))); EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
keyboard_task(); keyboard_task();
} }
TEST(KeyPress, CorrectKeysAreReportedWhenTwoKeysArePressed) { TEST_F(KeyPress, CorrectKeysAreReportedWhenTwoKeysArePressed) {
TestDriver driver; TestDriver driver;
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
keyboard_init();
press_key(1, 0); press_key(1, 0);
press_key(0, 1); press_key(0, 1);
EXPECT_CALL(driver, keyboard_leds_mock()).WillRepeatedly(Return(0)); EXPECT_CALL(driver, keyboard_leds_mock()).WillRepeatedly(Return(0));
//TODO: This is a left-over from the previous test and need to be fixed
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
keyboard_task();
//Note that QMK only processes one key at a time //Note that QMK only processes one key at a time
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_B))); EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_B)));
keyboard_task(); keyboard_task();

View File

@ -22,7 +22,7 @@
static matrix_row_t matrix[MATRIX_ROWS] = {}; static matrix_row_t matrix[MATRIX_ROWS] = {};
void matrix_init(void) { void matrix_init(void) {
memset(matrix, 0, sizeof(matrix)); clear_all_keys();
matrix_init_quantum(); matrix_init_quantum();
} }
@ -54,3 +54,7 @@ void press_key(uint8_t col, uint8_t row) {
void release_key(uint8_t col, uint8_t row) { void release_key(uint8_t col, uint8_t row) {
matrix[row] &= ~(1 << col); matrix[row] &= ~(1 << col);
} }
void clear_all_keys(void) {
memset(matrix, 0, sizeof(matrix));
}

View File

@ -0,0 +1,38 @@
#include "test_fixture.h"
#include "gmock/gmock.h"
#include "test_driver.h"
#include "test_matrix.h"
#include "keyboard.h"
using testing::_;
using testing::AnyNumber;
using testing::Return;
using testing::Between;
void TestFixture::SetUpTestCase() {
TestDriver driver;
EXPECT_CALL(driver, send_keyboard_mock(_));
keyboard_init();
}
void TestFixture::TearDownTestCase() {
}
TestFixture::TestFixture() {
}
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());
EXPECT_CALL(driver, keyboard_leds_mock()).WillRepeatedly(Return(0));
for (int i=0; i<100; i++) {
keyboard_task();
}
testing::Mock::VerifyAndClearExpectations(&driver);
// Verify that the matrix really is cleared
EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(Between(0, 1));
EXPECT_CALL(driver, keyboard_leds_mock()).WillRepeatedly(Return(0));
}

View File

@ -0,0 +1,28 @@
/* 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 "gtest/gtest.h"
class TestFixture : public testing::Test {
public:
TestFixture();
~TestFixture();
static void SetUpTestCase();
static void TearDownTestCase();
};

View File

@ -23,6 +23,7 @@ extern "C" {
void press_key(uint8_t col, uint8_t row); void press_key(uint8_t col, uint8_t row);
void release_key(uint8_t col, uint8_t row); void release_key(uint8_t col, uint8_t row);
void clear_all_keys(void);
#ifdef __cplusplus #ifdef __cplusplus
} }