Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding test scripts (YAMLs) for Laundry Dryer Mode #31250

Merged
merged 55 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
1b0eafa
Dryer test scripts are added
prakashece Nov 29, 2023
ed06590
Merge branch 'master' into add-dryer-mode-yaml
prakashece Nov 29, 2023
b073c10
Merge branch 'master' into add-dryer-mode-yaml
prakashece Nov 30, 2023
804cf9b
YAML format checked
prakashece Dec 5, 2023
f34a671
Merge branch 'add-dryer-mode-yaml' of https://github.com/prakashece/c…
prakashece Dec 5, 2023
484d127
Restyled by whitespace
restyled-commits Dec 5, 2023
e9c08bd
Restyled by prettier-yaml
restyled-commits Dec 5, 2023
5b36768
copyright text added, file names changed
prakashece Dec 6, 2023
6dbeef5
Restyled by prettier-yaml
restyled-commits Dec 6, 2023
3593039
Delete src/app/tests/suites/certification/TC-DRYERCTRL-1.1.yml
prakashece Dec 6, 2023
d50ede2
Delete src/app/tests/suites/certification/TC-DRYERCTRL-2.1.yml
prakashece Dec 6, 2023
95c1b06
added the script names in ciTests.json
prakashece Dec 6, 2023
6d93a83
Merge branch 'add-dryer-mode-yaml' of https://github.com/prakashece/c…
prakashece Dec 6, 2023
2ce3251
Restyled by whitespace
restyled-commits Dec 6, 2023
4a3c28b
Restyled by prettier-json
restyled-commits Dec 6, 2023
6437062
File extension name changed from yml to yaml
prakashece Dec 8, 2023
69fcb7f
Delete src/app/tests/suites/certification/Test_TC_DRYERCTRL_1_1.yml
prakashece Dec 8, 2023
a1ee4bd
Delete src/app/tests/suites/certification/Test_TC_DRYERCTRL_2_1.yml
prakashece Dec 8, 2023
c8aa2b3
modified ci-pics-value file
prakashece Dec 8, 2023
ee78b2c
Merge branch 'add-dryer-mode-yaml' of https://github.com/prakashece/c…
prakashece Dec 8, 2023
02fb35e
updated ci-pics-values file
prakashece Dec 8, 2023
a518692
Adding PICS.YAML
prakashece Dec 8, 2023
6cc18a7
Restyled by prettier-yaml
restyled-commits Dec 8, 2023
2528db1
updated PICS.yaml and ci-pics-values
prakashece Dec 8, 2023
f04daeb
Restyled by whitespace
restyled-commits Dec 8, 2023
7e6f808
Restyled by prettier-yaml
restyled-commits Dec 8, 2023
c276376
updated files
prakashece Dec 8, 2023
0b40d92
reran the zap tool
eahove Dec 8, 2023
99a1c03
updated Test_TC_DRYERCTRL_2_1.yaml
prakashece Dec 11, 2023
c69e634
Merge branch 'add-dryer-mode-yaml' of https://github.com/prakashece/c…
prakashece Dec 11, 2023
98a4fdf
updated the labels in the testscripts
prakashece Dec 11, 2023
6c422a0
Restyled by prettier-yaml
restyled-commits Dec 11, 2023
f8d144d
Update src/app/tests/suites/certification/Test_TC_DRYERCTRL_2_1.yaml
prakashece Dec 13, 2023
dbed726
Update src/app/tests/suites/certification/Test_TC_DRYERCTRL_1_1.yaml
prakashece Dec 13, 2023
e685260
Updated PICS.yaml and ci-pics-values
prakashece Dec 13, 2023
4ac802b
Merge branch 'add-dryer-mode-yaml' of https://github.com/prakashece/c…
prakashece Dec 13, 2023
1b756cc
Restyled by whitespace
restyled-commits Dec 13, 2023
11138c2
Restyled by prettier-yaml
restyled-commits Dec 13, 2023
1698f6c
updated Test_TC_DRYERCTRL_2_1.yaml
prakashece Dec 15, 2023
fd069ca
Regen Zap
OmAmbalkar Dec 15, 2023
3c6acea
Merge branch 'master' into add-dryer-mode-yaml
prakashece Dec 15, 2023
13bc0e2
Merge branch 'master' into add-dryer-mode-yaml
prakashece Dec 22, 2023
584be29
updated Dryerctrl_1_1
prakashece Dec 22, 2023
11bbb6d
Zap Regen
OmAmbalkar Dec 22, 2023
4e027d9
updated test script
prakashece Dec 28, 2023
b2bcdb1
Merge branch 'add-dryer-mode-yaml' of https://github.com/prakashece/c…
prakashece Dec 28, 2023
994fba2
Zap Regen
OmAmbalkar Dec 28, 2023
e3fb6b0
updated script and ran zap
prakashece Jan 4, 2024
db2dcd4
updated init.py
prakashece Jan 3, 2024
b01b18d
Restyled by isort
restyled-commits Jan 4, 2024
ae3e2dc
updated 2_1.yaml based on latest TP and ran zap regenall
prakashece Jan 9, 2024
7f62810
Merge branch 'master' into add-dryer-ctrl-yaml
prakashece Jan 9, 2024
0fe6500
Merge branch 'master' into add-dryer-ctrl-yaml
prakashece Jan 11, 2024
8c5c0b2
Restyled by isort
restyled-commits Jan 11, 2024
3b5fca2
Merge branch 'master' into add-dryer-ctrl-yaml
prakashece Jan 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions src/app/tests/suites/certification/PICS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8883,6 +8883,44 @@ PICS:
"Does the device implement sending the ChangeToModeResponse command?"
id: LWM.S.C01.Tx

