Merge branch 'master' into eco-keyboard

1 files changed, 21 insertions, 6 deletions

diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index eef9b854b..4084ee9c6 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -1,8 +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" {
+    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(unsigned time) {
+    for (unsigned i=0; i<time; i++) {
+        run_one_scan_loop();
+    }
 }
\ No newline at end of file