Merge 9890f6a into 22bb737

project-chip · Feb 23, 2024 · 3719545 · 3719545
2 parents 22bb737 + 9890f6a
commit 3719545
Show file tree

Hide file tree

Showing 10 changed files with 1,020 additions and 145 deletions.
diff --git a/src/app/tests/suites/certification/Test_TC_DISHALM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DISHALM_1_1.yaml
@@ -11,104 +11,143 @@
 # 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.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
-name: 198.1.1. [TC-DISHALM-1.1] Global attributes with DUT as Server
+name: 198.1.1. [TC-DISHALM-1.1] Global attributes with server as DUT
 
 PICS:
     - DISHALM.S
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
-    endpoint: 0
+    cluster: "Dishwasher Alarm"
+    endpoint: 1
 
 tests:
-    - label: "Note"
-      verification: |
-          Step 5 is currently not supported and SHALL be skipped.
-      disabled: true
+    - label: "1. Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "2. TH reads the ClusterRevision attribute from the DUT"
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          value: 1
+          constraints:
+              type: int16u
+
+    - label: "3. TH reads the FeatureMap attribute from the DUT"
+      PICS: " !DISHALM.S.F00 "
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 0
+          constraints:
+              type: bitmap32
+
+    - label: "3. TH reads the FeatureMap attribute from the DUT"
+      PICS: "DISHALM.S.F00"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x1]
+
+    # Reference issue: https://github.com/project-chip/connectedhomeip/issues/28287
+    - label: "4. TH reads the AttributeList attribute from the DUT"
+      PICS: PICS_EVENT_LIST_ENABLED
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              type: list
+              contains: [0, 2, 3, 65528, 65529, 65530, 65531, 65532, 65533]
+
+    - label: "4. TH reads the AttributeList attribute from the DUT"
+      PICS: "!PICS_EVENT_LIST_ENABLED"
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              type: list
+              contains: [0, 2, 3, 65528, 65529, 65531, 65532, 65533]
+
+    - label: "4. TH reads the attribute(Latch) in AttributeList from the DUT"
+      PICS: DISHALM.S.F00
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              type: list
+              contains: [1]
+
+    # Reference issue: https://github.com/project-chip/connectedhomeip/issues/28287
+    - label: "5. Read the global attribute: EventList"
+      PICS: PICS_EVENT_LIST_ENABLED
+      command: "readAttribute"
+      attribute: "EventList"
+      response:
+          value: [0]
+          constraints:
+              type: list
+
+    # Reference issue: https://github.com/project-chip/connectedhomeip/issues/28287
+    - label: "6. Read the global attribute: AcceptedCommandList"
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+
+    - label: "6. Read the optional attribute (Modify): AcceptedCommandList"
+      PICS: DISHALM.S.C01.Rsp
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+              contains: [1]
+
+    - label: "6. Read the optional attribute (Modify): AcceptedCommandList"
+      PICS: " !DISHALM.S.C01.Rsp "
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+              excludes: [1]
 
     - label:
