Skip to content

Commit

Permalink
Rebase and regen to fix conflicts. LVL tests changed recently but do …
Browse files Browse the repository at this point in the history
…not match those new feature from this PR. Fix that
  • Loading branch information
jmartinez-silabs committed Jan 13, 2022
1 parent e5cbf1c commit a1ee947
Show file tree
Hide file tree
Showing 30 changed files with 927 additions and 931 deletions.
33 changes: 25 additions & 8 deletions src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,33 @@ tests:
cluster: "DelayCommands"
command: "WaitForCommissionee"

- label: "Reads the CurrentLevel attribute"
command: "readAttribute"
attribute: "current level"
response:
value: 254
# Temporary - see #13551
- label: "Reset level to 254"
command: "MoveToLevel"
arguments:
values:
- name: "level"
value: 254
- name: "transitionTime"
value: 0
- name: "optionMask"
value: 1
- name: "optionOverride"
value: 1

- label: "Wait 100ms"
cluster: "DelayCommands"
command: "WaitForMs"
arguments:
values:
- name: "ms"
value: 100

- label: "Reads the CurrentLevel attribute"
command: "readAttribute"
attribute: "current level"
response:
value: 254
constraints:
type: uint8

Expand Down Expand Up @@ -151,10 +168,10 @@ tests:
constraints:
type: map8

#Disabled due to issue - #13414
- label: "Reads the StartUpCurrentLevel attribute "
disabled: true
command: "readAttribute"
attribute: "start up current level"
response:
value: 0
constraints:
type: uint8
value: null
12 changes: 7 additions & 5 deletions src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ tests:
command: "writeAttribute"
attribute: "on level"
arguments:
value: 1
value: 254

- label: "Reads the OnLevel attribute from the DUT"
command: "readAttribute"
attribute: "on level"
response:
value: 1
value: 254
constraints:
type: uint8

Expand Down Expand Up @@ -145,24 +145,26 @@ tests:
constraints:
type: uint8

#Disabled due to issue - #11670
- label: "Reads the StartUpCurrentLevel attribute from the DUT"
disabled: true
command: "readAttribute"
attribute: "start up current level"
response:
value: 0
value: null
constraints:
type: uint8

- label: "writes the StartUpCurrentLevel attribute on the DUT"
command: "writeAttribute"
attribute: "start up current level"
arguments:
value: 1
value: 254

- label: "reads the StartUpCurrentLevel attribute from the DUT"
command: "readAttribute"
attribute: "start up current level"
response:
value: 1
value: 254
constraints:
type: uint8
2 changes: 1 addition & 1 deletion src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ tests:
command: "readAttribute"
attribute: "max level"
response:
value: 255
value: 254

- label: "sends a Move to level command"
command: "MoveToLevel"
Expand Down
9 changes: 6 additions & 3 deletions src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tests:
command: "readAttribute"
attribute: "max level"
response:
value: 255
value: 254

- label: "sends a Move up command"
command: "Move"
Expand All @@ -60,7 +60,7 @@ tests:
command: "readAttribute"
attribute: "current level"
response:
value: 255
value: 254

- label: "reads min level attribute from DUT"
command: "readAttribute"
Expand Down Expand Up @@ -89,11 +89,14 @@ tests:
- name: "ms"
value: 3000

# For lighting Device type current level minimal value is 1
- label: "reads CurrentLevel attribute from DUT"
command: "readAttribute"
attribute: "current level"
response:
value: 0
constraints:
minValue: 0
maxValue: 1

- label: "Write default move rate attribute from DUT"
command: "writeAttribute"
Expand Down
4 changes: 1 addition & 3 deletions src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ tests:
command: "readAttribute"
attribute: "current level"
response:
constraints:
minValue: 128
maxValue: 129
value: 128

- label: "Sends step down command to DUT"
command: "Step"
Expand Down
9 changes: 7 additions & 2 deletions src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ tests:
- name: "ms"
value: 100

# For lighting Device type current level minimal value is 1
- label: "Reads CurrentLevel attribute from DUT"
command: "readAttribute"
attribute: "current level"
response:
value: 0
constraints:
minValue: 0
maxValue: 1

- label: "Sends a move up command to DUT"
command: "Move"
Expand Down Expand Up @@ -88,7 +91,9 @@ tests:
command: "readAttribute"
attribute: "current level"
response:
value: 2
constraints:
minValue: 2
maxValue: 3

- label: "Reset level to 254"
command: "MoveToLevel"
Expand Down
15 changes: 11 additions & 4 deletions src/controller/java/zap-generated/CHIPClusters-JNI.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions src/controller/java/zap-generated/CHIPReadCallbacks.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions src/controller/java/zap-generated/CHIPReadCallbacks.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a1ee947

Please sign in to comment.