fix heater control timer test

rusefi · Sep 25, 2024 · 4e3e4d7 · 4e3e4d7
1 parent 47a8270
commit 4e3e4d7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/firmware/util/timer.cpp b/firmware/util/timer.cpp
@@ -24,6 +24,10 @@ int64_t Timer::getTimestamp() const {
 	Timer::mockTimeStamp = stamp;
 }
 
+/*static*/ void Timer::advanceMockTime(int64_t increment) {
+	Timer::mockTimeStamp += increment;
+}
+
 #else
 #include "ch.hpp"
 

diff --git a/firmware/util/timer.h b/firmware/util/timer.h
@@ -29,6 +29,7 @@ class Timer final {
 	float getElapsedSecondsAndReset();
 
 	static void setMockTime(int64_t stamp);
+	static void advanceMockTime(int64_t increment);
 
 private:
 	int64_t getTimestamp() const;

diff --git a/test/tests/test_heater.cpp b/test/tests/test_heater.cpp
@@ -123,15 +123,35 @@ TEST(HeaterStateMachine, WarmupTimeout)
 TEST(HeaterStateMachine, ClosedLoop)
 {
     MockHeater dut;
+    Timer::setMockTime(0);
     dut.Configure(780, 300);
 
     // Temperature is reasonable, stay in closed loop
     EXPECT_EQ(HeaterState::ClosedLoop, dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 780));
+    Timer::advanceMockTime(10e6);
+    EXPECT_EQ(HeaterState::ClosedLoop, dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 780));
+
+    // Allow too hot briefly
+    EXPECT_EQ(HeaterState::ClosedLoop, dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 1000));
+    Timer::advanceMockTime(0.1e6);
+    EXPECT_EQ(HeaterState::ClosedLoop, dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 1000));
 
-    // Temperature is too hot, overheat
+    // Wait too long, overheat not allowed
+    Timer::advanceMockTime(1e6);
     EXPECT_EQ(HeaterState::Stopped, dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 1000));
 
-    // Temperature is too cold, underheat
+    // Back to normal
+    dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 780);
+    Timer::advanceMockTime(1e6);
+    EXPECT_EQ(HeaterState::ClosedLoop, dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 780));
+
+    // Allow too cold briefly
+    EXPECT_EQ(HeaterState::ClosedLoop, dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 600));
+    Timer::advanceMockTime(0.1e6);
+    EXPECT_EQ(HeaterState::ClosedLoop, dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 600));
+
+    // Wait too long, underheat not allowed
+    Timer::advanceMockTime(1e6);
     EXPECT_EQ(HeaterState::Stopped, dut.GetNextState(HeaterState::ClosedLoop, HeaterAllow::Allowed, 12, 600));
 }