X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tests%2Ftest_common%2Ftest_fixture.cpp;h=d86681eeaa35b722c032cbb1cc32eea3312cf1c0;hb=b8564f5dd08f49ee0fc6d28957a376132bd7038d;hp=eef9b854b70f6d377aef05df3ef7f025f7cc242d;hpb=23df3016e89cc954d31d0f881587530543bc7242;p=qmk_firmware.git

diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index eef9b854b..d86681eea 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -1,8 +1,19 @@
-#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);
+}
 
 using testing::_;
 using testing::AnyNumber;
@@ -23,14 +34,23 @@ TestFixture::TestFixture() {
 
 TestFixture::~TestFixture() {
     TestDriver driver;
+    layer_clear();
     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();
-    }
-    testing::Mock::VerifyAndClearExpectations(&driver); 
+    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));
-}
\ No newline at end of file
+}
+
+void TestFixture::run_one_scan_loop() {
+    keyboard_task();
+    advance_time(1);
+}
+
+void TestFixture::idle_for(unsigned time) {
+    for (unsigned i=0; i<time; i++) {
+        run_one_scan_loop();
+    }
+}