Skip to content

Commit

Permalink
Merge 959b094 into 963a859
Browse files Browse the repository at this point in the history
  • Loading branch information
@abpoth
abpoth authored Aug 7, 2023
2 parents 963a859 + 959b094 commit 2145769
Show file tree
Hide file tree
Showing 18 changed files with 1,773 additions and 1,375 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,8 @@ jobs:
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_FAN_3_5.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DISHM_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DISHM_3_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
- name: Uploading core files
uses: actions/upload-artifact@v3
Expand Down
35 changes: 35 additions & 0 deletions src/app/tests/suites/certification/PICS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9310,6 +9310,41 @@ PICS:
"Does the device implement sending the ChangeToModeResponse command?"
id: RVCCLEANMS.S.C03.Tx

## Dishwasher Mode control

# Features
- label:
"Does the device support depending on an On/Off cluster implemented on
the same endpoint?"
id: DISHM.S.F00

#
# Server Attributes
#
- label: "Does the device implement the SupportedModes attribute?"
id: DISHM.S.A0000

- label: "Does the device implement the CurrentMode attribute?"
id: DISHM.S.A0001

- label: "Does the device implement the StartUpMode attribute?"
id: DISHM.S.A0002

- label: "Does the device implement the OnMode attribute?"
id: DISHM.S.A0003

#
#Server commands received
#
- label: "Does the device implement receiving the ChangeToMode command?"
id: DISHM.S.C00.Rsp

#
#Server commands generated
#
- label:
"Does the device implement sending the ChangeToModeResponse command?"
id: DISHM.S.C01.Tx
#
#Operational State
#
Expand Down
197 changes: 123 additions & 74 deletions src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,90 +13,139 @@
# 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: 263.1.1. [TC-DISHM-1.1] Global attributes with DUT as Server
name: 194.1.1. [TC-DISHM-1.1] Global Attributes with DUT as Server

PICS:
- DISHM.S

config:
nodeId: 0x12344321
cluster: "Basic Information"
endpoint: 0
cluster: "Dishwasher Mode"
endpoint: 1

tests:
- 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 dishwashermodeselect read cluster-revision 1 1
Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number 2 on the TH(chip-tool) and below is the sample log provided for the raspi platform:
[1645775623.658997][3277:3282] CHIP:TOO: ClusterRevision: 1
disabled: true

- label: "Step 3: TH reads from the DUT the FeatureMap attribute."
verification: |
./chip-tool dishwashermodeselect read feature-map 1 1
On the TH(chip-tool) Log, Verify featureMap value is 1, This value changes depending on DUT implementing the features and below is the sample log provided for the raspi platform:
[1649052001.646939][8355:8360] CHIP:TOO: FeatureMap: 1
disabled: true

- label: "Step 4: TH reads from the DUT the AttributeList attribute."
verification: |
./chip-tool dishwashermodeselect read attribute-list 1 1
Verify the "AttributeList " should include the mandatory attributes (values 0, 2, 3),
global attributes (value 65533, 65532, 65531, 65530, 65529 and 65528) and
list may include optional attribute(value 0x0004), if MOD.S.A0004(StartUpMode) supports,
list contains feature dependent attribute (values 0x0005), if MOD.S.F00(DEPONOFF) is true on the TH(chip-tool) Log and below is the sample log provided for the raspi platform:
- label: "Wait for the commissioned device to be retrieved"
cluster: "DelayCommands"
command: "WaitForCommissionee"
arguments:
values:
- name: "nodeId"
value: nodeId

- label: "TH reads the ClusterRevision from DUT"
command: "readAttribute"
attribute: "ClusterRevision"
response:
value: 1
constraints:
type: int16u

- label: "TH reads the FeatureMap from DUT"
PICS: " !DISHM.S.F00 "
command: "readAttribute"
attribute: "FeatureMap"
response:
value: 0
constraints:
type: bitmap32

