commit 620c65ad386ea542bcc18122577a3aab6dbac96d
author Szymon Dompke <szymon.dompke@intel.com> Wed Mar 23 21:09:27 2022 +0100
committer Szymon Dompke <szymon.dompke@intel.com> Mon Apr 04 10:35:38 2022 +0000
tree 9d42dfdc45cf6c671015f2c5ab7832e4085f83b2
parent aa572361124d4797b25674297bbc4cc2682030fa

OnChange trigger should not handle first reading

When OnChange trigger register for updates, it gets current sensor value
as an update. This reading fires trigger actions and is undesirable.

This change skips handling of first reading update for OnChange trigger.

Testing done:
- UTs updated and are passing,
- OnChange trigger is not doing an action on first reading update.

Signed-off-by: Szymon Dompke <szymon.dompke@intel.com>
Change-Id: Ief2d1edd5923fd332f3ea3234a9988e1967d972f

src/on_change_threshold.cpp

diff --git a/src/on_change_threshold.cpp b/src/on_change_threshold.cpp
index 72aedc5..eea8978 100644
--- a/src/on_change_threshold.cpp
+++ b/src/on_change_threshold.cpp
@@ -53,6 +53,12 @@
 void OnChangeThreshold::sensorUpdated(interfaces::Sensor& sensor,
                                       Milliseconds timestamp, double value)
 {
+    if (isFirstReading)
+    {
+        isFirstReading = false;
+        return;
+    }
+
     commit(sensor.getName(), timestamp, value);
 }
 

src/on_change_threshold.hpp

diff --git a/src/on_change_threshold.hpp b/src/on_change_threshold.hpp
index 80876a2..1d4a4d0 100644
--- a/src/on_change_threshold.hpp
+++ b/src/on_change_threshold.hpp
@@ -33,6 +33,7 @@
     Sensors sensors;
     const std::vector<std::unique_ptr<interfaces::TriggerAction>> actions;
     bool initialized = false;
+    bool isFirstReading = true;
 
     void commit(const std::string&, Milliseconds, double);
 };

tests/src/test_on_change_threshold.cpp

diff --git a/tests/src/test_on_change_threshold.cpp b/tests/src/test_on_change_threshold.cpp
index 0c3b301..60697da 100644
--- a/tests/src/test_on_change_threshold.cpp
+++ b/tests/src/test_on_change_threshold.cpp
@@ -64,6 +64,14 @@
     EXPECT_EQ(sut->getThresholdParam(), expected);
 }
 
+TEST_F(TestOnChangeThreshold, firstReadingDoesNoActionCommit)
+{
+    EXPECT_CALL(actionMock, commit(_, _, _)).Times(0);
+
+    sut->initialize();
+    sut->sensorUpdated(*sensorMocks.front(), 0ms, 42);
+}
+
 struct OnChangeParams
 {
     using UpdateParams = std::tuple<size_t, Milliseconds, double>;
@@ -141,6 +149,10 @@
     }
 
     sut->initialize();
+
+    // First reading will be skipped
+    sut->sensorUpdated(*sensorMocks.front(), 0ms, 42);
+
     for (const auto& [index, timestamp, value] : GetParam().updates)
     {
         sut->sensorUpdated(*sensorMocks[index], timestamp, value);