Added StayActiveRequest scenarios to the yaml test

Author: lpbeliveau-silabs

examples/lock-app/lock-common/lock-app.matter

@@ -2892,12 +2892,6 @@ endpoint 0 {
     callback attribute activeModeThreshold;
     ram      attribute featureMap default = 0x0000;
     ram      attribute clusterRevision default = 2;
-
-    handle command RegisterClient;
-    handle command RegisterClientResponse;
-    handle command UnregisterClient;
-    handle command StayActiveRequest;
-    handle command StayActiveResponse;
   }
 }
 endpoint 1 {

examples/lock-app/lock-common/lock-app.zap

@@ -4939,48 +4939,7 @@
           "define": "ICD_MANAGEMENT_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [
-            {
-              "name": "RegisterClient",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "RegisterClientResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "UnregisterClient",
-              "code": 2,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "StayActiveRequest",
-              "code": 3,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "StayActiveResponse",
-              "code": 4,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            }
-          ],
+          "commands": [],
           "attributes": [
             {
               "name": "IdleModeDuration",

src/app/icd/server/ICDManager.h

@@ -127,10 +127,7 @@ class ICDManager : public ICDListener
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 
 #ifdef CONFIG_BUILD_FOR_HOST_UNIT_TEST
-    void SetTestFeatureMapValue(uint32_t featureMap)
-    {
-        mFeatureMap = featureMap;
-    };
+    void SetTestFeatureMapValue(uint32_t featureMap) { mFeatureMap = featureMap; };
 #endif
 
     // Implementation of ICDListener functions.

src/app/tests/suites/TestIcdManagementCluster.yaml

@@ -372,3 +372,82 @@ tests:
                 value: 102
       response:
           error: NOT_FOUND
+
+    - label:
+          "Wait for a little bit less than the active mode duration (10000ms)"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 9000
+
+    - label:
+          "StayActive Scenario 1: Confirm the promised active duration is
+          increased to a specific if a value less than 30000ms is requested and
+          the device does not intend to stay active longer"
+      command: "StayActiveRequest"
+      arguments:
+          values:
+              - name: "StayActiveDuration"
+                value: 20000
+      response:
+          values:
+              - name: "PromisedActiveDuration"
+                constraints:
+                    type: int32u
+                    minValue: 19500
+                    maxValue: 20500
+
+    - label:
+          "Wait for a little bit less than the new promied active mode duration
+          (20000ms)"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 19000
+
+    - label:
+          "StayActive Scenario 2: Confirm the promised active duration is
+          reduced to 30000ms if a value greater than 30000ms is requested"
+      command: "StayActiveRequest"
+      arguments:
+          values:
+              - name: "StayActiveDuration"
+                value: 35000
+      response:
+          values:
+              - name: "PromisedActiveDuration"
+                constraints:
+                    type: int32u
+                    minValue: 29500
+                    maxValue: 30500
+
+    - label:
+          "Wait for a 20000 less than the new promied active mode duration
+          (30000ms)"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 10000
+
+    - label:
+          "StayActive Scenario 3: confirm that the device ignores the request if
+          the device intends to stay active longer than the requested duration
+          we should have about 20000ms left here"
+      command: "StayActiveRequest"
+      arguments:
+          values:
+              - name: "StayActiveDuration"
+                value: 10000
+      response:
+          values:
+              - name: "PromisedActiveDuration"
+                constraints:
+                    type: int32u
+                    minValue: 19500
+                    maxValue: 20500

src/system/SystemLayerImplSelect.h

@@ -88,33 +88,18 @@ class LayerImplSelect : public LayerSocketsLoop
     void EventLoopEnds() override {}
 
 #if CHIP_SYSTEM_CONFIG_USE_DISPATCH
-    void SetDispatchQueue(dispatch_queue_t dispatchQueue) override
-    {
-        mDispatchQueue = dispatchQueue;
-    };
-    dispatch_queue_t GetDispatchQueue() override
-    {
-        return mDispatchQueue;
-    };
+    void SetDispatchQueue(dispatch_queue_t dispatchQueue) override { mDispatchQueue = dispatchQueue; };
+    dispatch_queue_t GetDispatchQueue() override { return mDispatchQueue; };
     void HandleTimerComplete(TimerList::Node * timer);
 #elif CHIP_SYSTEM_CONFIG_USE_LIBEV
-    virtual void SetLibEvLoop(struct ev_loop * aLibEvLoopP) override
-    {
-        mLibEvLoopP = aLibEvLoopP;
-    };
-    virtual struct ev_loop * GetLibEvLoop() override
-    {
-        return mLibEvLoopP;
-    };
+    virtual void SetLibEvLoop(struct ev_loop * aLibEvLoopP) override { mLibEvLoopP = aLibEvLoopP; };
+    virtual struct ev_loop * GetLibEvLoop() override { return mLibEvLoopP; };
     static void HandleLibEvTimer(EV_P_ struct ev_timer * t, int revents);
     static void HandleLibEvIoWatcher(EV_P_ struct ev_io * i, int revents);
 #endif // CHIP_SYSTEM_CONFIG_USE_DISPATCH/LIBEV
 
     // Expose the result of WaitForEvents() for non-blocking socket implementations.
-    bool IsSelectResultValid() const
-    {
-        return mSelectResult >= 0;
-    }
+    bool IsSelectResultValid() const { return mSelectResult >= 0; }
 
 protected:
     static SocketEvents SocketEventsFromFDs(int socket, const fd_set & readfds, const fd_set & writefds, const fd_set & exceptfds);