# Laundry DRYER Mode Cluster

- label: "Does the device implement the Dryer cluster as a server?"
id: DRYERCTRL.S

#- label: "Does the DUT support testing the failed ChangeToMode command?"
# id: DRYERCTRL.S.M.CAN_TEST_MODE_FAILURE

#- label:
# "Id of mode the device will fail to transition to, given its current
# state"
# id: PIXIT.DRYERCTRL.S.MODE_CHANGE_FAIL

#- label:
# "Id of mode the device will successfully transition to, given its
# current state"
# id: PIXIT.DRYERCTRL.S.MODE_CHANGE_OK

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

#
# server / attributes
#
- label: "Does the device implement the SupportedModes attribute?"
id: DRYERCTRL.S.A0000

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

- label: "Can the device be controlled manually?"
id: DRYERCTRL.S.M.ManuallyControlled

# RVC Clean Mode Cluster

- label: "Does the device implement the RVCCLEANM cluster as a server?"
Expand Down
91 changes: 91 additions & 0 deletions src/app/tests/suites/certification/Test_TC_DRYERCTRL_1_1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
# Copyright (c) 2023 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: 3.1.1. [TC-DRYERCTRL-1.1] Global attributes with server as DUT

PICS:
- DRYERCTRL.S

config:
nodeId: 0x12344321
cluster: "Laundry Dryer Controls"
endpoint: 1

tests:
- label: "Step 1: Wait for the commissioned device to be retrieved"
cluster: "DelayCommands"
command: "WaitForCommissionee"
arguments:
values:
- name: "nodeId"
value: nodeId

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

- label: "Step 3: TH reads from the DUT the FeatureMap attribute."
command: "readAttribute"
attribute: "FeatureMap"
response:
value: 0
constraints:
type: bitmap32

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

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

- label: "Step 5: TH reads from the DUT the EventList attribute."
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
value: []
constraints:
type: list

- label: "Step 6: TH reads from the DUT the AcceptedCommandList attribute."
command: "readAttribute"
attribute: "AcceptedCommandList"
response:
value: []
constraints:
type: list

- label: "Step 7: TH reads from the DUT the GeneratedCommandList attribute."
command: "readAttribute"
attribute: "GeneratedCommandList"
response:
value: []
constraints:
type: list
126 changes: 126 additions & 0 deletions src/app/tests/suites/certification/Test_TC_DRYERCTRL_2_1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
# Copyright (c) 2023 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: 3.2.1. [TC-DRYERCTRL-2.1] Optional Dryness attributes with server as DUT

