Skip to content

Commit

Permalink
Update DRLK feature PICS to correct format (#22249)
Browse files Browse the repository at this point in the history
* Update DRLK feature PICS to correct format

- TC-DRLK-XX use wrong values for two pics (see #22248)

This PR renames the PICS and also properly implement TC-DRLK-1.1
feature bits check to match test plan

Fixes #22248

Testing done:
- Tests in CI still pass after regen

* Fix CI PICS values to match existing application
  • Loading branch information
tcarmelveilleux authored Aug 30, 2022
1 parent 6329339 commit 9966613
Show file tree
Hide file tree
Showing 8 changed files with 764 additions and 297 deletions.
4 changes: 2 additions & 2 deletions src/app/tests/suites/certification/PICS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4165,12 +4165,12 @@ PICS:
- label:
"Does the DUT(server) support the 'Lock supports yearday access
schedules' feature?"
id: DRLK.S.F10
id: DRLK.S.F0a

- label:
"Does the DUT(server) support the 'Lock supports holiday access
schedules' feature?"
id: DRLK.S.F11
id: DRLK.S.F0b

- label:
"Does the DUT(server) support the 'PIN codes over the-air supported
Expand Down
116 changes: 97 additions & 19 deletions src/app/tests/suites/certification/Test_TC_DRLK_1_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,103 @@ tests:
PICS:
" !DRLK.S.F00 && !DRLK.S.F01 && !DRLK.S.F02 && !DRLK.S.F04 &&
!DRLK.S.F05 && !DRLK.S.F06 && !DRLK.S.F07 && !DRLK.S.F08 &&
!DRLK.S.F10 && !DRLK.S.F11 "
!DRLK.S.F0a && !DRLK.S.F0b "
command: "readAttribute"
attribute: "FeatureMap"
response:
value: 0
constraints:
type: bitmap32

- label: "TH reads the FeatureMap from DUT"
PICS:
DRLK.S.F00 || DRLK.S.F01 || DRLK.S.F02 || DRLK.S.F04 || DRLK.S.F05 ||
DRLK.S.F06 || DRLK.S.F07 || DRLK.S.F08 || DRLK.S.F10 || DRLK.S.F11
- label: "Given DRLK.S.F00(PIN) ensure featuremap has the correct bit set"
PICS: DRLK.S.F00
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x1]

- label: "Given DRLK.S.F01(RID) ensure featuremap has the correct bit set"
PICS: DRLK.S.F01
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x2]

- label: "Given DRLK.S.F02(FGP) ensure featuremap has the correct bit set"
PICS: DRLK.S.F02
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x4]

- label: "Given DRLK.S.F04(WDSCH) ensure featuremap has the correct bit set"
PICS: DRLK.S.F04
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x10]

- label: "Given DRLK.S.F05(DPS) ensure featuremap has the correct bit set"
PICS: DRLK.S.F05
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x20]

- label: "Given DRLK.S.F06(FACE) ensure featuremap has the correct bit set"
PICS: DRLK.S.F06
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x40]

- label: "Given DRLK.S.F07(COTA) ensure featuremap has the correct bit set"
PICS: DRLK.S.F07
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x80]

- label: "Given DRLK.S.F08(USR) ensure featuremap has the correct bit set"
PICS: DRLK.S.F08
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x100]

- label: "Given DRLK.S.F0a(YDSCH) ensure featuremap has the correct bit set"
PICS: DRLK.S.F0a
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x400]

- label: "Given DRLK.S.F0b(HDSCH) ensure featuremap has the correct bit set"
PICS: DRLK.S.F0b
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
minValue: 1
maxValue: 4095
hasMasksSet: [0x800]

- label: "TH reads AttributeList from DUT"
command: "readAttribute"
Expand Down Expand Up @@ -111,17 +189,17 @@ tests:
type: list
contains: [20]

- label: "TH reads Feature dependent(DRLK.S.F10) attribute in AttributeList"
PICS: DRLK.S.F10
- label: "TH reads Feature dependent(DRLK.S.F0a) attribute in AttributeList"
PICS: DRLK.S.F0a
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [21]

- label: "TH reads Feature dependent(DRLK.S.F11) attribute in AttributeList"
PICS: DRLK.S.F11
- label: "TH reads Feature dependent(DRLK.S.F0b) attribute in AttributeList"
PICS: DRLK.S.F0b
command: "readAttribute"
attribute: "AttributeList"
response:
Expand Down Expand Up @@ -269,9 +347,9 @@ tests:
contains: [11, 12, 13]

