From cae7a9c3ec3834f08dfd56b0f094dc6afaf2ccaa Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Jul 2017 02:00:30 +0300 Subject: Add simple modifier test --- tests/test_common/keyboard_report_util.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'tests/test_common') diff --git a/tests/test_common/keyboard_report_util.cpp b/tests/test_common/keyboard_report_util.cpp index aca4433dd6..aa096e4169 100644 --- a/tests/test_common/keyboard_report_util.cpp +++ b/tests/test_common/keyboard_report_util.cpp @@ -47,19 +47,25 @@ bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs) { std::ostream& operator<<(std::ostream& stream, const report_keyboard_t& value) { stream << "Keyboard report:" << std::endl; - stream << "Mods: " << value.mods << std::endl; + stream << "Mods: " << (uint32_t)value.mods << std::endl; + stream << "Keys: "; // TODO: This should probably print friendly names for the keys for (uint32_t k: get_keys(value)) { - stream << k << std::endl; + stream << k << " "; } + stream << std::endl; return stream; } KeyboardReportMatcher::KeyboardReportMatcher(const std::vector& keys) { - // TODO: Support modifiers memset(m_report.raw, 0, sizeof(m_report.raw)); for (auto k: keys) { - add_key_to_report(&m_report, k); + if (IS_MOD(k)) { + m_report.mods |= MOD_BIT(k); + } + else { + add_key_to_report(&m_report, k); + } } } -- cgit v1.2.3 From 4e69a8bda6c4003c6b9e33de7db89fe073c970f5 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Jul 2017 22:25:06 +0300 Subject: Add basic timing support, and SFT_T tests Also expose some bugs... --- tests/test_common/test_common.h | 24 ++++++++++++++++++++++++ tests/test_common/test_fixture.cpp | 23 +++++++++++++++++++---- tests/test_common/test_fixture.h | 2 ++ 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 tests/test_common/test_common.h (limited to 'tests/test_common') diff --git a/tests/test_common/test_common.h b/tests/test_common/test_common.h new file mode 100644 index 0000000000..38eb0ed930 --- /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 eef9b854b7..5ca5247dbf 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 Date: Sun, 2 Jul 2017 21:46:35 +0300 Subject: Configure vscode file associations, use hpp instead of h --- tests/test_common/keyboard_report_util.cpp | 2 +- tests/test_common/keyboard_report_util.h | 39 ------------------------ tests/test_common/keyboard_report_util.hpp | 39 ++++++++++++++++++++++++ tests/test_common/test_common.h | 24 --------------- tests/test_common/test_common.hpp | 24 +++++++++++++++ tests/test_common/test_driver.cpp | 2 +- tests/test_common/test_driver.h | 48 ------------------------------ tests/test_common/test_driver.hpp | 48 ++++++++++++++++++++++++++++++ tests/test_common/test_fixture.cpp | 4 +-- tests/test_common/test_fixture.h | 30 ------------------- tests/test_common/test_fixture.hpp | 30 +++++++++++++++++++ 11 files changed, 145 insertions(+), 145 deletions(-) delete mode 100644 tests/test_common/keyboard_report_util.h create mode 100644 tests/test_common/keyboard_report_util.hpp delete mode 100644 tests/test_common/test_common.h create mode 100644 tests/test_common/test_common.hpp delete mode 100644 tests/test_common/test_driver.h create mode 100644 tests/test_common/test_driver.hpp delete mode 100644 tests/test_common/test_fixture.h create mode 100644 tests/test_common/test_fixture.hpp (limited to 'tests/test_common') diff --git a/tests/test_common/keyboard_report_util.cpp b/tests/test_common/keyboard_report_util.cpp index aa096e4169..bf728b9a2a 100644 --- a/tests/test_common/keyboard_report_util.cpp +++ b/tests/test_common/keyboard_report_util.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ - #include "keyboard_report_util.h" + #include "keyboard_report_util.hpp" #include #include using namespace testing; diff --git a/tests/test_common/keyboard_report_util.h b/tests/test_common/keyboard_report_util.h deleted file mode 100644 index 48543c2053..0000000000 --- a/tests/test_common/keyboard_report_util.h +++ /dev/null @@ -1,39 +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 . - */ - -#pragma once -#include "report.h" -#include -#include "gmock/gmock.h" - -bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs); -std::ostream& operator<<(std::ostream& stream, const report_keyboard_t& value); - -class KeyboardReportMatcher : public testing::MatcherInterface { - public: - KeyboardReportMatcher(const std::vector& keys); - virtual bool MatchAndExplain(report_keyboard_t& report, testing::MatchResultListener* listener) const override; - virtual void DescribeTo(::std::ostream* os) const override; - virtual void DescribeNegationTo(::std::ostream* os) const override; -private: - report_keyboard_t m_report; -}; - - -template -inline testing::Matcher KeyboardReport(Ts... keys) { - return testing::MakeMatcher(new KeyboardReportMatcher(std::vector({keys...}))); -} \ No newline at end of file diff --git a/tests/test_common/keyboard_report_util.hpp b/tests/test_common/keyboard_report_util.hpp new file mode 100644 index 0000000000..48543c2053 --- /dev/null +++ b/tests/test_common/keyboard_report_util.hpp @@ -0,0 +1,39 @@ +/* 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 . + */ + +#pragma once +#include "report.h" +#include +#include "gmock/gmock.h" + +bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs); +std::ostream& operator<<(std::ostream& stream, const report_keyboard_t& value); + +class KeyboardReportMatcher : public testing::MatcherInterface { + public: + KeyboardReportMatcher(const std::vector& keys); + virtual bool MatchAndExplain(report_keyboard_t& report, testing::MatchResultListener* listener) const override; + virtual void DescribeTo(::std::ostream* os) const override; + virtual void DescribeNegationTo(::std::ostream* os) const override; +private: + report_keyboard_t m_report; +}; + + +template +inline testing::Matcher KeyboardReport(Ts... keys) { + return testing::MakeMatcher(new KeyboardReportMatcher(std::vector({keys...}))); +} \ No newline at end of file diff --git a/tests/test_common/test_common.h b/tests/test_common/test_common.h deleted file mode 100644 index 38eb0ed930..0000000000 --- a/tests/test_common/test_common.h +++ /dev/null @@ -1,24 +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 "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_common.hpp b/tests/test_common/test_common.hpp new file mode 100644 index 0000000000..2398446339 --- /dev/null +++ b/tests/test_common/test_common.hpp @@ -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.hpp" +#include "test_matrix.h" +#include "keyboard_report_util.hpp" +#include "test_fixture.hpp" \ No newline at end of file diff --git a/tests/test_common/test_driver.cpp b/tests/test_common/test_driver.cpp index feb80563a1..5113099698 100644 --- a/tests/test_common/test_driver.cpp +++ b/tests/test_common/test_driver.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "test_driver.h" +#include "test_driver.hpp" TestDriver* TestDriver::m_this = nullptr; diff --git a/tests/test_common/test_driver.h b/tests/test_common/test_driver.h deleted file mode 100644 index 0123fd539b..0000000000 --- a/tests/test_common/test_driver.h +++ /dev/null @@ -1,48 +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 . - */ - -#ifndef TESTS_TEST_COMMON_TEST_DRIVER_H_ -#define TESTS_TEST_COMMON_TEST_DRIVER_H_ - -#include "gmock/gmock.h" -#include -#include "host.h" -#include "keyboard_report_util.h" - - -class TestDriver { -public: - TestDriver(); - ~TestDriver(); - void set_leds(uint8_t leds) { m_leds = leds; } - - MOCK_METHOD1(send_keyboard_mock, void (report_keyboard_t&)); - MOCK_METHOD1(send_mouse_mock, void (report_mouse_t&)); - MOCK_METHOD1(send_system_mock, void (uint16_t)); - MOCK_METHOD1(send_consumer_mock, void (uint16_t)); -private: - static uint8_t keyboard_leds(void); - static void send_keyboard(report_keyboard_t *report); - static void send_mouse(report_mouse_t* report); - static void send_system(uint16_t data); - static void send_consumer(uint16_t data); - host_driver_t m_driver; - uint8_t m_leds = 0; - static TestDriver* m_this; -}; - - -#endif /* TESTS_TEST_COMMON_TEST_DRIVER_H_ */ diff --git a/tests/test_common/test_driver.hpp b/tests/test_common/test_driver.hpp new file mode 100644 index 0000000000..c3ae17b1a4 --- /dev/null +++ b/tests/test_common/test_driver.hpp @@ -0,0 +1,48 @@ +/* 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 . + */ + +#ifndef TESTS_TEST_COMMON_TEST_DRIVER_H_ +#define TESTS_TEST_COMMON_TEST_DRIVER_H_ + +#include "gmock/gmock.h" +#include +#include "host.h" +#include "keyboard_report_util.hpp" + + +class TestDriver { +public: + TestDriver(); + ~TestDriver(); + void set_leds(uint8_t leds) { m_leds = leds; } + + MOCK_METHOD1(send_keyboard_mock, void (report_keyboard_t&)); + MOCK_METHOD1(send_mouse_mock, void (report_mouse_t&)); + MOCK_METHOD1(send_system_mock, void (uint16_t)); + MOCK_METHOD1(send_consumer_mock, void (uint16_t)); +private: + static uint8_t keyboard_leds(void); + static void send_keyboard(report_keyboard_t *report); + static void send_mouse(report_mouse_t* report); + static void send_system(uint16_t data); + static void send_consumer(uint16_t data); + host_driver_t m_driver; + uint8_t m_leds = 0; + static TestDriver* m_this; +}; + + +#endif /* TESTS_TEST_COMMON_TEST_DRIVER_H_ */ diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index 5ca5247dbf..df57338dfc 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp @@ -1,6 +1,6 @@ -#include "test_fixture.h" +#include "test_fixture.hpp" #include "gmock/gmock.h" -#include "test_driver.h" +#include "test_driver.hpp" #include "test_matrix.h" #include "keyboard.h" #include "action.h" diff --git a/tests/test_common/test_fixture.h b/tests/test_common/test_fixture.h deleted file mode 100644 index 4146b682b1..0000000000 --- a/tests/test_common/test_fixture.h +++ /dev/null @@ -1,30 +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 . - */ - - #pragma once - -#include "gtest/gtest.h" - -class TestFixture : public testing::Test { -public: - TestFixture(); - ~TestFixture(); - static void SetUpTestCase(); - static void TearDownTestCase(); - - void run_one_scan_loop(); - void idle_for(uint ms); -}; \ No newline at end of file diff --git a/tests/test_common/test_fixture.hpp b/tests/test_common/test_fixture.hpp new file mode 100644 index 0000000000..4146b682b1 --- /dev/null +++ b/tests/test_common/test_fixture.hpp @@ -0,0 +1,30 @@ +/* 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 . + */ + + #pragma once + +#include "gtest/gtest.h" + +class TestFixture : public testing::Test { +public: + TestFixture(); + ~TestFixture(); + static void SetUpTestCase(); + static void TearDownTestCase(); + + void run_one_scan_loop(); + void idle_for(uint ms); +}; \ No newline at end of file -- cgit v1.2.3 From 78545b95090816767bf3e17c4745bb0c3db01a5f Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 11 Jul 2017 19:41:04 +0300 Subject: Fix unreferenced errors with mingw compiler and unit tests --- tests/test_common/matrix.c | 3 +++ tests/test_common/test_fixture.cpp | 4 ++-- tests/test_common/test_fixture.hpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/test_common') diff --git a/tests/test_common/matrix.c b/tests/test_common/matrix.c index 0d9fa68b04..4b501039b6 100644 --- a/tests/test_common/matrix.c +++ b/tests/test_common/matrix.c @@ -58,3 +58,6 @@ void release_key(uint8_t col, uint8_t row) { void clear_all_keys(void) { memset(matrix, 0, sizeof(matrix)); } + +void led_set(uint8_t usb_led) { +} diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index df57338dfc..4084ee9c67 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp @@ -44,8 +44,8 @@ void TestFixture::run_one_scan_loop() { advance_time(1); } -void TestFixture::idle_for(uint time) { - for (uint i=0; i