Clusters set endpoint in event trigger

Author: r-recchia

src/app/TestEventTriggerDelegate.h

@@ -37,6 +37,7 @@ class TestEventTriggerHandler : public IntrusiveListNodeBase<IntrusiveMode::Auto
      * @return CHIP_NO_ERROR on success or another CHIP_ERROR on failure
      */
     virtual CHIP_ERROR HandleEventTrigger(uint64_t eventTrigger) = 0;
+
     uint64_t setEndpointInEventTrigger(uint64_t eventTrigger)
     {
         uint64_t endpointMask = 0x0000FFFF00000000;

src/app/clusters/boolean-state-configuration-server/BooleanStateConfigurationTestEventTriggerHandler.cpp

@@ -23,6 +23,7 @@ namespace chip {
 
 CHIP_ERROR BooleanStateConfigurationTestEventTriggerHandler::HandleEventTrigger(uint64_t eventTrigger)
 {
+    eventTrigger = setEndpointInEventTrigger(eventTrigger);
     if (HandleBooleanStateConfigurationTestEventTrigger(eventTrigger))
     {
         return CHIP_NO_ERROR;

src/app/clusters/device-energy-management-server/DeviceEnergyManagementTestEventTriggerHandler.h

@@ -85,6 +85,7 @@ class DeviceEnergyManagementTestEventTriggerHandler : public TestEventTriggerHan
 
     CHIP_ERROR HandleEventTrigger(uint64_t eventTrigger) override
     {
+        eventTrigger = setEndpointInEventTrigger(eventTrigger);
         if (HandleDeviceEnergyManagementTestEventTrigger(eventTrigger))
         {
             return CHIP_NO_ERROR;

src/app/clusters/electrical-energy-measurement-server/EnergyReportingTestEventTriggerHandler.h

@@ -59,6 +59,7 @@ class EnergyReportingTestEventTriggerHandler : public TestEventTriggerHandler
 
     CHIP_ERROR HandleEventTrigger(uint64_t eventTrigger) override
     {
+        eventTrigger = setEndpointInEventTrigger(eventTrigger);
         if (HandleEnergyReportingTestEventTrigger(eventTrigger))
         {
             return CHIP_NO_ERROR;

src/app/clusters/energy-evse-server/EnergyEvseTestEventTriggerHandler.h

@@ -82,6 +82,7 @@ class EnergyEvseTestEventTriggerHandler : public TestEventTriggerHandler
      */
     CHIP_ERROR HandleEventTrigger(uint64_t eventTrigger) override
     {
+        eventTrigger = setEndpointInEventTrigger(eventTrigger);
         if (HandleEnergyEvseTestEventTrigger(eventTrigger))
         {
             return CHIP_NO_ERROR;