PICS:
- DRYERCTRL.S

config:
nodeId: 0x12344321
cluster: "Laundry Dryer Controls"
endpoint: 1

unsupportedSelectedDrynessLevel:
cecille marked this conversation as resolved.
Show resolved Hide resolved
type: int8u
defaultValue: 4

SupportedDrynessLevel:
type: int8u
defaultValue: 1

tests:
- label: "Step 1: Wait for the commissioned device to be retrieved"
cluster: "DelayCommands"
command: "WaitForCommissionee"
arguments:
values:
- name: "nodeId"
value: nodeId

- label:
"Step 2: TH reads from the DUT the mandatory attribute:
SupportedDrynessLevels"
PICS: DRYERCTRL.S.A0000
command: "readAttribute"
attribute: "SupportedDrynessLevels"
response:
constraints:
type: list
maxLength: 16

- label:
"Step 3: TH reads from the DUT the mandatory attribute:
SelectedDrynessLevel"
PICS: DRYERCTRL.S.A0001
command: "readAttribute"
attribute: "SelectedDrynessLevel"
response:
constraints:
type: enum8
minValue: 0
maxValue: 15

- label:
"Step 4:TH writes a supported SelectedDrynessLevel attribute that is
within the list of SupportedDrynessLevels"
PICS: DRYERCTRL.S.A0001
command: "writeAttribute"
attribute: "SelectedDrynessLevel"
arguments:
value: SupportedDrynessLevel

- label: "Wait 2 seconds"
cluster: "DelayCommands"
command: "WaitForMs"
arguments:
values:
- name: "ms"
value: 2000

- label:
"Step 5: after a few seconds, TH reads from the DUT the
SelectedDrynessLevel attribute"
PICS: DRYERCTRL.S.A0001
command: "readAttribute"
attribute: "SelectedDrynessLevel"
response:
value: SupportedDrynessLevel
constraints:
type: enum8

- label:
"Step 6: TH writes an unsupported SelectedDrynessLevel attribute that
is not in list of SupportedDrynessLevels to DUT"
PICS: DRYERCTRL.S.A0001
command: "writeAttribute"
attribute: "SelectedDrynessLevel"
arguments:
value: unsupportedSelectedDrynessLevel
response:
error: CONSTRAINT_ERROR

- label: "Step 6: Operate device to set the condition to read only"
verification: |
Manual operation required
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_SKIP_SAMPLE_APP && DRYERCTRL.S.M.ManuallyControlled
arguments:
values:
- name: "message"
value: "Please enter 'y' for success"
- name: "expectedValue"
value: "y"

- label:
"Step 7: TH writes a supported SelectedDrynessLevel attribute to DUT
while DUT is not in a valid state."
PICS: DRYERCTRL.S.M.ManuallyControlled && DRYERCTRL.S.A0001
command: "writeAttribute"
attribute: "SelectedDrynessLevel"
arguments:
value: SupportedDrynessLevel
response:
error: INVALID_IN_STATE
cecille marked this conversation as resolved.
Show resolved Hide resolved
16 changes: 16 additions & 0 deletions src/app/tests/suites/certification/ci-pics-values
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,22 @@ PIXIT.LWM.MODE_CHANGE_OK=1

LWM.S.M.CAN_TEST_MODE_FAILURE=1


# LAUNDRY DRYER MODE CLUSTER
DRYERCTRL.S=1
DRYERCTRL.S.A0000=1
DRYERCTRL.S.A0001=1

#Feature
DRYERCTRL.S.F00=1

#PIXIT
prakashece marked this conversation as resolved.
Show resolved Hide resolved
#PIXIT.DRYERCTRL.S.MODE_CHANGE_FAIL=1
#PIXIT.DRYERCTRL.S.MODE_CHANGE_OK=1

#DRYERCTRL.S.M.CAN_TEST_MODE_FAILURE=1
DRYERCTRL.S.M.ManuallyControlled=0

# Time Format Localization Cluster
LTIME.S=1
LTIME.S.A0000=1
Expand Down
4 changes: 4 additions & 0 deletions src/app/tests/suites/ciTests.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@
"Test_TC_WASHERCTRL_2_1",
"Test_TC_WASHERCTRL_2_2"
],