-          "Step 1: Commission DUT to TH (can be skipped if done in a preceding
-          test)."
-      verification: |
-
-      disabled: true
-
-    - label: "Step 2: TH reads from the DUT the ClusterRevision attribute."
-      verification: |
-          ./chip-tool dishwasheralarm read cluster-revision 1 1
-           Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number 1 on the TH(Chip-tool) and below is the sample log provided for the raspi platform:
-
-           [1688447208.697823][4176:4178] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005D Attribute 0x0000_FFFD DataVersion: 1386394810
-           [1688447208.701428][4176:4178] CHIP:TOO: ClusterRevision: 1
-           [1688447208.701860][4176:4178] CHIP:EM: <<< [E:62008i S:18101 M:251225540 (Ack:117573954)] (S) Msg TX to 1:0000000000000001 [5AF3] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
-
-    - label: "Step 3: TH reads from the DUT the FeatureMap attribute."
-      verification: |
-          ./chip-tool dishwasheralarm read feature-map 1 1
-           On TH(chip-tool), verify that DUT responds the Featuremap value as 1 and below is the sample log provided for the raspi platform:
-
-           [1689841072.440418][2534:2536] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005D Attribute 0x0000_FFFC DataVersion: 3155962179
-           [1689841072.440498][2534:2536] CHIP:TOO: FeatureMap: 1
-           [1689841072.440655][2534:2536] CHIP:EM: <<< [E:51712i S:9959 M:43369330 (Ack:105494463)] (S) Msg TX to 1:0000000000000001 [C4B0] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
-
-    - label: "Step 4: TH reads from the DUT the AttributeList attribute."
-      verification: |
-          ./chip-tool dishwasheralarm read attribute-list 1 1
-           Verify " AttributeList " value consists the list of mandatory attributes (0, 2, 3, 65533, 65532, 65531, 65529, 65528) and optional attributes(1) on the TH(Chip-tool) Log:
-           Below is the sample log provided for the raspi platform:
-          [1692613019.157928][10524:10526] CHIP:DMG: }
-          [1692613019.158276][10524:10526] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005D Attribute 0x0000_FFFB DataVersion: 2220437053
-          [1692613019.158381][10524:10526] CHIP:TOO:   AttributeList: 9 entries
-          [1692613019.158441][10524:10526] CHIP:TOO:     [1]: 0
-          [1692613019.158479][10524:10526] CHIP:TOO:     [2]: 1
-          [1692613019.158517][10524:10526] CHIP:TOO:     [3]: 2
-          [1692613019.158551][10524:10526] CHIP:TOO:     [4]: 3
-          [1692613019.158587][10524:10526] CHIP:TOO:     [5]: 65528
-          [1692613019.158622][10524:10526] CHIP:TOO:     [6]: 65529
-          [1692613019.158657][10524:10526] CHIP:TOO:     [7]: 65531
-          [1692613019.158692][10524:10526] CHIP:TOO:     [8]: 65532
-          [1692613019.158727][10524:10526] CHIP:TOO:     [9]: 65533
-          [1692613019.158909][10524:10526] CHIP:EM: <<< [E:17897i S:25614 M:15345399 (Ack:182319742)] (S) Msg TX to 1:0000000000000001 [5213] --- Type 0000:10 (SecureChannel:StandaloneAck)
-          [1692613019.158968][10524:10526] CHIP:IN: (S) Sending msg 15345399 on secure session with LSID: 25614
-      disabled: true
-
-    - label: "Step 5: TH reads from the DUT the EventList attribute."
-      verification: |
-          ./chip-tool dishwasheralarm read event-list 1 1
-           Verify " EventList attribute " consists the list may contain optional events(1) on the TH(Chip-tool) Log:
-           Below is the sample log provided for the raspi platform:
-
-           [1689677416.105596][18367:18369] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005D Attribute 0x0000_FFFA DataVersion: 1517282962
-           [1689677416.105625][18367:18369] CHIP:TOO: EventList: 1 entries
-           [1689677416.105635][18367:18369] CHIP:TOO: [1]: 0
-           [1689677416.105696][18367:18369] CHIP:EM: <<< [E:51484i S:36714 M:192916227 (Ack:1705890)] (S) Msg TX to 1:0000000000000001 [BFDE] --- Type 0000:10 (SecureChannel:StandaloneAck)
-           [1689677416.105710][18367:18369] CHIP:IN: (S) Sending msg 192916227 on secure session with LSID: 36714
-           [1689677416.105737][18367:18369] CHIP:EM: Flushed pending ack for MessageCounter:1705890 on exchange 51484i
-      disabled: true
-
-    - label: "Step 6: TH reads from the DUT the AcceptedCommandList attribute."
-      verification: |
-          ./chip-tool dishwasheralarm read accepted-command-list 1 1
-           Verify " AcceptedCommandList " consists the list of supported events, which for this cluster should be an empty list on the TH(Chip-tool) Log and below is the sample log provided for the raspi platform:
-
-           [1689841406.078608][2570:2572] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005D Attribute 0x0000_FFF9 DataVersion: 3155962179
-           [1689841406.078674][2570:2572] CHIP:TOO: AcceptedCommandList: 2 entries
-           [1689841406.078701][2570:2572] CHIP:TOO: [1]: 0
-           [1689841406.078724][2570:2572] CHIP:TOO: [2]: 1
-           [1689841406.078870][2570:2572] CHIP:EM: <<< [E:3182i S:59744 M:116852840 (Ack:196212236)] (S) Msg TX to 1:0000000000000001 [C4B0] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
-
-    - label: "Step 7: TH reads from the DUT the GeneratedCommandList attribute."
-      verification: |
-          ./chip-tool dishwasheralarm read generated-command-list 1 1
-           Verify " GeneratedCommandList " consists the list of supported events, which for this cluster should be an empty list on the TH(Chip-tool) Log and below is the sample log provided for the raspi platform:
-
-           [1688447564.178537][4220:4222] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0057 Attribute 0x0000_FFF8 DataVersion: 1795162772
-           [1688447564.178684][4220:4222] CHIP:TOO: GeneratedCommandList: 0 entries
-           [1688447564.178984][4220:4222] CHIP:EM: <<< [E:5540i S:25125 M:256711779 (Ack:197472718)] (S) Msg TX to 1:0000000000000001 [10DB] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
+          "6. Read the attribute (Reset) based on feature support:
+          AcceptedCommandList"
+      PICS: DISHALM.S.C00.Rsp
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+              contains: [0]
+
+    - label:
+          "6. Read the attribute (Reset) based on feature support:
+          AcceptedCommandList"
+      PICS: " !DISHALM.S.C00.Rsp "
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+              excludes: [0]
+
+    # Reference issue: https://github.com/project-chip/connectedhomeip/issues/28287
+    - label: "7. Read the global attribute: GeneratedCommandList"
+      command: "readAttribute"
+      attribute: "GeneratedCommandList"
+      response:
+          value: []
+          constraints:
+              type: list
diff --git a/src/app/tests/suites/certification/Test_TC_DISHALM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DISHALM_2_1.yaml
@@ -11,7 +11,6 @@
 # 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.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name: 198.2.1. [TC-DISHALM-2.1] Attributes with DUT as Server
 
