Added unit test for ComputeTimeTillNextSubscriptionResumption() and a…

…ddressed review comments
project-chip · Jul 19, 2023 · 0ab02f4 · 0ab02f4
1 parent 074b08b
commit 0ab02f4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/src/app/InteractionModelEngine.h b/src/app/InteractionModelEngine.h
@@ -366,6 +366,7 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
 private:
     friend class reporting::Engine;
     friend class TestCommandInteraction;
+    friend class TestInteractionModelEngine;
     using Status = Protocols::InteractionModel::Status;
 
     void OnDone(CommandHandler & apCommandObj) override;

diff --git a/src/app/tests/TestInteractionModelEngine.cpp b/src/app/tests/TestInteractionModelEngine.cpp
@@ -48,6 +48,7 @@ class TestInteractionModelEngine
 public:
     static void TestAttributePathParamsPushRelease(nlTestSuite * apSuite, void * apContext);
     static void TestRemoveDuplicateConcreteAttribute(nlTestSuite * apSuite, void * apContext);
+    static void TestSubscriptionResumptionTimer(nlTestSuite * apSuite, void * apContext);
     static int GetAttributePathListLength(ObjectList<AttributePathParams> * apattributePathParamsList);
 };
 
@@ -223,6 +224,35 @@ void TestInteractionModelEngine::TestRemoveDuplicateConcreteAttribute(nlTestSuit
     InteractionModelEngine::GetInstance()->ReleaseAttributePathList(attributePathParamsList);
 }
 
+void TestInteractionModelEngine::TestSubscriptionResumptionTimer(nlTestSuite * apSuite, void * apContext)
+{
+    TestContext & ctx = *static_cast<TestContext *>(apContext);
+    CHIP_ERROR err    = CHIP_NO_ERROR;
+    err               = InteractionModelEngine::GetInstance()->Init(&ctx.GetExchangeManager(), &ctx.GetFabricTable());
+    NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
+
+    uint32_t timeTillNextResubscriptionMs;
+    InteractionModelEngine::GetInstance()->mNumSubscriptionResumptionRetries = 0;
+    timeTillNextResubscriptionMs = InteractionModelEngine::GetInstance()->ComputeTimeTillNextSubscriptionResumption();
+    NL_TEST_ASSERT(apSuite, timeTillNextResubscriptionMs == CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION_MIN_RETRY_INTERVAL_SECS);
+
+    uint32_t lastTimeTillNextResubscriptionMs = timeTillNextResubscriptionMs;
+    for (InteractionModelEngine::GetInstance()->mNumSubscriptionResumptionRetries = 1;
+         InteractionModelEngine::GetInstance()->mNumSubscriptionResumptionRetries <=
+         CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION_MAX_FIBONACCI_STEP_INDEX;
+         InteractionModelEngine::GetInstance()->mNumSubscriptionResumptionRetries++)
+    {
+        timeTillNextResubscriptionMs = InteractionModelEngine::GetInstance()->ComputeTimeTillNextSubscriptionResumption();
+        NL_TEST_ASSERT(apSuite, timeTillNextResubscriptionMs >= lastTimeTillNextResubscriptionMs);
+        NL_TEST_ASSERT(apSuite, timeTillNextResubscriptionMs < CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION_MAX_RETRY_INTERVAL_SECS);
+        lastTimeTillNextResubscriptionMs = timeTillNextResubscriptionMs;
+    }
+
+    InteractionModelEngine::GetInstance()->mNumSubscriptionResumptionRetries = 2000;
+    timeTillNextResubscriptionMs = InteractionModelEngine::GetInstance()->ComputeTimeTillNextSubscriptionResumption();
+    NL_TEST_ASSERT(apSuite, timeTillNextResubscriptionMs == CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION_MAX_RETRY_INTERVAL_SECS);
+}
+
 } // namespace app
 } // namespace chip
 
@@ -233,6 +263,7 @@ const nlTest sTests[] =
         {
                 NL_TEST_DEF("TestAttributePathParamsPushRelease", chip::app::TestInteractionModelEngine::TestAttributePathParamsPushRelease),
                 NL_TEST_DEF("TestRemoveDuplicateConcreteAttribute", chip::app::TestInteractionModelEngine::TestRemoveDuplicateConcreteAttribute),
+                NL_TEST_DEF("TestSubscriptionResumptionTimer", chip::app::TestInteractionModelEngine::TestSubscriptionResumptionTimer),
                 NL_TEST_SENTINEL()
         };
 // clang-format on

diff --git a/src/platform/device.gni b/src/platform/device.gni
@@ -112,11 +112,8 @@ declare_args() {
 }
 
 declare_args() {
-  if (chip_persist_subscriptions) {
-    chip_subscription_timeout_resumption = true
-  } else {
-    chip_subscription_timeout_resumption = false
-  }
+  # Enable subscription resumption after timeout - separate configuration for power use measurement
+  chip_subscription_timeout_resumption = chip_persist_subscriptions
 }
 
 if ((chip_device_platform == "bl702" || chip_device_platform == "bl702l") &&