TC-TMP-2.1: Fix tolerance check, enable in all-devices (project-chip#72795)

* TC-TMP-2.1: Fix tolerance check, enable in all-devices

* Move enable of tolerance to impl

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: cecille

examples/all-devices-app/all-devices-common/device/types/temperature-sensor/TemperatureSensor.cpp

@@ -23,10 +23,10 @@ using namespace chip::app::Clusters;
 namespace chip {
 namespace app {
 
-TemperatureSensor::TemperatureSensor(TimerDelegate & timerDelegate,
-                                     TemperatureMeasurementCluster::StartupConfiguration tempConfig) :
+TemperatureSensor::TemperatureSensor(TimerDelegate & timerDelegate, TemperatureMeasurementCluster::StartupConfiguration tempConfig,
+                                     TemperatureMeasurementCluster::OptionalAttributeSet optionalAttributes) :
     SingleEndpoint(Span<const DataModel::DeviceTypeEntry>(&Device::Type::kTemperatureSensor, 1)),
-    mTimerDelegate(timerDelegate), mTempConfig(tempConfig)
+    mTimerDelegate(timerDelegate), mTempConfig(tempConfig), mOptionalAttributes(optionalAttributes)
 {}
 
 CHIP_ERROR TemperatureSensor::Register(EndpointId endpoint, CodeDrivenDataModelProvider & provider, EndpointComposition composition)
@@ -41,8 +41,7 @@ CHIP_ERROR TemperatureSensor::Register(EndpointId endpoint, CodeDrivenDataModelP
     ReturnErrorOnFailure(provider.AddCluster(mIdentifyCluster.Registration()));
 
     // Create the temperature measurement cluster
-    TemperatureMeasurementCluster::OptionalAttributeSet optionalAttributeSet{ 0 };
-    mTemperatureMeasurementCluster.Create(endpoint, optionalAttributeSet, mTempConfig);
+    mTemperatureMeasurementCluster.Create(endpoint, mOptionalAttributes, mTempConfig);
     ReturnErrorOnFailure(provider.AddCluster(mTemperatureMeasurementCluster.Registration()));
 
     ReturnErrorOnFailure(provider.AddEndpoint(mEndpointRegistration));

examples/all-devices-app/all-devices-common/device/types/temperature-sensor/TemperatureSensor.h

@@ -27,7 +27,8 @@ namespace app {
 class TemperatureSensor : public SingleEndpoint
 {
 public:
-    TemperatureSensor(TimerDelegate & timerDelegate, Clusters::TemperatureMeasurementCluster::StartupConfiguration tempConfig);
+    TemperatureSensor(TimerDelegate & timerDelegate, Clusters::TemperatureMeasurementCluster::StartupConfiguration tempConfig,
+                      Clusters::TemperatureMeasurementCluster::OptionalAttributeSet optionalAttributes = {});
     ~TemperatureSensor() override = default;
 
     CHIP_ERROR Register(chip::EndpointId endpoint, CodeDrivenDataModelProvider & provider,
@@ -42,6 +43,7 @@ class TemperatureSensor : public SingleEndpoint
 protected:
     TimerDelegate & mTimerDelegate;
     Clusters::TemperatureMeasurementCluster::StartupConfiguration mTempConfig;
+    Clusters::TemperatureMeasurementCluster::OptionalAttributeSet mOptionalAttributes;
     LazyRegisteredServerCluster<Clusters::IdentifyCluster> mIdentifyCluster;
     LazyRegisteredServerCluster<Clusters::TemperatureMeasurementCluster> mTemperatureMeasurementCluster;
 };

examples/all-devices-app/all-devices-common/device/types/temperature-sensor/impl/IncreasingTemperatureSensor.cpp

@@ -26,16 +26,25 @@ namespace app {
 namespace {
 
 constexpr System::Clock::Seconds16 kIncreaseTemperatureIntervalSec = System::Clock::Seconds16(10);
+constexpr uint16_t kDefaultTemperatureTolerance                    = 50; // Set tolerance to 0.50 °C
 
 const TemperatureMeasurementCluster::StartupConfiguration kDefaultTemperatureConfig = {
     .minMeasuredValue = DataModel::MakeNullable<int16_t>(-10),
     .maxMeasuredValue = DataModel::MakeNullable<int16_t>(50),
-    .tolerance        = 0,
+    .tolerance        = kDefaultTemperatureTolerance,
 };
 
 } // namespace
 
-IncreasingTemperatureSensor::IncreasingTemperatureSensor() : TemperatureSensor(mTimerDelegate, kDefaultTemperatureConfig) {}
+IncreasingTemperatureSensor::IncreasingTemperatureSensor() :
+    TemperatureSensor(mTimerDelegate, kDefaultTemperatureConfig, []() {
+        TemperatureMeasurementCluster::OptionalAttributeSet optionalAttributes;
+        // Enable optional Tolerance attribute to support YAML certification tests
+        // (Test_TC_TMP_2_1.yaml) executed against this simulated device.
+        optionalAttributes.Set<TemperatureMeasurement::Attributes::Tolerance::Id>();
+        return optionalAttributes;
+    }())
+{}
 
 IncreasingTemperatureSensor::~IncreasingTemperatureSensor()
 {

src/python_testing/TC_TMP_2_1.py

@@ -107,7 +107,7 @@ async def test_TC_TMP_2_1(self):
                 measured_value, max_bound, "Measured value is greater than max bound")
 
         self.step(7)
-        if self.pics_guard(self.check_pics("TMP.S.A0003")):
+        if await self.attribute_guard(endpoint=self.get_endpoint(), attribute=attr.Tolerance):
             tolerance = await self.read_single_attribute_check_success(cluster=cluster, attribute=attr.Tolerance)
             asserts.assert_greater_equal(tolerance, 0, "Tolerance is less than 0")
             asserts.assert_less_equal(tolerance, 2048, "Tolerance is greater than 2048")