diff options
author | Colin T.A. Gray <colinta@gmail.com> | 2017-12-14 16:15:52 -0700 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2017-12-15 13:23:30 -0500 |
commit | 4ea3bbdb4cbb02310623c9dfc464d84e4f653492 (patch) | |
tree | 7914b5019cb55d0a343ec89385d95795f597cac5 /tests/test_common | |
parent | bad839e6ac815f9fc0836d8170b716838fbc87b7 (diff) | |
download | qmk_firmware-4ea3bbdb4cbb02310623c9dfc464d84e4f653492.tar.gz qmk_firmware-4ea3bbdb4cbb02310623c9dfc464d84e4f653492.zip |
add tests for action_layer.c and reset layer state after tests
Diffstat (limited to 'tests/test_common')
-rw-r--r-- | tests/test_common/test_common.hpp | 4 | ||||
-rw-r--r-- | tests/test_common/test_fixture.cpp | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tests/test_common/test_common.hpp b/tests/test_common/test_common.hpp index 2398446339..a88fa8d7b8 100644 --- a/tests/test_common/test_common.hpp +++ b/tests/test_common/test_common.hpp @@ -17,8 +17,10 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" +extern "C" { #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 +#include "test_fixture.hpp" diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index 4084ee9c67..d86681eeaa 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp @@ -7,6 +7,10 @@ #include "action_tapping.h" extern "C" { +#include "action_layer.h" +} + +extern "C" { void set_time(uint32_t t); void advance_time(uint32_t ms); } @@ -30,11 +34,12 @@ TestFixture::TestFixture() { TestFixture::~TestFixture() { TestDriver driver; + layer_clear(); clear_all_keys(); // Run for a while to make sure all keys are completely released EXPECT_CALL(driver, send_keyboard_mock(_)).Times(AnyNumber()); idle_for(TAPPING_TERM + 10); - testing::Mock::VerifyAndClearExpectations(&driver); + testing::Mock::VerifyAndClearExpectations(&driver); // Verify that the matrix really is cleared EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(Between(0, 1)); } @@ -48,4 +53,4 @@ void TestFixture::idle_for(unsigned time) { for (unsigned i=0; i<time; i++) { run_one_scan_loop(); } -}
\ No newline at end of file +} |