Implemented Feature Flag to Enable/Disable Global EventList Attribute (…

…#25294) * Implemented Feature Flag to Enable/Disable Global EventList Attribute * Added ifdefs to the TestAttributePathExpandIterator.cpp test * Updated YAML tests * ZAP REGEN
project-chip · Feb 25, 2023 · b89e83b · b89e83b
1 parent 265d55c
commit b89e83b
Show file tree

Hide file tree

Showing 59 changed files with 140 additions and 221 deletions.
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -40,6 +40,8 @@ declare_args() {
 
   # By default, the resources used by each fabric is unlimited if they are allocated on heap. This flag is for checking the resource usage even when they are allocated on heap to increase code coverage in integration tests.
   chip_im_force_fabric_quota_check = false
+
+  enable_eventlist_attribute = false
 }
 
 buildconfig_header("app_buildconfig") {
@@ -52,6 +54,7 @@ buildconfig_header("app_buildconfig") {
     "CHIP_CONFIG_ENABLE_SESSION_RESUMPTION=${chip_enable_session_resumption}",
     "CHIP_CONFIG_ACCESS_CONTROL_POLICY_LOGGING_VERBOSITY=${chip_access_control_policy_logging_verbosity}",
     "CHIP_CONFIG_PERSIST_SUBSCRIPTIONS=${chip_persist_subscriptions}",
+    "CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE=${enable_eventlist_attribute}",
   ]
 }
 

diff --git a/src/app/GlobalAttributes.h b/src/app/GlobalAttributes.h
@@ -31,7 +31,9 @@ namespace app {
 constexpr AttributeId GlobalAttributesNotInMetadata[] = {
     Clusters::Globals::Attributes::GeneratedCommandList::Id,
     Clusters::Globals::Attributes::AcceptedCommandList::Id,
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
     Clusters::Globals::Attributes::EventList::Id,
+#endif // CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
     Clusters::Globals::Attributes::AttributeList::Id,
 };
 

diff --git a/src/app/tests/TestAttributePathExpandIterator.cpp b/src/app/tests/TestAttributePathExpandIterator.cpp
@@ -49,28 +49,36 @@ void TestAllWildcard(nlTestSuite * apSuite, void * apContext)
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint1, MockClusterId(2), MockAttributeId(1) },
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint2, MockClusterId(2), MockAttributeId(1) },
         { kMockEndpoint2, MockClusterId(2), MockAttributeId(2) },
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id },
@@ -79,14 +87,18 @@ void TestAllWildcard(nlTestSuite * apSuite, void * apContext)
         { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint3, MockClusterId(1), MockAttributeId(1) },
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
@@ -96,19 +108,25 @@ void TestAllWildcard(nlTestSuite * apSuite, void * apContext)
         { kMockEndpoint3, MockClusterId(2), MockAttributeId(4) },
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AttributeList::Id },
     };
 
@@ -214,7 +232,9 @@ void TestWildcardAttribute(nlTestSuite * apSuite, void * apContext)
         { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
     };
 
