[test] Mock clock uses real clock by default

Author: salkinium

test/config/lbuild.xml

@@ -12,4 +12,8 @@
   <modules>
     <module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:cppdefines">MODM_CHRONO_MILLI_CLOCK_NOW=modm_platform_milli_now</collect>
+    <collect name="modm:build:cppdefines">MODM_CHRONO_MICRO_CLOCK_NOW=modm_platform_micro_now</collect>
+  </collectors>
 </library>

test/modm/architecture/driver/clock_test.cpp

@@ -17,6 +17,18 @@
 #include <modm-test/mock/clock.hpp>
 using test_clock = modm_test::chrono::milli_clock;
 
+void
+ClockTest::setUp()
+{
+	test_clock::enable();
+}
+
+void
+ClockTest::tearDown()
+{
+	test_clock::disable();
+}
+
 void
 ClockTest::testClock()
 {

test/modm/architecture/driver/clock_test.hpp

@@ -24,6 +24,12 @@
 class ClockTest : public unittest::TestSuite
 {
 public:
+	void
+	setUp() override;
+
+	void
+	tearDown() override;
+
 	void
 	testClock();
 };

test/modm/communication/xpcc/dispatcher_test.cpp

@@ -21,6 +21,7 @@ using test_clock = modm_test::chrono::milli_clock;
 void
 DispatcherTest::setUp()
 {
+	test_clock::enable();
 	backend = new FakeBackend();
 	postman = new FakePostman();
 	dispatcher = new xpcc::Dispatcher(backend, postman);
@@ -36,6 +37,7 @@ DispatcherTest::setUp()
 void
 DispatcherTest::tearDown()
 {
+	test_clock::disable();
 	delete component2;
 	delete component1;
 	delete timeline;

test/modm/mock/clock.cpp

@@ -14,11 +14,16 @@
 
 // ----------------------------------------------------------------------------
 static uint32_t milli_time{0};
+static bool milli_enabled{false};
+
+modm::chrono::milli_clock::time_point
+modm_platform_milli_now() noexcept;
 
 modm::chrono::milli_clock::time_point
 modm::chrono::milli_clock::now() noexcept
 {
-	return time_point{duration{milli_time}};
+	if (milli_enabled) return time_point{duration{milli_time}};
+	return modm_platform_milli_now();
 }
 
 void
@@ -33,15 +38,31 @@ modm_test::chrono::milli_clock::increment(uint32_t milliseconds)
 	milli_time += milliseconds;
 }
 
+void
+modm_test::chrono::milli_clock::enable()
+{
+	milli_enabled = true;
+}
+
+void
+modm_test::chrono::milli_clock::disable()
+{
+	milli_enabled = false;
+}
+
 // ----------------------------------------------------------------------------
 static uint32_t micro_time{0};
+static bool micro_enabled{false};
+
+modm::chrono::micro_clock::time_point
+modm_platform_micro_now() noexcept;
 
 modm::chrono::micro_clock::time_point
 modm::chrono::micro_clock::now() noexcept
 {
-	return time_point{duration{micro_time}};
+	if (micro_enabled) return time_point{duration{micro_time}};
+	return modm_platform_micro_now();
 }
-
 void
 modm_test::chrono::micro_clock::setTime(uint32_t microseconds)
 {
@@ -53,3 +74,15 @@ modm_test::chrono::micro_clock::increment(uint32_t microseconds)
 {
 	micro_time += microseconds;
 }
+
+void
+modm_test::chrono::micro_clock::enable()
+{
+	micro_enabled = true;
+}
+
+void
+modm_test::chrono::micro_clock::disable()
+{
+	micro_enabled = false;
+}

test/modm/mock/clock.hpp

@@ -20,6 +20,9 @@ namespace modm_test::chrono
 class milli_clock : modm::chrono::milli_clock
 {
 public:
+	static void enable();
+	static void disable();
+
 	static inline void setTime(std::chrono::milliseconds time)
 	{ setTime(time.count()); }
 	static void setTime(uint32_t milliseconds);
@@ -33,6 +36,9 @@ class milli_clock : modm::chrono::milli_clock
 class micro_clock : modm::chrono::micro_clock
 {
 public:
+	static void enable();
+	static void disable();
+
 	static inline void setTime(std::chrono::microseconds time)
 	{ setTime(time.count()); }
 	static void setTime(uint32_t microseconds);

test/modm/processing/fiber/fiber_test.cpp

@@ -23,9 +23,18 @@ using test_clock_us = modm_test::chrono::micro_clock;
 void
 FiberTest::setUp()
 {
+	test_clock_ms::enable();
+	test_clock_us::enable();
 	state = 0;
 }
 
+void
+FiberTest::tearDown()
+{
+	test_clock_ms::disable();
+	test_clock_us::disable();
+}
+
 // ================================== FIBER ===================================
 static void
 f1()

test/modm/processing/fiber/fiber_test.hpp

@@ -18,7 +18,10 @@ class FiberTest : public unittest::TestSuite
 {
 public:
 	void
-	setUp();
+	setUp() override;
+
+	void
+	tearDown() override;
 
 	void
 	testOneFiber();

test/modm/processing/timer/periodic_timer_test.cpp

@@ -22,9 +22,16 @@ using test_clock = modm_test::chrono::milli_clock;
 void
 PeriodicTimerTest::setUp()
 {
+	test_clock::enable();
 	test_clock::setTime(0);
 }
 
+void
+PeriodicTimerTest::tearDown()
+{
+	test_clock::disable();
+}
+
 void
 PeriodicTimerTest::testConstructor()
 {

test/modm/processing/timer/periodic_timer_test.hpp

@@ -17,8 +17,11 @@
 class PeriodicTimerTest : public unittest::TestSuite
 {
 public:
-	virtual void
-	setUp();
+	void
+	setUp() override;
+
+	void
+	tearDown() override;
 
 
 	void