Update TestListStructOctet to use member names that are generic (#19321)

Update TestListStructOctet to use member names that are generic
project-chip · Jun 27, 2023 · 1919081 · 1919081
1 parent ab3148b
commit 1919081
Show file tree

Hide file tree

Showing 29 changed files with 166 additions and 186 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3084,8 +3084,8 @@ server cluster TestCluster = 4294048773 {
   }
 
   struct TestListStructOctet {
-    int64u fabricIndex = 0;
-    octet_string<32> operationalCert = 1;
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
   }
 
   struct NullablesAndOptionalsStruct {

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -2554,8 +2554,8 @@ server cluster TestCluster = 4294048773 {
   }
 
   struct TestListStructOctet {
-    int64u fabricIndex = 0;
-    octet_string<32> operationalCert = 1;
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
   }
 
   struct NullablesAndOptionalsStruct {

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -1897,8 +1897,8 @@ server cluster TestCluster = 4294048773 {
   }
 
   struct TestListStructOctet {
-    int64u fabricIndex = 0;
-    octet_string<32> operationalCert = 1;
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
   }
 
   info event TestEvent = 1 {

diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
@@ -384,8 +384,8 @@ CHIP_ERROR TestAttrAccess::ReadListStructOctetStringAttribute(AttributeValueEnco
         for (size_t index = 0; index < gListOperationalCertLen; index++)
         {
             Structs::TestListStructOctet::Type structOctet;
-            structOctet.fabricIndex     = listStructOctetStringData[index].fabricIndex;
-            structOctet.operationalCert = listStructOctetStringData[index].operationalCert;
+            structOctet.member1 = listStructOctetStringData[index].member1;
+            structOctet.member2 = listStructOctetStringData[index].member2;
             ReturnErrorOnFailure(encoder.Encode(structOctet));
         }
 
@@ -409,12 +409,12 @@ CHIP_ERROR TestAttrAccess::WriteListStructOctetStringAttribute(const ConcreteDat
             const auto & entry = iter.GetValue();
 
             VerifyOrReturnError(index < kAttributeListLength, CHIP_ERROR_BUFFER_TOO_SMALL);
-            VerifyOrReturnError(entry.operationalCert.size() <= kAttributeEntryLength, CHIP_ERROR_BUFFER_TOO_SMALL);
-            memcpy(gListOperationalCert[index].Data(), entry.operationalCert.data(), entry.operationalCert.size());
-            gListOperationalCert[index].SetLength(entry.operationalCert.size());
+            VerifyOrReturnError(entry.member2.size() <= kAttributeEntryLength, CHIP_ERROR_BUFFER_TOO_SMALL);
+            memcpy(gListOperationalCert[index].Data(), entry.member2.data(), entry.member2.size());
+            gListOperationalCert[index].SetLength(entry.member2.size());
 
-            listStructOctetStringData[index].fabricIndex     = entry.fabricIndex;
-            listStructOctetStringData[index].operationalCert = gListOperationalCert[index].AsSpan();
+            listStructOctetStringData[index].member1 = entry.member1;
+            listStructOctetStringData[index].member2 = gListOperationalCert[index].AsSpan();
 
             index++;
         }
@@ -435,12 +435,12 @@ CHIP_ERROR TestAttrAccess::WriteListStructOctetStringAttribute(const ConcreteDat
         size_t index = gListOperationalCertLen;
 
         VerifyOrReturnError(index < kAttributeListLength, CHIP_ERROR_BUFFER_TOO_SMALL);
-        VerifyOrReturnError(entry.operationalCert.size() <= kAttributeEntryLength, CHIP_ERROR_BUFFER_TOO_SMALL);
-        memcpy(gListOperationalCert[index].Data(), entry.operationalCert.data(), entry.operationalCert.size());
-        gListOperationalCert[index].SetLength(entry.operationalCert.size());
+        VerifyOrReturnError(entry.member2.size() <= kAttributeEntryLength, CHIP_ERROR_BUFFER_TOO_SMALL);
+        memcpy(gListOperationalCert[index].Data(), entry.member2.data(), entry.member2.size());
+        gListOperationalCert[index].SetLength(entry.member2.size());
 
-        listStructOctetStringData[index].fabricIndex     = entry.fabricIndex;
-        listStructOctetStringData[index].operationalCert = gListOperationalCert[index].AsSpan();
+        listStructOctetStringData[index].member1 = entry.member1;
+        listStructOctetStringData[index].member2 = gListOperationalCert[index].AsSpan();
 
         gListOperationalCertLen++;
         return CHIP_NO_ERROR;
@@ -681,9 +681,9 @@ bool emberAfTestClusterClusterTestCallback(app::CommandHandler *, const app::Con
         gListUint8Data[i] = 0;
         gListOctetStringData[i].SetLength(0);
         gListOperationalCert[i].SetLength(0);
-        listStructOctetStringData[i].fabricIndex     = 0;
-        listStructOctetStringData[i].operationalCert = ByteSpan();
-        gSimpleEnums[i]                              = SimpleEnum::kUnspecified;
+        listStructOctetStringData[i].member1 = 0;
+        listStructOctetStringData[i].member2 = ByteSpan();
+        gSimpleEnums[i]                      = SimpleEnum::kUnspecified;
     }
     gSimpleEnumCount = 0;
 

diff --git a/src/app/tests/TestBufferedReadCallback.cpp b/src/app/tests/TestBufferedReadCallback.cpp
@@ -185,7 +185,7 @@ void DataSeriesValidator::OnAttributeData(const ConcreteDataAttributePath & aPat
         while (iter.Next() && index < expectedListLength)
         {
             auto & iterValue = iter.GetValue();
-            NL_TEST_ASSERT(gSuite, iterValue.fabricIndex == (index));
+            NL_TEST_ASSERT(gSuite, iterValue.member1 == (index));
             index++;
         }
 
@@ -353,7 +353,7 @@ void DataSeriesGenerator::Generate()
             uint8_t index2 = 0;
             for (auto & item : listData)
             {
-                item.fabricIndex = index2;
+                item.member1 = index2;
                 index2++;
             }
 
@@ -446,7 +446,7 @@ void DataSeriesGenerator::Generate()
                 path.mAttributeId = Clusters::TestCluster::Attributes::ListStructOctetString::Id;
                 path.mListOp      = ConcreteDataAttributePath::ListOperation::AppendItem;
 
-                listItem.fabricIndex = (uint64_t) i;
+                listItem.member1 = (uint64_t) i;
 
                 NL_TEST_ASSERT(gSuite, DataModel::Encode(writer, TLV::AnonymousTag(), listItem) == CHIP_NO_ERROR);
 

diff --git a/src/app/tests/TestClusterStateCache.cpp b/src/app/tests/TestClusterStateCache.cpp
@@ -235,7 +235,7 @@ void DataSeriesGenerator::Generate(ForwardedDataCallbackValidator & dataCallback
 
                 for (auto & i : buf)
                 {
-                    i.fabricIndex = instruction.mInstructionId;
+                    i.member1 = instruction.mInstructionId;
                 }
 
                 Clusters::TestCluster::Attributes::ListStructOctetString::TypeInfo::Type value;
@@ -384,7 +384,7 @@ class CacheValidator : public ClusterStateCache::Callback
                 auto listIter = v.begin();
                 while (listIter.Next())
                 {
-                    NL_TEST_ASSERT(gSuite, listIter.GetValue().fabricIndex == instruction.mInstructionId);
+                    NL_TEST_ASSERT(gSuite, listIter.GetValue().member1 == instruction.mInstructionId);
                 }
 
                 NL_TEST_ASSERT(gSuite, listIter.GetStatus() == CHIP_NO_ERROR);
@@ -438,7 +438,7 @@ class CacheValidator : public ClusterStateCache::Callback
                 auto listIter = clusterValue.listStructOctetString.begin();
                 while (listIter.Next())
                 {
-                    NL_TEST_ASSERT(gSuite, listIter.GetValue().fabricIndex == instruction.mInstructionId);
+                    NL_TEST_ASSERT(gSuite, listIter.GetValue().member1 == instruction.mInstructionId);
                 }
 
                 NL_TEST_ASSERT(gSuite, listIter.GetStatus() == CHIP_NO_ERROR);

diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
@@ -1562,10 +1562,10 @@ tests:
       arguments:
           value:
               [
-                  { fabricIndex: 0, operationalCert: "Test0" },
-                  { fabricIndex: 1, operationalCert: "Test1" },
-                  { fabricIndex: 2, operationalCert: "Test2" },
-                  { fabricIndex: 3, operationalCert: "Test3" },
+                  { member1: 0, member2: "Test0" },
+                  { member1: 1, member2: "Test1" },
+                  { member1: 2, member2: "Test2" },
+                  { member1: 3, member2: "Test3" },
               ]
 
     - label: "Read attribute LIST With List of LIST_STRUCT_OCTET_STRING"
@@ -1574,10 +1574,10 @@ tests:
       response:
           value:
               [
-                  { fabricIndex: 0, operationalCert: "Test0" },
-                  { fabricIndex: 1, operationalCert: "Test1" },
-                  { fabricIndex: 2, operationalCert: "Test2" },
-                  { fabricIndex: 3, operationalCert: "Test3" },
+                  { member1: 0, member2: "Test0" },
+                  { member1: 1, member2: "Test1" },
+                  { member1: 2, member2: "Test2" },
+                  { member1: 3, member2: "Test3" },
               ]
 
     # Tests for Nullables and Optionals

diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
@@ -18,8 +18,8 @@ limitations under the License.
   <domain name="CHIP"/>
   <struct name="TestListStructOctet">
     <cluster code="0xFFF1FC05"/>
-    <item name="fabricIndex" type="INT64U"/>
-    <item name="operationalCert" type="OCTET_STRING" length="32"/>
+    <item name="member1" type="INT64U"/>
+    <item name="member2" type="OCTET_STRING" length="32"/>
   </struct>
 
   <struct name="TestFabricScoped">

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -3518,8 +3518,8 @@ client cluster TestCluster = 4294048773 {
   }
 
   struct TestListStructOctet {
-    int64u fabricIndex = 0;
-    octet_string<32> operationalCert = 1;
+    int64u member1 = 0;
+    octet_string<32> member2 = 1;
   }
 
   struct NullablesAndOptionalsStruct {

diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/controller/tests/data_model/TestRead.cpp b/src/controller/tests/data_model/TestRead.cpp
@@ -145,7 +145,7 @@ CHIP_ERROR ReadSingleClusterData(const Access::SubjectDescriptor & aSubjectDescr
         uint8_t i = 0;
         for (auto & item : valueBuf)
         {
-            item.fabricIndex = i;
+            item.member1 = i;
             i++;
         }
 
@@ -328,7 +328,7 @@ void TestReadInteraction::TestReadAttributeResponse(nlTestSuite * apSuite, void
         while (iter.Next())
         {
             auto & item = iter.GetValue();
-            NL_TEST_ASSERT(apSuite, item.fabricIndex == i);
+            NL_TEST_ASSERT(apSuite, item.member1 == i);
             i++;
         }
         NL_TEST_ASSERT(apSuite, i == 4);