Updated attribute value in test

Author: lpbeliveau-silabs

src/app/clusters/level-control/level-control.cpp

@@ -179,7 +179,7 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl
         {
             uint8_t nullValue = 0;
             chip::app::NumericAttributeTraits<uint8_t>::SetNull(nullValue);
-            pairs[0].valueUnsigned8.SetValue(nullValue);
+pairs[0].valueUnsigned8.SetValue(NumericAttributeTraits<uint8_t>::kNullValue);
         }
         size_t attributeCount = 1;
         if (LevelControlHasFeature(endpoint, LevelControl::Feature::kFrequency))

src/app/tests/TestSceneTable.cpp

@@ -506,30 +506,30 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
     static const uint16_t LC_av_payload[2] = { 0x64, 0x01F0 };
     static const uint16_t CC_av_payload[8] = { 0 };
 
-    OOPairs[0].attributeID    = kOnOffAttId;
-    OOPairs[0].attributeValue = OO_av_payload;
-
-    LCPairs[0].attributeID    = kCurrentLevelId;
-    LCPairs[0].attributeValue = LC_av_payload[0];
-    LCPairs[1].attributeID    = kCurrentFrequencyId;
-    LCPairs[1].attributeValue = LC_av_payload[1];
-
-    CCPairs[0].attributeID    = kCurrentSaturationId;
-    CCPairs[0].attributeValue = CC_av_payload[0];
-    CCPairs[1].attributeID    = kCurrentXId;
-    CCPairs[1].attributeValue = CC_av_payload[1];
-    CCPairs[2].attributeID    = kCurrentYId;
-    CCPairs[2].attributeValue = CC_av_payload[2];
-    CCPairs[3].attributeID    = kColorTemperatureMiredsId;
-    CCPairs[3].attributeValue = CC_av_payload[3];
-    CCPairs[4].attributeID    = kEnhancedCurrentHueId;
-    CCPairs[4].attributeValue = CC_av_payload[4];
-    CCPairs[5].attributeID    = kColorLoopActiveId;
-    CCPairs[5].attributeValue = CC_av_payload[5];
-    CCPairs[6].attributeID    = kColorLoopDirectionId;
-    CCPairs[6].attributeValue = CC_av_payload[6];
-    CCPairs[7].attributeID    = kColorLoopTimeId;
-    CCPairs[7].attributeValue = CC_av_payload[7];
+    OOPairs[0].attributeID = kOnOffAttId;
+    OOPairs[0].valueUnsigned8.SetValue(OO_av_payload);
+
+    LCPairs[0].attributeID = kCurrentLevelId;
+    LCPairs[0].valueUnsigned8.SetValue(static_cast<uint8_t>(LC_av_payload[0]));
+    LCPairs[1].attributeID = kCurrentFrequencyId;
+    LCPairs[1].valueUnsigned16.SetValue(LC_av_payload[1]);
+
+    CCPairs[0].attributeID = kCurrentSaturationId;
+    CCPairs[0].valueUnsigned8.SetValue(static_cast<uint8_t>(CC_av_payload[0]));
+    CCPairs[1].attributeID = kCurrentXId;
+    CCPairs[1].valueUnsigned16.SetValue(CC_av_payload[1]);
+    CCPairs[2].attributeID = kCurrentYId;
+    CCPairs[2].valueUnsigned16.SetValue(CC_av_payload[2]);
+    CCPairs[3].attributeID = kColorTemperatureMiredsId;
+    CCPairs[3].valueUnsigned16.SetValue(CC_av_payload[3]);
+    CCPairs[4].attributeID = kEnhancedCurrentHueId;
+    CCPairs[4].valueUnsigned16.SetValue(CC_av_payload[4]);
+    CCPairs[5].attributeID = kColorLoopActiveId;
+    CCPairs[5].valueUnsigned8.SetValue(static_cast<uint8_t>(CC_av_payload[5]));
+    CCPairs[6].attributeID = kColorLoopDirectionId;
+    CCPairs[6].valueUnsigned8.SetValue(static_cast<uint8_t>(CC_av_payload[6]));
+    CCPairs[7].attributeID = kColorLoopTimeId;
+    CCPairs[7].valueUnsigned8.SetValue(static_cast<uint8_t>(CC_av_payload[7]));
 
     // Initialize Extension Field sets as if they were received by add commands
     OOextensionFieldSet.clusterID          = kOnOffClusterId;
@@ -648,10 +648,9 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
     app::Clusters::ScenesManagement::Structs::ExtensionFieldSet::DecodableType extensionFieldFailTestIn;
     app::Clusters::ScenesManagement::Structs::AttributeValuePair::Type TooManyPairs[16];
 
-    uint8_t payloadOk = 0;
     for (uint8_t i = 0; i < 16; i++)
     {
-        TooManyPairs[i].attributeValue = payloadOk;
+        TooManyPairs[i].valueUnsigned8.SetValue(0);
     }
 
     extensionFieldFailTestOut.clusterID          = kColorControlClusterId;