diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml index 8c6ed0214912ca..de93ae25bf975f 100644 --- a/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml @@ -116,28 +116,17 @@ tests: contains: [5] - label: "TH reads AcceptedCommandList from DUT" - PICS: " !DISHM.S.F02" command: "readAttribute" attribute: "AcceptedCommandList" response: constraints: type: list - contains: [0, 1] - - - label: "TH reads AcceptedCommandList from DUT" - PICS: DISHM.S.F01 - command: "readAttribute" - attribute: "AcceptedCommandList" - response: - constraints: - type: list - contains: [1] + contains: [0] - label: "Read the global attribute: GeneratedCommandList" - PICS: DISHM.S.F01 command: "readAttribute" attribute: "GeneratedCommandList" response: - value: [2] + value: [] constraints: type: list \ No newline at end of file diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_1_2.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_1_2.yaml index 3d768484f489e5..e6e1c2bcca404a 100644 --- a/src/app/tests/suites/certification/Test_TC_DISHM_1_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_DISHM_1_2.yaml @@ -19,8 +19,8 @@ PICS: - DISHM.S config: - nodeId: 0x12344321 - cluster: "Dishwasher Mode Select" + nodeId: 0x0059 + cluster: "Dishwasher Mode" endpoint: 1 tests: @@ -37,7 +37,10 @@ tests: command: "readAttribute" attribute: "SupportedModes" response: - saveAs: "supported_modes_dut" + values: + - name: "Mode" + saveAs: supported_modes_dut + value: [0, 1, 2] constraints: type: list @@ -46,32 +49,36 @@ tests: command: "readAttribute" attribute: "CurrentMode" response: + value: 0 constraints: type: int16u - value: supported_modes_dut + - label: "TH reads the OnMode attribute from the DUT" PICS: DISHM.S.A0005 command: "readAttribute" attribute: "OnMode" response: + value: supported_modes_dut constraints: type: int16u - value: supported_modes_dut + - label: "TH reads the StartUpMode attribute from the DUT" PICS: DISHM.S.A0004 command: "readAttribute" attribute: "StartUpMode" response: + value: supported_modes_dut constraints: type: int16u - value: supported_modes_dut + - label: "TH reads the Description attribute from the DUT" PICS: DISHM.S.A0000 command: "readAttribute" attribute: "Description" response: + value: "" constraints: - type: string \ No newline at end of file + type: char_string \ No newline at end of file diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_2_1.yaml index 5f3cdd4902eab3..793d1e793f7638 100644 --- a/src/app/tests/suites/certification/Test_TC_DISHM_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DISHM_2_1.yaml @@ -19,9 +19,15 @@ PICS: - DISHM.S config: - nodeId: 0x12344321 - cluster: "Dishwasher Mode Select" + nodeId: 0x0059 + cluster: "Dishwasher Mode" endpoint: 1 + new_mode_th: + type: INT16U + defaultValue: 1 + invalid_mode_th: + type: INT16U + defaultValue: 3 tests: - label: "Wait for the commissioned device to be retrieved" @@ -37,7 +43,10 @@ tests: command: "readAttribute" attribute: "SupportedModes" response: - saveAs: "supported_modes_dut" + values: + - name: "Mode" + saveAs: supported_modes_dut + value: [0, 1, 2] constraints: type: list @@ -46,41 +55,59 @@ tests: command: "readAttribute" attribute: "CurrentMode" response: - saveAs: "old_current_mode_dut" + values: + - name: "old_current_mode_dut" + saveAs: old_current_mode_dut + value: 0 constraints: type: int16u - new_mode_th: 16385 - invalid_mode_th: 16387 - label: "TH send a ChangeToMode command to the DUT with NewMode set to old_current_mode_dut" PICS: DISHM.S.C01.Rsp - command: "changeToMode" - attribute: old_current_mode_dut + command: "writeAttribute" + attribute: "ChangeToMode" + arguments: + values: + - name: "arg1" + value: old_current_mode_dut response: - constraints: - type: string - value: 2 + value: "" + constraints: + type: char_string + - label: "TH send a ChangeToMode command to the DUT with NewMode set to new_mode_th" PICS: DISHM.S.C01.Rsp - command: "changeToMode" - attribute: new_mode_th + command: "writeAttribute" + attribute: "ChangeToMode" + arguments: + values: + - name: "arg1" + value: new_mode_th - label: "TH reads the CurrentMode attribute from the DUT" PICS: DISHM.S.A0003 command: "readAttribute" attribute: "CurrentMode" response: + values: + - name: "new_mode_th" + value: new_mode_th constraints: type: int16u - value: new_mode_th + - label: "TH send a ChangeToMode command to the DUT with NewMode set to new_mode_th" PICS: DISHM.S.C01.Rsp - command: "changeToMode" - attribute: invalid_mode_th + command: "writeAttribute" + attribute: "ChangeToMode" + arguments: + values: + - name: "arg1" + value: invalid_mode_th response: + value: 1 constraints: type: int16u - value: 1 \ No newline at end of file + \ No newline at end of file diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_3_1.yaml index 701acb2a08a729..36fccf4d6a708e 100644 --- a/src/app/tests/suites/certification/Test_TC_DISHM_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DISHM_3_1.yaml @@ -14,9 +14,12 @@ PICS: - DISHM.S config: - nodeId: 0x12344321 - cluster: "Dishwasher Mode Select" + nodeId: 0x0059 + cluster: "Dishwasher Mode" endpoint: 1 + new_mode_th: + type: INT16U + defaultValue: 2 tests: - label: "Wait for the commissioned device to be retrieved" @@ -32,7 +35,10 @@ tests: command: "readAttribute" attribute: "OnMode" response: - saveAs: "on_mode_dut" + values: + - name: "on_mode_dut" + saveAs: on_mode_dut + value: 0 constraints: type: int16u @@ -41,7 +47,10 @@ tests: command: "readAttribute" attribute: "CurrentMode" response: - saveAs: "old_current_mode_dut" + values: + - name: "old_current_mode_dut" + saveAs: old_current_mode_dut + value: 1 constraints: type: int16u @@ -50,42 +59,37 @@ tests: command: "readAttribute" attribute: "SupportedModes" response: - saveAs: "supported_modes_dut" - new_mode_th: 16385 + values: + - name: "Mode" + saveAs: supported_modes_dut + value: [0, 1, 2] constraints: type: list - label: "TH send a ChangeToMode command to the DUT with NewMode set to new_mode_th" PICS: DISHM.S.C00.Rsp && DISHM.S.F00 - command: "changeToMode" - attribute: new_mode_th - response: - constraints: - type: int16u - value: 0 + command: "writeAttribute" + attribute: "ChangeToMode" + arguments: + values: + - name: "arg1" + value: new_mode_th - label: "TH sends Off Command to DUT" PICS: OO.S.C00.Rsp && DISHM.S.F00 command: "Off" - response: - constraints: - type: int16u - value: 0 - label: "TH sends On Command to DUT" PICS: OO.S.C01.Rsp && DISHM.S.F00 command: "On" - response: - constraints: - type: int16u - value: 0 - label: "TH reads the CurrentMode attribute from the DUT" PICS: DISHM.S.A0003 && DISHM.S.F00 command: "readAttribute" attribute: "CurrentMode" response: - constraints: + value: new_mode_th + constraints: type: int16u - value: old_current_mode_dut \ No newline at end of file + \ No newline at end of file diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_3_2.yaml index ce5ca847478c34..8b040c7362f2f0 100644 --- a/src/app/tests/suites/certification/Test_TC_DISHM_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_DISHM_3_2.yaml @@ -14,9 +14,12 @@ PICS: - DISHM.S config: - nodeId: 0x12344321 - cluster: "Dishwasher Mode Select" + nodeId: 0x0059 + cluster: "Dishwasher Mode" endpoint: 1 + new_mode_th: + type: INT16U + defaultValue: 0 tests: - label: "Wait for the commissioned device to be retrieved" @@ -32,7 +35,10 @@ tests: command: "readAttribute" attribute: "StartUpMode" response: - saveAs: "startup_mode_dut" + values: + - name: "startup_mode_dut" + saveAs: startup_mode_dut + value: 0 constraints: type: int16u @@ -41,7 +47,10 @@ tests: command: "readAttribute" attribute: "CurrentMode" response: - saveAs: "old_current_mode_dut" + values: + - name: "old_current_mode_dut" + saveAs: old_current_mode_dut + value: 2 constraints: type: int16u @@ -50,28 +59,40 @@ tests: command: "readAttribute" attribute: "SupportedModes" response: - saveAs: "supported_modes_dut" - new_mode_th: 16385 + values: + - name: "Mode" + saveAs: supported_modes_dut + value: [0, 1, 2] constraints: type: list - label: "TH send a ChangeToMode command to the DUT with NewMode set to new_mode_th" PICS: DISHM.S.C00.Rsp && DISHM.S.F00 - command: "changeToMode" - attribute: new_mode_th - response: - constraints: - type: int16u - value: 0 + command: "writeAttribute" + attribute: "ChangeToMode" + arguments: + values: + - name: "arg1" + value: new_mode_th -# Physically power cycle the device + - label: "Powercycle on device to set OnOff attribute manually to on" + cluster: "LogCommands" + command: "UserPrompt" + PICS: PICS_USER_PROMPT + arguments: + values: + - name: "message" + value: "Please enter 'y' for success" + - name: "expectedValue" + value: "y" - label: "TH reads the CurrentMode attribute from the DUT" PICS: DISHM.S.A0003 command: "readAttribute" attribute: "CurrentMode" response: + value: startup_mode_dut constraints: type: int16u - value: startup_mode_dut \ No newline at end of file + \ No newline at end of file diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_3_3.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_3_3.yaml index 8c74bc7f2217b3..919a4168574c2c 100644 --- a/src/app/tests/suites/certification/Test_TC_DISHM_3_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_DISHM_3_3.yaml @@ -14,9 +14,12 @@ PICS: - DISHM.S config: - nodeId: 0x12344321 - cluster: "Dishwasher Mode Select" + nodeId: 0x0059 + cluster: "Dishwasher Mode" endpoint: 1 + new_mode_th: + type: INT16U + defaultValue: 1 tests: - label: "Wait for the commissioned device to be retrieved" @@ -32,7 +35,10 @@ tests: command: "readAttribute" attribute: "StartUpMode" response: - saveAs: "startup_mode_dut" + values: + - name: "startup_mode_dut" + saveAs: startup_mode_dut + value: 0 constraints: type: int16u @@ -41,7 +47,10 @@ tests: command: "readAttribute" attribute: "OnMode" response: - saveAs: "old_on_mode_dut" + values: + - name: "on_mode_dut" + saveAs: on_mode_dut + value: 0 constraints: type: int16u @@ -50,26 +59,28 @@ tests: command: "readAttribute" attribute: "SupportedModes" response: - saveAs: "supported_modes_dut" - new_mode_th: 16385 + values: + - name: "Mode" + saveAs: supported_modes_dut + value: [0, 1, 2] constraints: type: list - label: "TH reads from the OnMode attribute from DUT" PICS: DISHM.S.A0002 && DISHM.S.A0004 command: "writeAttribute" - attribute: new_mode_th - response: - saveAs: "old_on_mode_dut" - constraints: - type: int16u + attribute: "OnMode" + arguments: + values: + - name: "new_mode_th" + value: new_mode_th - label: "TH reads from the OnMode attribute from DUT" PICS: DISHM.S.A0005 && DISHM.S.F00 command: "readAttribute" attribute: "OnMode" response: - saveAs: "new_on_mode_dut" + value: new_mode_th constraints: type: int16u @@ -77,17 +88,28 @@ tests: PICS: OO.S.A4003 command: "writeAttribute" attribute: "StartUpOnOff" - response: - saveAs: "old_on_mode_dut" - constraints: - type: int16u - value: 0 + arguments: + values: + - name: "arg1" + value: 1 + + - label: "Powercycle on device to set OnOff attribute manually to on" + cluster: "LogCommands" + command: "UserPrompt" + PICS: PICS_USER_PROMPT + arguments: + values: + - name: "message" + value: "Please enter 'y' for success" + - name: "expectedValue" + value: "y" - label: "TH reads the CurrentMode attribute from the DUT" PICS: DISHM.S.A0003 command: "readAttribute" attribute: "CurrentMode" response: + value: new_mode_th constraints: type: int16u - value: new_on_mode_dut \ No newline at end of file + \ No newline at end of file