Put time util funtions into namespace + drop the Utils prefix

Author: PeterC1965

examples/energy-management-app/energy-management-common/include/EnergyEvseDelegateImpl.h

@@ -26,13 +26,6 @@
 
 using chip::Protocols::InteractionModel::Status;
 
-/**
- * @brief   Helper function to get current timestamp in Epoch format
- *
- * @param   chipEpoch reference to hold return timestamp
- */
-CHIP_ERROR GetEpochTS(uint32_t & chipEpoch);
-
 namespace chip {
 namespace app {
 namespace Clusters {

examples/energy-management-app/energy-management-common/include/EnergyTimeUtils.h

@@ -25,12 +25,17 @@
 
 using chip::Protocols::InteractionModel::Status;
 
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace DeviceEnergyManagement {
+
 /**
  * @brief   Helper function to get current timestamp in Epoch format
  *
  * @param   chipEpoch reference to hold return timestamp
  */
-CHIP_ERROR UtilsGetEpochTS(uint32_t & chipEpoch);
+CHIP_ERROR GetEpochTS(uint32_t & chipEpoch);
 
 /**
  * @brief   Helper function to get current timestamp and work out the day of week
@@ -44,7 +49,7 @@ CHIP_ERROR UtilsGetEpochTS(uint32_t & chipEpoch);
  * @return  bitmap value for day of week
  * Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
  */
-uint8_t UtilsGetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch);
+uint8_t GetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch);
 
 /**
  * @brief   Helper function to get current timestamp and work out the day of week based on localtime
@@ -53,4 +58,10 @@ uint8_t UtilsGetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch);
  *
  * Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
  */
-CHIP_ERROR UtilsGetLocalDayOfWeekNow(uint8_t & dayOfWeekMap);
+CHIP_ERROR GetLocalDayOfWeekNow(uint8_t & dayOfWeekMap);
+
+} // namespace DeviceEnergyManagement
+} // namespace Clusters
+} // namespace app
+} // namespace chip
+

examples/energy-management-app/energy-management-common/src/DEMTestEventTriggers.cpp

@@ -55,7 +55,7 @@ CHIP_ERROR ConfigureForecast(uint16_t numSlots)
 {
     uint32_t chipEpoch = 0;
 
-    CHIP_ERROR err = UtilsGetEpochTS(chipEpoch);
+    CHIP_ERROR err = GetEpochTS(chipEpoch);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Support, "ConfigureForecast could not get time");
@@ -198,7 +198,7 @@ void SetTestEventTrigger_StartTimeAdjustment()
 
     uint32_t chipEpoch = 0;
 
-    CHIP_ERROR err = UtilsGetEpochTS(chipEpoch);
+    CHIP_ERROR err = GetEpochTS(chipEpoch);
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Support, "ConfigureForecast_EarliestStartLatestEndTimes could not get time");

examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp

@@ -92,7 +92,7 @@ Status DeviceEnergyManagementDelegate::PowerAdjustRequest(const int64_t powerMw,
         sendEvent = true;
 
         // Record when this PowerAdjustment starts. Note if we do not set this value if a PowerAdjustment is in progress
-        CHIP_ERROR err = UtilsGetEpochTS(mPowerAdjustmentStartTimeUtc);
+        CHIP_ERROR err = GetEpochTS(mPowerAdjustmentStartTimeUtc);
         if (err != CHIP_NO_ERROR)
         {
             ChipLogError(AppServer, "Unable to get time: %" CHIP_ERROR_FORMAT, err.Format());
@@ -286,7 +286,7 @@ CHIP_ERROR DeviceEnergyManagementDelegate::SendPowerAdjustEndEvent(CauseEnum cau
     event.cause = cause;
 
     uint32_t timeNowUtc;
-    CHIP_ERROR err = UtilsGetEpochTS(timeNowUtc);
+    CHIP_ERROR err = GetEpochTS(timeNowUtc);
     if (err == CHIP_NO_ERROR)
     {
         event.duration = timeNowUtc - mPowerAdjustmentStartTimeUtc;

examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp

@@ -31,12 +31,17 @@ using namespace chip::app::Clusters::EnergyEvse::Attributes;
 using chip::app::LogEvent;
 using chip::Protocols::InteractionModel::Status;
 
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace DeviceEnergyManagement {
+
 /**
  * @brief   Helper function to get current timestamp in Epoch format
  *
  * @param[out]   chipEpoch reference to hold return timestamp. Set to 0 if an error occurs.
  */
-CHIP_ERROR UtilsGetEpochTS(uint32_t & chipEpoch)
+CHIP_ERROR GetEpochTS(uint32_t & chipEpoch)
 {
     chipEpoch = 0;
 
@@ -78,7 +83,7 @@ CHIP_ERROR UtilsGetEpochTS(uint32_t & chipEpoch)
  * @return  bitmap value for day of week
  * Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
  */
-uint8_t UtilsGetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch)
+uint8_t GetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch)
 {
     // Define a timezone structure and initialize it to the local timezone
     // This will capture any daylight saving time changes
@@ -100,7 +105,7 @@ uint8_t UtilsGetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch)
  *
  * Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
  */
-CHIP_ERROR UtilsGetLocalDayOfWeekNow(uint8_t & dayOfWeekMap)
+CHIP_ERROR GetLocalDayOfWeekNow(uint8_t & dayOfWeekMap)
 {
     chip::System::Clock::Milliseconds64 cTMs;
     CHIP_ERROR err = chip::System::SystemClock().GetClock_RealTimeMS(cTMs);
@@ -110,7 +115,12 @@ CHIP_ERROR UtilsGetLocalDayOfWeekNow(uint8_t & dayOfWeekMap)
         return err;
     }
     time_t unixEpoch = std::chrono::duration_cast<chip::System::Clock::Seconds32>(cTMs).count();
-    dayOfWeekMap     = UtilsGetLocalDayOfWeekFromUnixEpoch(unixEpoch);
+    dayOfWeekMap     = GetLocalDayOfWeekFromUnixEpoch(unixEpoch);
 
     return CHIP_NO_ERROR;
 }
+
+} // namespace DeviceEnergyManagement
+} // namespace Clusters
+} // namespace app
+} // namespace chip

src/python_testing/matter_testing_support.py

@@ -265,11 +265,11 @@ def wait_for_event_report(self, expected_event: ClusterObjects.ClusterEvent, tim
         asserts.assert_equal(res.Header.EventId, expected_event.event_id, "Expected event ID not found in event report")
         return res.Data
 
-    def wait_for_event_expect_no_report(self, timeout: int = 10):
-        """This function succceeds/returns if an event does not arrive within the timeout.
+    def wait_for_event_expect_no_report(self, timeoutS: int = 10):
+        """This function succceeds/returns if an event does not arrive within the timeout specified in seconds.
            If an event does arrive, an assert is called."""
         try:
-            res = self._q.get(block=True, timeout=timeout)
+            res = self._q.get(block=True, timeout=timeoutS)
         except queue.Empty:
             return