Skip to content

Commit 5f79529

Browse files
vivien-applevivien-apple
authored
Tests disabled tests (project-chip#7640)
* Add more explicit failures when generating tests * Add the ability to disable some tests in the yaml file * Replace OnOffCluster yaml test by Test_3_1_1, Test_3_2_1, Test_3_2_2 * Update gen/ folders
1 parent d39933c commit 5f79529

File tree

10 files changed

+1742
-185
lines changed

10 files changed

+1742
-185
lines changed

‎examples/chip-tool/commands/tests/Commands.h

+1,199-121
Large diffs are not rendered by default.

‎examples/chip-tool/templates/partials/test_cluster.zapt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{{#chip_tests tests}}
2-
class {{asCamelCased filename false}}: public TestCommand
2+
class {{filename}}: public TestCommand
33
{
44
public:
5-
{{asCamelCased filename false}}(): TestCommand("{{filename}}"), mTestIndex(0) {}
5+
{{filename}}(): TestCommand("{{filename}}"), mTestIndex(0) {}
66

77
/////////// TestCommand Interface /////////
88
CHIP_ERROR NextTest() override
@@ -88,7 +88,7 @@ class {{asCamelCased filename false}}: public TestCommand
8888
{
8989
ChipLogProgress(chipTool, "{{cluster}} - {{label}}: Failure Response");
9090

91-
{{asCamelCased parent.filename false}} * runner = reinterpret_cast<{{asCamelCased parent.filename false}} *>(context);
91+
{{parent.filename}} * runner = reinterpret_cast<{{parent.filename}} *>(context);
9292

9393
delete runner->mOnFailureCallback_{{index}};
9494
delete runner->mOnSuccessCallback_{{index}};
@@ -106,7 +106,7 @@ class {{asCamelCased filename false}}: public TestCommand
106106
{
107107
ChipLogProgress(chipTool, "{{cluster}} - {{label}}: Success Response");
108108

109-
{{asCamelCased parent.filename false}} * runner = reinterpret_cast<{{asCamelCased parent.filename false}} *>(context);
109+
{{parent.filename}} * runner = reinterpret_cast<{{parent.filename}} *>(context);
110110

111111
delete runner->mOnFailureCallback_{{index}};
112112
delete runner->mOnSuccessCallback_{{index}};

‎examples/chip-tool/templates/tests-commands.zapt

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44

55
#include "TestCommand.h"
66

7-
{{>test_cluster tests="TestCluster, OnOffCluster"}}
7+
{{>test_cluster tests="TestCluster, Test_3_1_1, Test_3_2_1, Test_3_2_2"}}
88

99
void registerCommandsTests(Commands & commands)
1010
{
1111
const char * clusterName = "Tests";
1212

1313
commands_list clusterCommands = {
1414
make_unique<TestCluster>(),
15-
make_unique<OnOffCluster>(),
15+
make_unique<Test_3_1_1>(),
16+
make_unique<Test_3_2_1>(),
17+
make_unique<Test_3_2_2>(),
1618
};
1719

1820
commands.Register(clusterName, clusterCommands);

‎src/app/tests/suites/Test_3_1_1.yaml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Copyright (c) 2021 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: 3.1.1. [TC-OO-1] Global attributes with server as DUT
16+
17+
config:
18+
cluster: "On/Off"
19+
endpoint: 1
20+
21+
tests:
22+
- label: "read the global attribute: ClusterRevision"
23+
command: "readAttribute"
24+
attribute: "Cluster Revision"
25+
response:
26+
value: 2
27+
28+
- label:
29+
"write the default values to mandatory global attribute:
30+
ClusterRevision"
31+
disabled: true
32+
command: "writeAttribute"
33+
attribute: "Cluster Revision"
34+
arguments:
35+
value: 2
36+
response:
37+
error: 1
38+
39+
- label: "reads back global attribute: ClusterRevision"
40+
command: "readAttribute"
41+
attribute: "Cluster Revision"
42+
response:
43+
value: 2
44+
45+
- label: "read the optional global attribute: FeatureMap"
46+
disabled: true
47+
command: "readAttribute"
48+
attribute: "Feature Map"
49+
response:
50+
value: 0
51+
52+
- label: "write the default values to optional global attribute: FeatureMap"
53+
disabled: true
54+
command: "writeAttribute"
55+
attribute: "Feature Map"
56+
arguments:
57+
value: 0
58+
response:
59+
error: 1
60+
61+
- label: "reads back optional global attribute: FeatureMap"
62+
disabled: true
63+
command: "readAttribute"
64+
attribute: "Feature Map"
65+
response:
66+
value: 0

‎src/app/tests/suites/Test_3_2_1.yaml

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
# Copyright (c) 2021 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: 3.2.1. [TC-OO-2] Attributes with server as DUT
16+
17+
config:
18+
cluster: "On/Off"
19+
endpoint: 1
20+
21+
tests:
22+
- label: "read the mandatory attribute: OnOff"
23+
command: "readAttribute"
24+
attribute: "On/Off"
25+
response:
26+
value: 0
27+
28+
- label: "write the default value of mandatory attribute: OnOff"
29+
disabled: true
30+
command: "writeAttribute"
31+
attribute: "On/Off"
32+
arguments:
33+
value: 0
34+
response:
35+
error: 1
36+
37+
- label: "reads back mandatory attribute: OnOff"
38+
command: "readAttribute"
39+
attribute: "On/Off"
40+
response:
41+
value: 0
42+
43+
- label: "read LT attribute: GlobalSceneControl"
44+
disabled: true
45+
command: "readAttribute"
46+
attribute: "Global Scene Control"
47+
response:
48+
value: 1
49+
50+
- label: "read LT attribute: OnTime"
51+
disabled: true
52+
command: "readAttribute"
53+
attribute: "On Time"
54+
response:
55+
value: 0
56+
57+
- label: "read LT attribute: OffWaitTime"
58+
disabled: true
59+
command: "readAttribute"
60+
attribute: "Off Wait Time"
61+
response:
62+
value: 0
63+
64+
- label: "read LT attribute: StartUpOnOff"
65+
disabled: true
66+
command: "readAttribute"
67+
attribute: "Start Up On Off"
68+
response:
69+
value: 0
70+
71+
- label: "write the default value to LT attribute: GlobalSceneControl"
72+
disabled: true
73+
command: "writeAttribute"
74+
attribute: "Global Scene Control"
75+
arguments:
76+
value: 0
77+
response:
78+
error: 1
79+
80+
- label: "write the default value to LT attribute: OnTime"
81+
disabled: true
82+
command: "writeAttribute"
83+
attribute: "On Time"
84+
arguments:
85+
value: 0
86+
87+
- label: "write the default value to LT attribute: OffWaitTime"
88+
disabled: true
89+
command: "writeAttribute"
90+
attribute: "Off Wait Time"
91+
arguments:
92+
value: 0
93+
94+
- label: "write the default value to LT attribute: StartUpOnOff"
95+
disabled: true
96+
command: "writeAttribute"
97+
attribute: "Start Up On Off"
98+
arguments:
99+
value: 0
100+
101+
- label: "reads back LT attribute: GlobalSceneControl"
102+
disabled: true
103+
command: "readAttribute"
104+
attribute: "Global Scene Control"
105+
response:
106+
value: 1
107+
108+
- label: "reads back LT attribute: OnTime"
109+
disabled: true
110+
command: "readAttribute"
111+
attribute: "On Time"
112+
response:
113+
value: 0
114+
115+
- label: "reads back LT attribute: OffWaitTime"
116+
disabled: true
117+
command: "readAttribute"
118+
attribute: "Off Wait Time"
119+
response:
120+
value: 0
121+
122+
- label: "reads back LT attribute: StartUpOnOff"
123+
disabled: true
124+
command: "readAttribute"
125+
attribute: "Start Up On Off"
126+
response:
127+
value: 0

‎src/app/tests/suites/OnOffCluster.yaml ‎src/app/tests/suites/Test_3_2_2.yaml

+41-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,53 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
name: OnOff Tests
15+
name: 3.2.2. [TC-OO-3] Primary functionality with server as DUT
1616

1717
config:
1818
cluster: "On/Off"
1919
endpoint: 1
2020

2121
tests:
22-
- label: "Check on/off attribute value is false when starting"
22+
- label: "Send Off Command"
23+
command: "off"
24+
25+
- label: "Check on/off attribute value is false after off command"
26+
command: "readAttribute"
27+
attribute: "on/off"
28+
response:
29+
value: 0
30+
31+
- label: "Send On Command"
32+
command: "on"
33+
34+
- label: "Check on/off attribute value is true after on command"
35+
command: "readAttribute"
36+
attribute: "on/off"
37+
response:
38+
value: 1
39+
40+
- label: "Send Off Command"
41+
command: "off"
42+
43+
- label: "Check on/off attribute value is false after off command"
44+
command: "readAttribute"
45+
attribute: "on/off"
46+
response:
47+
value: 0
48+
49+
- label: "Send Toggle Command"
50+
command: "toggle"
51+
52+
- label: "Check on/off attribute value is true after toggle command"
53+
command: "readAttribute"
54+
attribute: "on/off"
55+
response:
56+
value: 1
57+
58+
- label: "Send Toggle Command"
59+
command: "toggle"
60+
61+
- label: "Check on/off attribute value is false after toggle command"
2362
command: "readAttribute"
2463
attribute: "on/off"
2564
response:

0 commit comments

Comments
 (0)