@@ -20,55 +19,46 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    cluster: "Basic Information"
-    endpoint: 0
+    cluster: "Dishwasher Alarm"
+    endpoint: 1
 
 tests:
-    - label: "Step 1: Commission DUT to TH"
-      verification: |
+    - label: "1. Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
 
-      disabled: true
-
-    - label: "Step 2: TH reads from the DUT the Mask attribute"
+    - label: "2. TH reads from the DUT the Mask attribute"
       PICS: DISHALM.S.A0000
-      verification: |
-          ./chip-tool dishwasheralarm read mask 1 1
-           On TH(chip-tool), Verify that the DUT response contains a 32-bit value.
-
-           [1689842323.840486][2610:2612] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005D Attribute 0x0000_0000 DataVersion: 3155962179
-           [1689842323.840542][2610:2612] CHIP:TOO: Mask: 47
-           [1689842323.840664][2610:2612] CHIP:EM: <<< [E:45223i S:40488 M:16127435 (Ack:224755341)] (S) Msg TX to 1:0000000000000001 [C4B0] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
-
-    - label: "Step 3: TH reads from the DUT the Latch attribute"
-      PICS: DISHALM.S.F00 && DISHALM.S.A0001
-      verification: |
-          ./chip-tool dishwasheralarm read latch 1 1
-           On TH(chip-tool), Verify that the DUT response contains a 32-bit.
+      command: "readAttribute"
+      attribute: "Mask"
+      response:
+          constraints:
+              type: bitmap32
 
-           [1689842371.478172][2614:2616] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005D Attribute 0x0000_0001 DataVersion: 3155962179
-           [1689842371.478244][2614:2616] CHIP:TOO: Latch: 3
-           [1689842371.478410][2614:2616] CHIP:EM: <<< [E:35394i S:46214 M:140335917 (Ack:184279491)] (S) Msg TX to 1:0000000000000001 [C4B0] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
+    - label: "3. TH reads from the DUT the Latch attribute"
+      PICS: DISHALM.S.A0001
+      command: "readAttribute"
+      attribute: "Latch"
+      response:
+          constraints:
+              type: bitmap32
 