[1676288620.483812][4014:4016] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_FFFB DataVersion: 2649295313
[1676288620.483850][4014:4016] CHIP:TOO: AttributeList: 13 entries
[1676288620.483861][4014:4016] CHIP:TOO: [1]: 0
[1676288620.483870][4014:4016] CHIP:TOO: [2]: 1
[1676288620.483878][4014:4016] CHIP:TOO: [3]: 65528
[1676288620.483886][4014:4016] CHIP:TOO: [4]: 65529
[1676288620.483892][4014:4016] CHIP:TOO: [5]: 65530
[1676288620.483899][4014:4016] CHIP:TOO: [6]: 65531
[1676288620.483906][4014:4016] CHIP:TOO: [7]: 4293984257
[1676288620.483915][4014:4016] CHIP:TOO: [8]: 2
[1676288620.483922][4014:4016] CHIP:TOO: [9]: 3
[1676288620.483929][4014:4016] CHIP:TOO: [10]: 4
[1676288620.483934][4014:4016] CHIP:TOO: [11]: 5
[1676288620.483941][4014:4016] CHIP:TOO: [12]: 65532
[1676288620.483947][4014:4016] CHIP:TOO: [13]: 65533
[1676288620.484034][4014:4016] CHIP:EM: <<< [E:29816i M:167554497 (Ack:41020138)] (S) Msg TX to 1:000000000
*NOTE* : This sample attribute list reflects the currently implemented attributes on the all-clusters-app.
disabled: true

- label: "Step 5: TH reads from the DUT the AcceptedCommandList attribute."
verification: |
./chip-tool dishwashermodeselect read accepted-command-list 1 1
Verify the "AcceptedCommandList" contains feature dependent commands
if !MOD.S.F02(DEPCTM) feature supports list includes(value 0x0000) and
if MOD.S.F01(EXT) feature supports list includes(value 0x0001) on the TH (chip-tool) and below is the sample log provided for the raspi platform:
- label:
"Given DISHM.S.F00(DEPONOFF) ensure featuremap has the correct bit set"
PICS: DISHM.S.F00
command: "readAttribute"
attribute: "FeatureMap"
response:
value: 1
constraints:
type: bitmap32

# Reference for "SHALL NOT contain" issue: https://github.com/project-chip/connectedhomeip/issues/28287
- label: "4. TH reads AttributeList from DUT"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533]

- label: "4. TH reads AttributeList from DUT"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [0, 1, 65528, 65529, 65531, 65532, 65533]

[1650274602.826352][8965:8970] CHIP:TOO: AcceptedCommandList: 1 entries
[1650274602.826442][8965:8970] CHIP:TOO: [1]: 0
disabled: true
- label:
"4. TH reads optional attribute (DISHM.S.A0002(StartUpMode)) in
AttributeList"
PICS: DISHM.S.A0002
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [2]

- label: "Step 6: TH reads from the DUT the GeneratedCommandList attribute."
verification: |
./chip-tool dishwashermodeselect read generated-command-list 1 1
- label:
"4. TH reads optional attribute (DISHM.S.A0002(StartUpMode)) in
AttributeList"
PICS: " !DISHM.S.A0002 "
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
excludes: [2]

Verify "GeneratedCommandList" contains feature dependent commands
if MOD.S.F01(EXT) feature supports list includes(value 0x0002), otherwise value is 0 on the TH(chip-tool) Log and below is the sample log provided for the raspi platform:
- label:
"4. TH reads optional attribute (DISHM.S.F00(DEPONOFF)) in
AttributeList"
PICS: DISHM.S.F00
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [3]

[1650274662.075309][8972:8977] CHIP:TOO: GeneratedCommandList: 0 entries
disabled: true
- label:
"4. TH reads optional attribute (DISHM.S.F00(DEPONOFF)) in
AttributeList"
PICS: " !DISHM.S.F00 "
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
excludes: [3]

# Reference for "SHALL NOT contain" issue: https://github.com/project-chip/connectedhomeip/issues/28287
- label: "5. TH reads from the DUT the EventList attribute"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
value: []
constraints:
type: list

# Reference for "SHALL NOT contain" issue: https://github.com/project-chip/connectedhomeip/issues/28287
- label: "6. TH reads AcceptedCommandList from DUT"
command: "readAttribute"
attribute: "AcceptedCommandList"
response:
constraints:
type: list
contains: [0]

# Reference for "SHALL NOT contain" issue: https://github.com/project-chip/connectedhomeip/issues/28287
- label: "7. TH reads from the DUT the GeneratedCommandList attribute"
command: "readAttribute"
attribute: "GeneratedCommandList"
response:
constraints:
type: list
contains: [1]
118 changes: 0 additions & 118 deletions src/app/tests/suites/certification/Test_TC_DISHM_1_2.yaml
View file

This file was deleted.

Loading

0 comments on commit 2145769

Please sign in to comment.