Rebasing and updating

examples/chip-tool/templates/tests/tests.js

@@ -96,8 +96,6 @@ function getManualTests()
   ];
 
   const Identify = [
-    'Test_TC_I_1_1',
-    'Test_TC_I_2_1',
     'Test_TC_I_2_2',
     'Test_TC_I_2_3',
   ];
@@ -305,6 +303,11 @@ function getTests()
     'Test_TC_FLW_2_2',
   ];
 
+  const Identify = [
+    'Test_TC_I_1_1',
+    'Test_TC_I_2_1',
+  ];
+
   const IlluminanceMeasurement = [
     'Test_TC_ILL_1_1',
   ];
@@ -327,6 +330,17 @@ function getTests()
 
   const MediaControl = [
     'Test_TC_MC_1_1',
+    'Test_TC_MC_1_2',
+    'Test_TC_MC_1_3',
+    'Test_TC_MC_1_4',
+    'Test_TC_MC_1_5',
+    'Test_TC_MC_1_6',
+    'Test_TC_MC_1_7',
+    'Test_TC_MC_1_8',
+    'Test_TC_MC_1_9',
+    'Test_TC_MC_1_10',
+    'Test_TC_MC_1_11',
+    'Test_TC_MC_1_12',
     'Test_TC_MC_2_1',
     'Test_TC_MC_3_1',
     'Test_TC_MC_3_2',
@@ -373,6 +387,7 @@ function getTests()
     'Test_TC_PCC_2_1',
     'Test_TC_PCC_2_2',
     'Test_TC_PCC_2_3',
+    'Test_TC_PCC_2_4',
   ];
 
   const RelativeHumidityMeasurement = [
@@ -495,6 +510,7 @@ function getTests()
     ElectricalMeasurement, //
     EthernetNetworkDiagnostics, //
     FlowMeasurement, //
+    Identify, //
     IlluminanceMeasurement, //
     LevelControl, //
     MediaControl, //

src/app/tests/suites/certification/Test_TC_I_1_1.yaml

@@ -16,21 +16,59 @@ name: 57.1.1. [TC-I-1.1] Global attributes with server as DUT
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
+    cluster: "Identify"
+    endpoint: 1
 
 tests:
-    - label: "Commission DUT to TH"
-      disabled: true
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
 
+    #issue #12190 as per spec default value is 4 but expecting 2
     - label: "TH reads the ClusterRevision attribute from the DUT"
       disabled: true
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          value: 4
 
-    - label: "TH reads the AttributeList attribute from the DUT"
-      disabled: true
+    - label: "Reads constraints of ClusterRevision attribute"
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          constraints:
+              type: uint16
 
-    - label: "TH reads the CommandList attribute from the DUT"
-      disabled: true
+    - label: "Read the global attribute: AttributeList"
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              type: list
+
+    - label: "Read the global attribute: ClientGeneratedCommandList"
+      command: "readAttribute"
+      attribute: "ClientGeneratedCommandList"
+      response:
+          constraints:
+              type: list
+
+    - label: "Read the global attribute: ServerGeneratedCommandList"
+      command: "readAttribute"
+      attribute: "ServerGeneratedCommandList"
+      response:
+          constraints:
+              type: list
 
-    - label: "TH reads the EventList attribute from the DUT"
+    #issue #11053 disabled steps below Global attributes missing from YAML framework
+    - label: "Read the global attribute: EventList"
       disabled: true
+      command: "readAttribute"
+      attribute: "EventList"
+      response:
+          constraints:
+              type: list

src/app/tests/suites/certification/Test_TC_I_2_1.yaml

@@ -16,15 +16,30 @@ name: 57.2.1. [TC-I-2.1] Attributes with server as DUT
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
+    cluster: "Identify"
+    endpoint: 1
 
 tests:
-    - label: "Commission DUT to TH"
-      disabled: true
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
 
     - label: "TH reads the IdentifyTime attribute from the DUT"
-      disabled: true
+      command: "readAttribute"
+      attribute: "identify time"
+      response:
+          constraints:
+              type: uint16
 
     - label: "TH reads the IdentifyType attribute from the DUT"
-      disabled: true
+      command: "readAttribute"
+      attribute: "identify type"
+      response:
+          constraints:
+              type: enum8
+              minValue: 0
+              maxValue: 5

src/app/tests/suites/certification/Test_TC_MC_1_1.yaml

@@ -16,7 +16,7 @@ name: 15.1.1. [TC-MC-1.1] Global attributes with server as DUT
 
 config:
     nodeId: 0x12344321
-    cluster: "Media Input"
+    cluster: "Low Power"
     endpoint: 1
 
 tests:
@@ -41,22 +41,6 @@ tests:
           constraints:
               type: uint16
 
-    - label:
-          "write the default values to mandatory global attribute:
-          ClusterRevision"
-      command: "writeAttribute"
-      attribute: "ClusterRevision"
-      arguments:
-          value: 1
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "reads back global attribute: ClusterRevision"
-      command: "readAttribute"
-      attribute: "ClusterRevision"
-      response:
-          value: 1
-
     - label: "Read the global attribute: AttributeList"
       command: "readAttribute"
       attribute: "AttributeList"
@@ -103,19 +87,3 @@ tests:
       response:
           constraints:
               type: map32
-
-    - label: "write the default values to optional global attribute: FeatureMap"
-      disabled: true
-      command: "writeAttribute"
-      attribute: "FeatureMap"
-      arguments:
-          value: 0
-      response:
-          error: UNSUPPORTED_WRITE
-
-    - label: "reads back optional global attribute: FeatureMap"
-      disabled: true
-      command: "readAttribute"
-      attribute: "FeatureMap"
-      response:
-          value: 0

src/app/tests/suites/certification/Test_TC_MC_1_10.yaml

@@ -0,0 +1,91 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name:
+    18.1.10. [TC-MC-1.10] Global attributes - Application Basic Cluster (DUT as
+    Server)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Application Basic"
+    endpoint: 1
+
+tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "read the global attribute: ClusterRevision"
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          value: 1
+
+    - label: "Read the global attribute constraints: ClusterRevision"
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          constraints:
+              type: uint16
+
+    - label: "Read the global attribute: AttributeList"
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              type: list
+
+    #issue #11053 disabled steps below Global attributes missing from YAML framework
+    - label: "Read the global attribute: EventList"
+      disabled: true
+      command: "readAttribute"
+      attribute: "EventList"
+      response:
+          constraints:
+              type: list
+
+    - label: "Read the global attribute: ClientGeneratedCommandList"
+      disabled: true
+      command: "readAttribute"
+      attribute: "ClientGeneratedCommandList"
+      response:
+          constraints:
+              type: list
+
+    - label: "Read the global attribute: ServerGeneratedCommandList"
+      disabled: true
+      command: "readAttribute"
+      attribute: "ServerGeneratedCommandList"
+      response:
+          constraints:
+              type: list
+
+    - label: "read the optional global attribute: FeatureMap"
+      disabled: true
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 0
+
+    - label: "Read the optional global attribute : FeatureMap"
+      disabled: true
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: map32

src/app/tests/suites/certification/Test_TC_MC_1_11.yaml

@@ -0,0 +1,91 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name:
+    18.1.11. [TC-MC-1.11] Global attributes - Content Launcher Cluster (DUT as
+    Server)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Content Launcher"
+    endpoint: 1
+
+tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "read the global attribute: ClusterRevision"
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          value: 1
+
+    - label: "Read the global attribute constraints: ClusterRevision"
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          constraints:
+              type: uint16
+
+    - label: "Read the global attribute: AttributeList"
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              type: list
+
+    #issue #11053 disabled steps below Global attributes missing from YAML framework
+    - label: "Read the global attribute: EventList"
+      disabled: true
+      command: "readAttribute"
+      attribute: "EventList"
+      response:
+          constraints:
+              type: list
+
+    - label: "Read the global attribute: ClientGeneratedCommandList"
+      disabled: true
+      command: "readAttribute"
+      attribute: "ClientGeneratedCommandList"
+      response:
+          constraints:
+              type: list
+
+    - label: "Read the global attribute: ServerGeneratedCommandList"
+      disabled: true
+      command: "readAttribute"
+      attribute: "ServerGeneratedCommandList"
+      response:
+          constraints:
+              type: list
+
+    - label: "read the optional global attribute: FeatureMap"
+      disabled: true
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 0
+
+    - label: "Read the optional global attribute : FeatureMap"
+      disabled: true
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: map32