-    - label: "Step 4: TH reads from the DUT the State attribute"
+    - label: "4. TH reads from the DUT the State attribute"
       PICS: DISHALM.S.A0002
-      verification: |
-          ./chip-tool dishwasheralarm read state 1 1
-           On TH(chip-tool), Verify that the DUT response contains a 32-bit value.
+      command: "readAttribute"
+      attribute: "State"
+      response:
+          constraints:
+              type: bitmap32
 
-           [1689842479.694724][2624:2626] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005D Attribute 0x0000_0002 DataVersion: 3155962179
-           [1689842479.694781][2624:2626] CHIP:TOO: State: 7
-           [1689842479.694921][2624:2626] CHIP:EM: <<< [E:40120i S:46763 M:178458342 (Ack:246107556)] (S) Msg TX to 1:0000000000000001 [C4B0] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
-
-    - label: "Step 4: TH reads from the DUT the Supported attribute"
+    - label: "5. TH reads from the DUT the Supported attribute"
       PICS: DISHALM.S.A0003
-      verification: |
-          ./chip-tool dishwasheralarm read supported 1 1
-           On TH(chip-tool), Verify that the DUT response contains a 32-bit value.
-
-           [1689842542.000773][2629:2631] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005D Attribute 0x0000_0003 DataVersion: 3155962179
-           [1689842542.000839][2629:2631] CHIP:TOO: Supported: 47
-           [1689842542.000982][2629:2631] CHIP:EM: <<< [E:28372i S:5416 M:234677238 (Ack:122316593)] (S) Msg TX to 1:0000000000000001 [C4B0] --- Type 0000:10 (SecureChannel:StandaloneAck)
-      disabled: true
+      command: "readAttribute"
+      attribute: "Supported"
+      response:
+          constraints:
+              type: bitmap32
diff --git a/src/app/tests/suites/ciTests.json b/src/app/tests/suites/ciTests.json
@@ -57,6 +57,7 @@
         "Test_TC_DGETH_2_2"
     ],
     "DiagnosticsLogs": ["Test_TC_DLOG_1_1"],
+    "DishwasherAlarm": ["Test_TC_DISHALM_1_1", "Test_TC_DISHALM_2_1"],
     "EnergyEVSE": ["Test_TC_EEVSE_1_1", "Test_TC_EEVSE_2_1"],
     "EnergyEVSEMode": [
         "Test_TC_EEVSEM_1_1",
@@ -401,6 +402,7 @@
         "Binding",
         "ColorControl",
         "ConcentrationMeasurement",
+        "DishwasherAlarm",
         "ContentAppObserver",
         "DeviceManagement",
         "DeviceEnergyManagementMode",

diff --git a/src/app/tests/suites/manualTests.json b/src/app/tests/suites/manualTests.json
@@ -63,16 +63,6 @@
         "Test_TC_DA_1_6",
         "Test_TC_DA_1_8"
     ],
-    "DishwasherAlarm": [
-        "Test_TC_DISHALM_1_1",
-        "Test_TC_DISHALM_2_1",
-        "Test_TC_DISHALM_3_1",
-        "Test_TC_DISHALM_3_2",
-        "Test_TC_DISHALM_3_3",
-        "Test_TC_DISHALM_3_4",
-        "Test_TC_DISHALM_3_5",
-        "Test_TC_DISHALM_3_6"
-    ],
     "DishwasherMode": [
         "Test_TC_DISHM_1_1",
         "Test_TC_DISHM_1_2",
@@ -320,7 +310,6 @@
         "DeviceAttestation",
         "DeviceManagement",
         "DiagnosticsLogs",
-        "DishwasherAlarm",
         "DishwasherMode",
         "Descriptor",
         "DeviceEnergyManagementMode",