- label:
"TH reads Feature dependent commands(DRLK.S.F10) in
"TH reads Feature dependent commands(DRLK.S.F0a) in
AcceptedCommandList"
PICS: DRLK.S.F10
PICS: DRLK.S.F0a
command: "readAttribute"
attribute: "AcceptedCommandList"
response:
Expand All @@ -280,9 +358,9 @@ tests:
contains: [14, 15, 16]

- label:
"TH reads Feature dependent commands(DRLK.S.F11) in
"TH reads Feature dependent commands(DRLK.S.F0b) in
AcceptedCommandList"
PICS: DRLK.S.F11
PICS: DRLK.S.F0b
command: "readAttribute"
attribute: "AcceptedCommandList"
response:
Expand Down Expand Up @@ -322,9 +400,9 @@ tests:
contains: [12]

- label:
"TH reads Feature dependent command(DRLK.S.F10) in
"TH reads Feature dependent command(DRLK.S.F0a) in
GeneratedCommandList"
PICS: DRLK.S.F10
PICS: DRLK.S.F0a
command: "readAttribute"
attribute: "GeneratedCommandList"
response:
Expand All @@ -333,9 +411,9 @@ tests:
contains: [15]

- label:
"TH reads Feature dependent command(DRLK.S.F11) in
"TH reads Feature dependent command(DRLK.S.F0b) in
GeneratedCommandList"
PICS: DRLK.S.F11
PICS: DRLK.S.F0b
command: "readAttribute"
attribute: "GeneratedCommandList"
response:
Expand Down
4 changes: 2 additions & 2 deletions src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ tests:

- label:
"TH reads NumberOfYearDay SchedulesSupportedPeruser attribute from DUT"
PICS: DRLK.S.F10 && DRLK.S.A0015
PICS: DRLK.S.F0a && DRLK.S.A0015
verification: |
./chip-tool doorlock read number-of-year-day-schedules-supported-per-user 1 1
Expand Down Expand Up @@ -729,7 +729,7 @@ tests:
disabled: true

- label: "TH reads NumberOfHoliDay SchedulesSupported attribute from DUT"
PICS: DRLK.S.F11 && DRLK.S.A0016
PICS: DRLK.S.F0b && DRLK.S.A0016
verification: |
./chip-tool doorlock read number-of-holiday-schedules-supported 1 1
Expand Down
14 changes: 7 additions & 7 deletions src/app/tests/suites/certification/Test_TC_DRLK_2_6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tests:

- label:
"TH reads NumberOfHoliday SchedulesSupported and saves for future use."
PICS: DRLK.S.F11 && DRLK.S.A0016
PICS: DRLK.S.F0b && DRLK.S.A0016
verification: |
./chip-tool doorlock read number-of-holiday-schedules-supported 1 1
Verify " NumberOfHoliDay SchedulesSuppored" on the TH(Chip-tool) Log:
Expand All @@ -51,7 +51,7 @@ tests:
"TH sends Set Holiday Schedule Command to DUT with the following
values: HolidayIndex as 1 LocalStartTime as 20 Seconds LocalEndTime as
30 Seconds OperatingMode as 0"
PICS: DRLK.S.F11 && DRLK.S.C11.Rsp
PICS: DRLK.S.F0b && DRLK.S.C11.Rsp
verification: |
./chip-tool doorlock set-holiday-schedule 1 20 30 0 1 1
Verify " DUT send SUCCESS response." on the TH(Chip-tool) Log:
Expand All @@ -73,7 +73,7 @@ tests:

- label:
"TH sends Get Holiday Schedule Command to DUT with HolidayIndex as 1"
PICS: DRLK.S.F11 && DRLK.S.C12.Rsp && DRLK.S.C12.Tx
PICS: DRLK.S.F0b && DRLK.S.C12.Rsp && DRLK.S.C12.Tx
verification: |
./chip-tool doorlock get-holiday-schedule 1 1 1
Verify " DUT responds with Get Holiday Schedule Response" on the TH(Chip-tool) Log:
Expand Down Expand Up @@ -131,7 +131,7 @@ tests:
- label:
"TH sends Get Holiday Schedule Command to DUT with Invalid
HolidayIndex as 15."
PICS: DRLK.S.F11 && DRLK.S.C12.Rsp && DRLK.S.C12.Tx
PICS: DRLK.S.F0b && DRLK.S.C12.Rsp && DRLK.S.C12.Tx
verification: |
./chip-tool doorlock get-holiday-schedule 15 1 1
Verify " DUT sends INVALID_COMMAND response" on the TH(Chip-tool) Log:
Expand All @@ -153,7 +153,7 @@ tests:
"TH sends Get Holiday Schedule Command to DUT with the HolidayIndex as
10 (value is in the the range of step 1 but Holiday Schedule entry not
available)"
PICS: DRLK.S.F11 && DRLK.S.C12.Rsp && DRLK.S.C12.Tx
PICS: DRLK.S.F0b && DRLK.S.C12.Rsp && DRLK.S.C12.Tx
verification: |
./chip-tool doorlock get-holiday-schedule 10 1 1
Verify " DUT sends a NOT_FOUND status" on the TH(Chip-tool) Log:
Expand All @@ -169,7 +169,7 @@ tests:

