Address JamesH review comments

PeterC1965 · PeterC1965 · commit 6688c42bf2f1 · 2024-06-15T07:52:07.000+01:00
diff --git a/examples/all-clusters-app/asr/BUILD.gn b/examples/all-clusters-app/asr/BUILD.gn
@@ -82,13 +82,13 @@ asr_executable("clusters_app") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
     "${examples_plat_dir}/ButtonHandler.cpp",
     "${examples_plat_dir}/CHIPDeviceManager.cpp",
     "${examples_plat_dir}/LEDWidget.cpp",
diff --git a/examples/all-clusters-app/infineon/psoc6/BUILD.gn b/examples/all-clusters-app/infineon/psoc6/BUILD.gn
@@ -118,13 +118,13 @@ psoc6_executable("clusters_app") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
     "${examples_plat_dir}/LEDWidget.cpp",
     "${examples_plat_dir}/init_psoc6Platform.cpp",
     "src/AppTask.cpp",
diff --git a/examples/all-clusters-app/nxp/mw320/BUILD.gn b/examples/all-clusters-app/nxp/mw320/BUILD.gn
@@ -86,13 +86,13 @@ mw320_executable("shell_mw320") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
-    "${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
     "${chip_root}/src/lib/shell/streamer_mw320.cpp",
     "binding-handler.cpp",
     "include/CHIPProjectConfig.h",
diff --git a/examples/energy-management-app/energy-management-common/include/DeviceEnergyManagementDelegateImpl.h b/examples/energy-management-app/energy-management-common/include/DeviceEnergyManagementDelegateImpl.h
@@ -40,7 +40,7 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
 
     void SetDeviceEnergyManagementInstance(DeviceEnergyManagement::Instance & instance);
 
-    void SetDemManufacturerDelegate(DEMManufacturerDelegate & deviceEnergyManagementManufacturerDelegate);
+    void SetDEMManufacturerDelegate(DEMManufacturerDelegate & deviceEnergyManagementManufacturerDelegate);
 
     /**
      *
diff --git a/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp b/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp
@@ -62,7 +62,7 @@ uint32_t DeviceEnergyManagementDelegate::HasFeature(Feature feature) const
     return hasFeature;
 }
 
-void DeviceEnergyManagementDelegate::SetDemManufacturerDelegate(DEMManufacturerDelegate & deviceEnergyManagementManufacturerDelegate)
+void DeviceEnergyManagementDelegate::SetDEMManufacturerDelegate(DEMManufacturerDelegate & deviceEnergyManagementManufacturerDelegate)
 {
     mpDEMManufacturerDelegate = &deviceEnergyManagementManufacturerDelegate;
 }
diff --git a/examples/energy-management-app/energy-management-common/src/EnergyEvseMain.cpp b/examples/energy-management-app/energy-management-common/src/EnergyEvseMain.cpp
@@ -387,7 +387,7 @@ CHIP_ERROR EVSEManufacturerInit()
         return CHIP_ERROR_NO_MEMORY;
     }
 
-    gDEMDelegate.get()->SetDemManufacturerDelegate(*gEvseManufacturer.get());
+    gDEMDelegate.get()->SetDEMManufacturerDelegate(*gEvseManufacturer.get());
 
     /* Call Manufacturer specific init */
     err = gEvseManufacturer->Init();
diff --git a/src/python_testing/TC_DEM_2_2.py b/src/python_testing/TC_DEM_2_2.py
@@ -225,7 +225,7 @@ async def test_TC_DEM_2_2(self):
                                                  cause=Clusters.DeviceEnergyManagement.Enums.AdjustmentCauseEnum.kGridOptimization)
 
         # Wait 5 seconds for an event not to be reported
-        events_callback.wait_for_no_event_report(5)
+        events_callback.wait_for_event_expect_no_report(5)
 
         self.step("12a")
         await self.check_dem_attribute("ESAState", Clusters.DeviceEnergyManagement.Enums.ESAStateEnum.kPowerAdjustActive)
diff --git a/src/python_testing/matter_testing_support.py b/src/python_testing/matter_testing_support.py
@@ -265,15 +265,15 @@ 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_no_event_report(self, timeout: int = 10):
+    def wait_for_event_expect_no_report(self, timeout: int = 10):
         """This function succceeds/returns if an event does not arrive within the timeout.
            If an event does arrive, an assert is called."""
         try:
             res = self._q.get(block=True, timeout=timeout)
         except queue.Empty:
             return
 
-        asserts.assert_equal(False, f"Event reported when not expected {res}")
+        asserts.fail(f"Event reported when not expected {res}")
 
 class InternalTestRunnerHooks(TestRunnerHooks):
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate`
`40`	`40`
`41`	`41`	`void SetDeviceEnergyManagementInstance(DeviceEnergyManagement::Instance & instance);`
`42`	`42`
`43`		`- void SetDemManufacturerDelegate(DEMManufacturerDelegate & deviceEnergyManagementManufacturerDelegate);`
	`43`	`+ void SetDEMManufacturerDelegate(DEMManufacturerDelegate & deviceEnergyManagementManufacturerDelegate);`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`*`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ uint32_t DeviceEnergyManagementDelegate::HasFeature(Feature feature) const`
`62`	`62`	`return hasFeature;`
`63`	`63`	`}`
`64`	`64`
`65`		`-void DeviceEnergyManagementDelegate::SetDemManufacturerDelegate(DEMManufacturerDelegate & deviceEnergyManagementManufacturerDelegate)`
	`65`	`+void DeviceEnergyManagementDelegate::SetDEMManufacturerDelegate(DEMManufacturerDelegate & deviceEnergyManagementManufacturerDelegate)`
`66`	`66`	`{`
`67`	`67`	`mpDEMManufacturerDelegate = &deviceEnergyManagementManufacturerDelegate;`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ CHIP_ERROR EVSEManufacturerInit()`
`387`	`387`	`return CHIP_ERROR_NO_MEMORY;`
`388`	`388`	`}`
`389`	`389`
`390`		`- gDEMDelegate.get()->SetDemManufacturerDelegate(*gEvseManufacturer.get());`
	`390`	`+ gDEMDelegate.get()->SetDEMManufacturerDelegate(*gEvseManufacturer.get());`
`391`	`391`
`392`	`392`	`/* Call Manufacturer specific init */`
`393`	`393`	`err = gEvseManufacturer->Init();`