Fix tests

andy31415 · andy31415 · commit 4301461897cf · 2024-04-17T12:03:09.000-04:00
diff --git a/src/app/tests/TestAttributeValueEncoder.cpp b/src/app/tests/TestAttributeValueEncoder.cpp
@@ -49,15 +49,35 @@ constexpr ClusterId kRandomClusterId     = 0xaa;
 constexpr AttributeId kRandomAttributeId = 0xcc;
 constexpr DataVersion kRandomDataVersion = 0x99;
 constexpr FabricIndex kTestFabricIndex   = 1;
+constexpr NodeId kFakeNodeId             = 1;
 constexpr TLV::Tag kFabricIndexTag       = TLV::ContextTag(254);
 
+Access::SubjectDescriptor DescriptorWithFabric(FabricIndex fabricIndex)
+{
+    Access::SubjectDescriptor result;
+
+    result.fabricIndex = fabricIndex;
+    result.subject     = kFakeNodeId;
+
+    if (fabricIndex == kUndefinedFabricIndex)
+    {
+        result.authMode = Access::AuthMode::kCase;
+    }
+    else
+    {
+        result.authMode = Access::AuthMode::kPase;
+    }
+    return result;
+}
+
 template <size_t N>
 struct LimitedTestSetup
 {
     LimitedTestSetup(nlTestSuite * aSuite, const FabricIndex aFabricIndex = kUndefinedFabricIndex,
                      const AttributeEncodeState & aState = AttributeEncodeState()) :
-        encoder(builder, aFabricIndex, ConcreteAttributePath(kRandomEndpointId, kRandomClusterId, kRandomAttributeId),
-                kRandomDataVersion, aFabricIndex != kUndefinedFabricIndex, aState)
+        encoder(builder, DescriptorWithFabric(aFabricIndex),
+                ConcreteAttributePath(kRandomEndpointId, kRandomClusterId, kRandomAttributeId), kRandomDataVersion,
+                aFabricIndex != kUndefinedFabricIndex, aState)
     {
         writer.Init(buf);
         {
diff --git a/src/app/tests/TestPowerSourceCluster.cpp b/src/app/tests/TestPowerSourceCluster.cpp
@@ -80,7 +80,8 @@ std::vector<EndpointId> ReadEndpointsThroughAttributeReader(nlTestSuite * apSuit
     ConcreteAttributePath path(endpoint, Clusters::PowerSource::Id, Clusters::PowerSource::Attributes::EndpointList::Id);
     ConcreteReadAttributePath readPath(path);
     chip::DataVersion dataVersion(0);
-    AttributeValueEncoder aEncoder(builder, 0, path, dataVersion);
+    Access::SubjectDescriptor subjectDescriptor;
+    AttributeValueEncoder aEncoder(builder, subjectDescriptor, path, dataVersion);
 
     err = attrAccess.Read(readPath, aEncoder);
 
diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp
@@ -331,7 +331,7 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr
         return attributeReport.EndOfAttributeReportIB();
     }
 
-    return AttributeValueEncoder(aAttributeReports, 0, aPath, 0).Encode(kTestFieldValue1);
+    return AttributeValueEncoder(aAttributeReports, aSubjectDescriptor, aPath, 0 /* dataVersion */).Encode(kTestFieldValue1);
 }
 
 bool IsClusterDataVersionEqual(const ConcreteClusterPath & aConcreteClusterPath, DataVersion aRequiredVersion)
diff --git a/src/app/util/mock/attribute-storage.cpp b/src/app/util/mock/attribute-storage.cpp
@@ -351,7 +351,10 @@ CHIP_ERROR ReadSingleMockClusterData(FabricIndex aAccessingFabricIndex, const Co
     if (aPath.mAttributeId == MockAttributeId(4))
     {
         AttributeEncodeState state = (apEncoderState == nullptr ? AttributeEncodeState() : *apEncoderState);
-        AttributeValueEncoder valueEncoder(aAttributeReports, aAccessingFabricIndex, aPath, dataVersion, false, state);
+        Access::SubjectDescriptor subject;
+        subject.fabricIndex = aAccessingFabricIndex;
+
+        AttributeValueEncoder valueEncoder(aAttributeReports, subject, aPath, dataVersion, false /* isFabricFiltered */, state);
 
         CHIP_ERROR err = valueEncoder.EncodeList([](const auto & encoder) -> CHIP_ERROR {
             for (int i = 0; i < 6; i++)
diff --git a/src/controller/tests/data_model/TestRead.cpp b/src/controller/tests/data_model/TestRead.cpp
@@ -114,8 +114,8 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr
             {
                 state = *apEncoderState;
             }
-            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, path,
-                                               kDataVersion /* data version */, aIsFabricFiltered, state);
+            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, path, kDataVersion /* data version */,
+                                               aIsFabricFiltered, state);
             ReturnErrorOnFailure(valueEncoder.Encode(true));
         }
 
@@ -132,8 +132,8 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr
             {
                 state = *apEncoderState;
             }
-            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, aPath,
-                                               kDataVersion /* data version */, aIsFabricFiltered, state);
+            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, aPath, kDataVersion /* data version */,
+                                               aIsFabricFiltered, state);
 
             return valueEncoder.EncodeList([aSubjectDescriptor](const auto & encoder) -> CHIP_ERROR {
                 app::Clusters::UnitTesting::Structs::TestFabricScoped::Type val;
@@ -152,17 +152,17 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr
             {
                 state = *apEncoderState;
             }
-            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, aPath,
-                                               kDataVersion /* data version */, aIsFabricFiltered, state);
+            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, aPath, kDataVersion /* data version */,
+                                               aIsFabricFiltered, state);
 
             return valueEncoder.Encode(++totalReadCount);
         }
         if (aPath.mClusterId == kPerpetualClusterId ||
             (aPath.mClusterId == app::Clusters::UnitTesting::Id && aPath.mAttributeId == kPerpetualAttributeid))
         {
             AttributeEncodeState state;
-            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, aPath,
-                                               kDataVersion /* data version */, aIsFabricFiltered, state);
+            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, aPath, kDataVersion /* data version */,
+                                               aIsFabricFiltered, state);
 
             CHIP_ERROR err = valueEncoder.EncodeList([](const auto & encoder) -> CHIP_ERROR {
                 encoder.Encode(static_cast<uint8_t>(1));
@@ -188,8 +188,8 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr
             {
                 state = *apEncoderState;
             }
-            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, aPath,
-                                               kDataVersion /* data version */, aIsFabricFiltered, state);
+            AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, aPath, kDataVersion /* data version */,
+                                               aIsFabricFiltered, state);
 
             return valueEncoder.Encode(isLitIcd ? Clusters::IcdManagement::OperatingModeEnum::kLit
                                                 : Clusters::IcdManagement::OperatingModeEnum::kSit);

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr`
`331`	`331`	`return attributeReport.EndOfAttributeReportIB();`
`332`	`332`	`}`
`333`	`333`
`334`		`- return AttributeValueEncoder(aAttributeReports, 0, aPath, 0).Encode(kTestFieldValue1);`
	`334`	`+ return AttributeValueEncoder(aAttributeReports, aSubjectDescriptor, aPath, 0 /* dataVersion */).Encode(kTestFieldValue1);`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`bool IsClusterDataVersionEqual(const ConcreteClusterPath & aConcreteClusterPath, DataVersion aRequiredVersion)`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,8 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr`
