X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tests%2Ftest_common%2Ftest_fixture.cpp;h=d86681eeaa35b722c032cbb1cc32eea3312cf1c0;hb=ff0cb0cf9dc81db11459e7e59c01adadca3ec2b8;hp=5ca5247dbf5fe567d90603614179084af90b45da;hpb=4e69a8bda6c4003c6b9e33de7db89fe073c970f5;p=qmk_firmware.git

diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index 5ca5247db..d86681eea 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -1,11 +1,15 @@
-#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"
 #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<time; i++) {
+void TestFixture::idle_for(unsigned time) {
+    for (unsigned i=0; i<time; i++) {
         run_one_scan_loop();
     }
-}
\ No newline at end of file
+}