X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tests%2Ftest_common%2Ftest_fixture.cpp;h=d86681eeaa35b722c032cbb1cc32eea3312cf1c0;hb=26bbf6a66a6c1f606a64acafec3afdf9d3ad7e96;hp=df57338dfc09d77f8416e5acc847b64fed6b0e1b;hpb=62214986013ee6596afa55023f7a95a8527d910f;p=qmk_firmware.git diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index df57338df..d86681eea 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp @@ -6,6 +6,10 @@ #include "action.h" #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)); } @@ -44,8 +49,8 @@ void TestFixture::run_one_scan_loop() { advance_time(1); } -void TestFixture::idle_for(uint time) { - for (uint i=0; i