`114`	`114`	`{`
`115`	`115`	`state = *apEncoderState;`
`116`	`116`	`}`
`117`		`- AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, path,`
`118`		`- kDataVersion /* data version */, aIsFabricFiltered, state);`
	`117`	`+ AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, path, kDataVersion /* data version */,`
	`118`	`+ aIsFabricFiltered, state);`
`119`	`119`	`ReturnErrorOnFailure(valueEncoder.Encode(true));`
`120`	`120`	`}`
`121`	`121`
`@@ -132,8 +132,8 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr`
`132`	`132`	`{`
`133`	`133`	`state = *apEncoderState;`
`134`	`134`	`}`
`135`		`- AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, aPath,`
`136`		`- kDataVersion /* data version */, aIsFabricFiltered, state);`
	`135`	`+ AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, aPath, kDataVersion /* data version */,`
	`136`	`+ aIsFabricFiltered, state);`
`137`	`137`
`138`	`138`	`return valueEncoder.EncodeList([aSubjectDescriptor](const auto & encoder) -> CHIP_ERROR {`
`139`	`139`	`app::Clusters::UnitTesting::Structs::TestFabricScoped::Type val;`
`@@ -152,17 +152,17 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr`
`152`	`152`	`{`
`153`	`153`	`state = *apEncoderState;`
`154`	`154`	`}`
`155`		`- AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, aPath,`
`156`		`- kDataVersion /* data version */, aIsFabricFiltered, state);`
	`155`	`+ AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, aPath, kDataVersion /* data version */,`
	`156`	`+ aIsFabricFiltered, state);`
`157`	`157`
`158`	`158`	`return valueEncoder.Encode(++totalReadCount);`
`159`	`159`	`}`
`160`	`160`	`if (aPath.mClusterId == kPerpetualClusterId \|\|`
`161`	`161`	`(aPath.mClusterId == app::Clusters::UnitTesting::Id && aPath.mAttributeId == kPerpetualAttributeid))`
`162`	`162`	`{`
`163`	`163`	`AttributeEncodeState state;`
`164`		`- AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, aPath,`
`165`		`- kDataVersion /* data version */, aIsFabricFiltered, state);`
	`164`	`+ AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, aPath, kDataVersion /* data version */,`
	`165`	`+ aIsFabricFiltered, state);`
`166`	`166`
`167`	`167`	`CHIP_ERROR err = valueEncoder.EncodeList([](const auto & encoder) -> CHIP_ERROR {`
`168`	`168`	`encoder.Encode(static_cast<uint8_t>(1));`
`@@ -188,8 +188,8 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr`
`188`	`188`	`{`
`189`	`189`	`state = *apEncoderState;`
`190`	`190`	`}`
`191`		`- AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor.fabricIndex, aPath,`
`192`		`- kDataVersion /* data version */, aIsFabricFiltered, state);`
	`191`	`+ AttributeValueEncoder valueEncoder(aAttributeReports, aSubjectDescriptor, aPath, kDataVersion /* data version */,`
	`192`	`+ aIsFabricFiltered, state);`
`193`	`193`
`194`	`194`	`return valueEncoder.Encode(isLitIcd ? Clusters::IcdManagement::OperatingModeEnum::kLit`
`195`	`195`	`: Clusters::IcdManagement::OperatingModeEnum::kSit);`