@@ -287,28 +307,36 @@ void TestMultipleClusInfo(nlTestSuite * apSuite, void * apContext)
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint1, MockClusterId(2), MockAttributeId(1) },
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint2, MockClusterId(2), MockAttributeId(1) },
         { kMockEndpoint2, MockClusterId(2), MockAttributeId(2) },
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id },
@@ -317,14 +345,18 @@ void TestMultipleClusInfo(nlTestSuite * apSuite, void * apContext)
         { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint3, MockClusterId(1), MockAttributeId(1) },
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
@@ -334,19 +366,25 @@ void TestMultipleClusInfo(nlTestSuite * apSuite, void * apContext)
         { kMockEndpoint3, MockClusterId(2), MockAttributeId(4) },
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::ClusterRevision::Id },
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::FeatureMap::Id },
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
         { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
@@ -360,7 +398,9 @@ void TestMultipleClusInfo(nlTestSuite * apSuite, void * apContext)
         { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
+#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
+#endif
         { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
         { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
     };

diff --git a/src/app/tests/suites/TestBasicInformation.yaml b/src/app/tests/suites/TestBasicInformation.yaml
@@ -79,7 +79,6 @@ tests:
                   19,
                   0xFFF8, # GeneratedCommandList
                   0xFFF9, # AcceptedCommandList
-                  0xFFFA, # EventList
                   0xFFFB, # AttributeList
                   0xFFFC, # FeatureMap
                   0xFFFD, # ClusterRevision

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml
@@ -53,7 +53,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [0, 2, 3, 4, 65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [0, 2, 3, 4, 65528, 65529, 65531, 65532, 65533]
 
     - label: "TH reads optional attribute (Extension) in AttributeList"
       PICS: ACL.S.A0001

diff --git a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
@@ -53,7 +53,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [0, 1, 65528, 65529, 65531, 65532, 65533]
 
     - label: "Read the optional attribute(SetupURL) in AttributeList"
       PICS: ACT.S.A0002

diff --git a/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml b/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml
@@ -55,7 +55,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [65528, 65529, 65531, 65532, 65533]
 
     - label: "Read the global attribute: AcceptedCommandList"
       command: "readAttribute"

diff --git a/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml b/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml
@@ -55,8 +55,7 @@ tests:
       response:
           constraints:
               type: list
-              contains:
-                  [2, 4, 5, 6, 7, 65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [2, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533]
 
     - label: "Read the optional attribute(VendorName) in AttributeList"
       PICS: APBSC.S.A0000

diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml
@@ -65,7 +65,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [65528, 65529, 65531, 65532, 65533]
 
     - label: "Read the optional attribute(CatalogList) in AttributeList"
       PICS: APPLAUNCHER.S.A0000

diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
@@ -56,7 +56,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [0, 1, 65528, 65529, 65531, 65532, 65533]
 
     - label: "Read the global attribute: AcceptedCommandList"
       command: "readAttribute"

diff --git a/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml
@@ -53,7 +53,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [0, 65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [0, 65528, 65529, 65531, 65532, 65533]
 
     - label: "TH reads AcceptedCommandList from DUT"
       command: "readAttribute"

diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml
@@ -53,7 +53,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [0, 65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [0, 65528, 65529, 65531, 65532, 65533]
 
     - label: "Read the global attribute: AcceptedCommandList"
       command: "readAttribute"

diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml
@@ -56,7 +56,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [17, 65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [17, 65528, 65529, 65531, 65532, 65533]
 
     - label: "TH reads optional attribute(VendorName) in AttributeList"
       PICS: BRBINFO.S.A0001

diff --git a/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml
@@ -99,19 +99,7 @@ tests:
       response:
           constraints:
               type: list
-              contains:
-                  [
-                      8,
-                      15,
-                      16385,
-                      16394,
-                      65528,
-                      65529,
-                      65530,
-                      65531,
-                      65532,
-                      65533,
-                  ]
+              contains: [8, 15, 16385, 16394, 65528, 65529, 65531, 65532, 65533]
 
     - label: "Read the optional attribute(CurrentHue) in AttributeList"
       PICS: CC.S.A0000

diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml
@@ -53,8 +53,7 @@ tests:
       response:
           constraints:
               type: list
-              contains:
-                  [0, 1, 2, 3, 4, 65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533]
 
     - label: "Read the global attribute: AcceptedCommandList"
       command: "readAttribute"

diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml
@@ -73,7 +73,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [65528, 65529, 65531, 65532, 65533]
 
     - label: "Read the optional attribute(ChannelList): AttributeList"
       PICS: CHANNEL.S.A0000

diff --git a/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
@@ -75,7 +75,7 @@ tests:
       response:
           constraints:
               type: list
-              contains: [65528, 65529, 65530, 65531, 65532, 65533]
+              contains: [65528, 65529, 65531, 65532, 65533]
 
     - label:
           "Read mandatory attributes in AttributeList if