commit 0889e23cd8186ab133037ad9a86a789be26ce957
author yunhanw-google <yunhanw@google.com> Tue Jul 13 10:00:30 2021 -0700
committer GitHub <noreply@github.com> Tue Jul 13 13:00:30 2021 -0400
tree f77332e79f3f68190cb6f8d23d9e63b416c03a45
parent 93686d984d7082e7abe863494ec610e4dfc65ac5

Revert "Rename seconds to Ms for IM subscribe (#8285)" (#8310)

This reverts commit 9a123d5ed87b8d0232c25dea52a45e78835abb79.

src/app/tests/TestMessageDef.cpp

diff --git a/src/app/tests/TestMessageDef.cpp b/src/app/tests/TestMessageDef.cpp
index 0be18ce..44ec35a 100644
--- a/src/app/tests/TestMessageDef.cpp
+++ b/src/app/tests/TestMessageDef.cpp
@@ -908,10 +908,10 @@
     subscribeRequestBuilder.EventNumber(1);
     NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
 
-    subscribeRequestBuilder.MinIntervalMs(1);
+    subscribeRequestBuilder.MinIntervalSeconds(1);
     NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
 
-    subscribeRequestBuilder.MaxIntervalMs(1);
+    subscribeRequestBuilder.MaxIntervalSeconds(1);
     NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
 
     subscribeRequestBuilder.KeepExistingSubscriptions(true);
@@ -933,8 +933,8 @@
     EventPathList::Parser eventPathListParser;
     AttributeDataVersionList::Parser attributeDataVersionListParser;
     uint64_t eventNumber          = 0;
-    uint16_t minIntervalMs        = 0;
-    uint16_t maxIntervalMs        = 0;
+    uint16_t minIntervalSeconds   = 0;
+    uint16_t maxIntervalSeconds   = 0;
     bool keepExistingSubscription = false;
     bool isProxy                  = false;
 
@@ -956,11 +956,11 @@
     err = subscribeRequestParser.GetEventNumber(&eventNumber);
     NL_TEST_ASSERT(apSuite, eventNumber == 1 && err == CHIP_NO_ERROR);
 
-    err = subscribeRequestParser.GetMinIntervalMs(&minIntervalMs);
-    NL_TEST_ASSERT(apSuite, minIntervalMs == 1 && err == CHIP_NO_ERROR);
+    err = subscribeRequestParser.GetMinIntervalSeconds(&minIntervalSeconds);
+    NL_TEST_ASSERT(apSuite, minIntervalSeconds == 1 && err == CHIP_NO_ERROR);
 
-    err = subscribeRequestParser.GetMaxIntervalMs(&maxIntervalMs);
-    NL_TEST_ASSERT(apSuite, maxIntervalMs == 1 && err == CHIP_NO_ERROR);
+    err = subscribeRequestParser.GetMaxIntervalSeconds(&maxIntervalSeconds);
+    NL_TEST_ASSERT(apSuite, maxIntervalSeconds == 1 && err == CHIP_NO_ERROR);
 
     err = subscribeRequestParser.GetKeepExistingSubscriptions(&keepExistingSubscription);
     NL_TEST_ASSERT(apSuite, keepExistingSubscription && err == CHIP_NO_ERROR);
@@ -980,7 +980,7 @@
     subscribeResponseBuilder.SubscriptionId(1);
     NL_TEST_ASSERT(apSuite, subscribeResponseBuilder.GetError() == CHIP_NO_ERROR);
 
-    subscribeResponseBuilder.FinalSyncIntervalMs(1);
+    subscribeResponseBuilder.FinalSyncIntervalSeconds(1);
     NL_TEST_ASSERT(apSuite, subscribeResponseBuilder.GetError() == CHIP_NO_ERROR);
 
     subscribeResponseBuilder.EndOfSubscribeResponse();
@@ -992,8 +992,8 @@
     CHIP_ERROR err = CHIP_NO_ERROR;
 
     SubscribeResponse::Parser subscribeResponseParser;
-    uint64_t subscriptionId      = 0;
-    uint16_t finalSyncIntervalMs = 0;
+    uint64_t subscriptionId           = 0;
+    uint16_t finalSyncIntervalSeconds = 0;
 
     err = subscribeResponseParser.Init(aReader);
     NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -1004,8 +1004,8 @@
     err = subscribeResponseParser.GetSubscriptionId(&subscriptionId);
     NL_TEST_ASSERT(apSuite, subscriptionId == 1 && err == CHIP_NO_ERROR);
 
-    err = subscribeResponseParser.GetFinalSyncIntervalMs(&finalSyncIntervalMs);
-    NL_TEST_ASSERT(apSuite, finalSyncIntervalMs == 1 && err == CHIP_NO_ERROR);
+    err = subscribeResponseParser.GetFinalSyncIntervalSeconds(&finalSyncIntervalSeconds);
+    NL_TEST_ASSERT(apSuite, finalSyncIntervalSeconds == 1 && err == CHIP_NO_ERROR);
 }
 
 void BuildTimedRequest(nlTestSuite * apSuite, chip::TLV::TLVWriter & aWriter)