"LaundryDryerControl": ["Test_TC_DRYERCTRL_1_1", "Test_TC_DRYERCTRL_2_1"],

"MediaControl": [
"Test_TC_LOWPOWER_1_1",
"Test_TC_KEYPADINPUT_1_2",
Expand Down Expand Up @@ -398,6 +401,7 @@
"TimeFormatLocalization",
"LaundryWasherMode",
"LaundryWasherControl",
"LaundryDryerControl",
"MediaControl",
"ModeSelect",
"MultipleFabrics",
Expand Down
18 changes: 10 additions & 8 deletions src/controller/python/chip/clusters/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
DoorLock, ElectricalMeasurement, EnergyEvse, EthernetNetworkDiagnostics, FanControl, FaultInjection,
FixedLabel, FlowMeasurement, FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics,
GroupKeyManagement, Groups, HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement,
KeypadInput, LaundryWasherControls, LaundryWasherMode, LevelControl, LocalizationConfiguration, LowPower,
MediaInput, MediaPlayback, MicrowaveOvenControl, MicrowaveOvenMode, ModeSelect, NetworkCommissioning,
NitrogenDioxideConcentrationMeasurement, OccupancySensing, OnOff, OnOffSwitchConfiguration,
OperationalCredentials, OperationalState, OtaSoftwareUpdateProvider, OtaSoftwareUpdateRequestor,
OvenCavityOperationalState, OvenMode, OzoneConcentrationMeasurement, Pm1ConcentrationMeasurement,
Pm10ConcentrationMeasurement, Pm25ConcentrationMeasurement, PowerSource, PowerSourceConfiguration,
PressureMeasurement, ProxyConfiguration, ProxyDiscovery, ProxyValid, PulseWidthModulation,
PumpConfigurationAndControl, RadonConcentrationMeasurement, RefrigeratorAlarm,
KeypadInput, LaundryDryerControls, LaundryWasherControls, LaundryWasherMode, LevelControl,
LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, MicrowaveOvenControl, MicrowaveOvenMode,
ModeSelect, NetworkCommissioning, NitrogenDioxideConcentrationMeasurement, OccupancySensing, OnOff,
OnOffSwitchConfiguration, OperationalCredentials, OperationalState, OtaSoftwareUpdateProvider,
OtaSoftwareUpdateRequestor, OvenCavityOperationalState, OvenMode, OzoneConcentrationMeasurement,
Pm1ConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm25ConcentrationMeasurement, PowerSource,
PowerSourceConfiguration, PressureMeasurement, ProxyConfiguration, ProxyDiscovery, ProxyValid,
PulseWidthModulation, PumpConfigurationAndControl, RadonConcentrationMeasurement, RefrigeratorAlarm,
RefrigeratorAndTemperatureControlledCabinetMode, RelativeHumidityMeasurement, RvcCleanMode,
RvcOperationalState, RvcRunMode, Scenes, SmokeCoAlarm, SoftwareDiagnostics, Switch, TargetNavigator,
TemperatureControl, TemperatureMeasurement, Thermostat, ThermostatUserInterfaceConfiguration,
Expand All @@ -54,6 +54,8 @@
DoorLock, ElectricalMeasurement, EnergyEvse, EthernetNetworkDiagnostics, FanControl, FaultInjection, FixedLabel, FlowMeasurement,
FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics, GroupKeyManagement, Groups,
HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement, KeypadInput,
LaundryWasherControls, LaundryDryerControls, LaundryWasherMode, LevelControl, LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, ModeSelect,
NetworkCommissioning, NitrogenDioxideConcentrationMeasurement,
LaundryWasherControls, LaundryWasherMode, LevelControl, LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, MicrowaveOvenControl,
MicrowaveOvenMode, ModeSelect, NetworkCommissioning, NitrogenDioxideConcentrationMeasurement,
OccupancySensing, OnOff, OnOffSwitchConfiguration, OperationalCredentials, OperationalState,
Expand Down
Loading
Loading