- label:
"TH send Clear Holiday Schedule Command to DUT with HolidayIndex as 1"
PICS: DRLK.S.F11 && DRLK.S.C13.Rsp
PICS: DRLK.S.F0b && DRLK.S.C13.Rsp
verification: |
./chip-tool doorlock clear-holiday-schedule 1 1 1
Verify " DUT sends SUCCESS response" on the TH(Chip-tool) Log:
Expand All @@ -191,7 +191,7 @@ tests:

- label:
"TH sends Get Holiday Schedule Command to DUT with HolidayIndex as 1."
PICS: DRLK.S.F11 && DRLK.S.C12.Rsp && DRLK.S.C12.Tx
PICS: DRLK.S.F0b && DRLK.S.C12.Rsp && DRLK.S.C12.Tx
verification: |
./chip-tool doorlock get-holiday-schedule 1 1 1
Verify " DUT sends a NOT_FOUND status" on the TH(Chip-tool) Log:
Expand Down
18 changes: 9 additions & 9 deletions src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ tests:
value: null

- label: "TH reads NumberOfYearDay SchedulesSupportedPerUser attribute"
PICS: DRLK.S.F10 && DRLK.S.A0015
PICS: DRLK.S.F0a && DRLK.S.A0015
command: "readAttribute"
attribute: "NumberOfYearDaySchedulesSupportedPerUser"
response:
Expand All @@ -104,7 +104,7 @@ tests:
maxValue: 65534

- label: "TH sends Set Year Day Schedule Command to DUT"
PICS: DRLK.S.F10 && DRLK.S.C0e.Rsp
PICS: DRLK.S.F0a && DRLK.S.C0e.Rsp
command: "SetYearDaySchedule"
arguments:
values:
Expand All @@ -119,7 +119,7 @@ tests:

#issue #18591
- label: "TH sends Get Year Day Schedule Command to DUT"
PICS: DRLK.S.F10 && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx
PICS: DRLK.S.F0a && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx
command: "GetYearDaySchedule"
arguments:
values:
Expand Down Expand Up @@ -159,7 +159,7 @@ tests:
error: INVALID_COMMAND

- label: "TH sends Get Year Day Schedule Command to DUT"
PICS: DRLK.S.F10 && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx
PICS: DRLK.S.F0a && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx
command: "GetYearDaySchedule"
arguments:
values:
Expand Down Expand Up @@ -203,7 +203,7 @@ tests:
value: 0

- label: "TH sends Get Year Day Schedule Command to DUT"
PICS: DRLK.S.F10 && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx
PICS: DRLK.S.F0a && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx
command: "GetYearDaySchedule"
arguments:
values:
Expand Down Expand Up @@ -237,7 +237,7 @@ tests:
value: 1

- label: "TH sends Get Year Day Schedule Command to DUT"
PICS: DRLK.S.F10 && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx && DRLK.S.C10.Rsp
PICS: DRLK.S.F0a && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx && DRLK.S.C10.Rsp
command: "GetYearDaySchedule"
arguments:
values:
Expand Down Expand Up @@ -275,7 +275,7 @@ tests:
value: 2100

- label: "TH sends Get Year Day Schedule Command to DUT"
PICS: DRLK.S.F10 && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx
PICS: DRLK.S.F0a && DRLK.S.C0f.Rsp && DRLK.S.C0f.Tx
command: "GetYearDaySchedule"
arguments:
values:
Expand All @@ -299,7 +299,7 @@ tests:
minValue: 1081

- label: "TH sends Clear Year Day Schedule to DUT"
PICS: DRLK.S.F10 && DRLK.S.C10.Rsp
PICS: DRLK.S.F0a && DRLK.S.C10.Rsp
command: "ClearYearDaySchedule"
arguments:
values:
Expand All @@ -311,7 +311,7 @@ tests:
error: INVALID_COMMAND

- label: "Clear a year day schedule for the first user"
PICS: DRLK.S.F10 && DRLK.S.C10.Rsp
PICS: DRLK.S.F0a && DRLK.S.C10.Rsp
command: "ClearYearDaySchedule"
arguments:
values:
Expand Down
Loading

0 comments on commit 9966613

Please sign in to comment.