Skip to content

Commit f3245d4

Browse files
Modified tests Aug 31 (#28985)
* Modified tests: TC_ACL_2_10 TC_ACL_2_7 TC_ACT_2_1 TC_ALOGIN_12_1 TC_BIND_2_3 TC_BRBINFO_1_1 TC_BR_4 TC_CADMIN_1_13 TC_CADMIN_1_15 TC_CADMIN_1_17 TC_CADMIN_1_18 TC_DESC_2_1 TC_DGGEN_2_2 TC_DRLK_3_2 TC_G_2_2 TC_G_2_3 TC_G_3_2 TC_ICDM_2_2 TC_ICDM_2_3 TC_IDM_4_4 TC_IDM_6_2 TC_IDM_6_4 TC_IDM_7_1 TC_I_2_2 TC_MC_11_1 TC_OPCREDS_3_2 TC_OPCREDS_3_3 TC_OPSTATE_2_2 TC_OPSTATE_2_3 TC_RVCCLEANM_3_1 TC_RVCOPSTATE_2_2 TC_RVCRUNM_3_1 TC_SC_3_1 TC_SC_3_2 TC_SC_3_3 TC_SC_4_10 TC_SC_4_2 TC_SC_4_3 TC_SC_4_4 TC_SC_4_5 TC_SC_4_6 TC_SC_4_7 TC_SC_4_9 TC_SC_6_1 TC_SU_2_8 TC_SU_3_3 TC_SU_4_1 TC_S_2_5 TC_S_2_6 TC_TCTL_2_2 TC_TSTAT_3_2 TC_WASHERCTRL_1_1 TC_WASHERCTRL_2_1 TC_WASHERCTRL_2_2 * Restyled by whitespace * Fixes script issue 629 * Disabled TC-RVCRUNM-3.1 test in init.py Removed step 2a subscribe operationalstatus from test: TC-WNCV-3.1 TC-WNCV-3.2 * Restyled by whitespace * Modified tests: TC-WNCV-3.1 TC-WNCV-3.2 * Fix script issue: 953 Updated DRLK writable PICS in drl_2_x_common.py * Disabled RVCCLEANM-3.1 test in init.py * Added high level PICS for tests: TC-CADMIN-1.25 TC-CADMIN-1.26 TC-DA-1.8 * Fix script issue 632. * Restyled by whitespace * Fix issue 28997 * Removed WASHERCTRL-2.2 from Darwin JSON file. Modified manual script : TC-GRPKEY-5.4 TC-SC-6.1 TC-OPCREDS-3.6 TC-G-3.2 * Restyled by whitespace * Modified test: TC-SC-6.1 * Restyled by whitespace * Modified test: TC-SC-6.1 * Restyled by whitespace * Added WASHERCTRL-2.2 test in Darwin --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 4064446 commit f3245d4

File tree

82 files changed

+4171
-5731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+4171
-5731
lines changed

scripts/tests/chiptest/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
174174
"Test_TC_DGGEN_2_3.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
175175
"Test_TC_LWM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
176176
"Test_TC_G_2_4.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
177+
"Test_TC_RVCRUNM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
178+
"Test_TC_RVCCLEANM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
177179
}
178180

179181

src/app/tests/suites/certification/PICS.yaml

+40-44
Original file line numberDiff line numberDiff line change
@@ -2664,67 +2664,60 @@ PICS:
26642664
#
26652665
# Server write attributes
26662666
#
2667+
- label: "Does the device implement simulation of a Not Fully Locked State?"
2668+
id: DRLK.S.M.SimulateNotFullyLocked
26672669

2668-
- label: "Does the DUT(server) support the DoorOpen Events attribute?"
2669-
id: DRLK.S.A0004.Write
2670-
2671-
- label: "Does the DUT(server) support the DoorClosedEvents attribute?"
2672-
id: DRLK.S.A0005.Write
2673-
2674-
- label: "Does the DUT(server) support the OpenPeriod attribute?"
2675-
id: DRLK.S.A0006.Write
2676-
2677-
- label: "Does the DUT(server) support the Language attribute?"
2678-
id: DRLK.S.A0021.Write
2679-
2680-
- label: "Does the DUT(server) support the LEDSettings attribute?"
2681-
id: DRLK.S.A0022.Write
2682-
2683-
- label: "Does the DUT(server) support the AutoRelockTime attribute?"
2684-
id: DRLK.S.A0023.Write
2685-
2686-
- label: "Does the DUT(server) support the SoundVolume attribute?"
2687-
id: DRLK.S.A0024.Write
2670+
- label: "Does the device implement detection of a LockJammed State?"
2671+
id: DRLK.S.M.DetectLockJammed
26882672

2689-
- label: "Does the DUT(server) support the OperatingMode attribute?"
2690-
id: DRLK.S.A0025.Write
2673+
- label: "Does the device implement Language attribute with write access?"
2674+
id: DRLK.S.M.LanguageAttributeWritable
26912675

26922676
- label:
2693-
"Does the DUT(server) support the EnableLocalProgramming attribute?"
2694-
id: DRLK.S.A0028.Write
2677+
"Does the device implement LEDSettings attribute with write access?"
2678+
id: DRLK.S.M.LEDSettingsAttributeWritable
26952679

2696-
- label: "Does the DUT(server) support the EnableOneTouchLocking attribute?"
2697-
id: DRLK.S.A0029.Write
2680+
- label:
2681+
"Does the device implement AutoRelockTime attribute with write access?"
2682+
id: DRLK.S.M.AutoRelockTimeAttributeWritable
26982683

2699-
- label: "Does the DUT(server) support the EnableInsideStatusLED attribute?"
2700-
id: DRLK.S.A002a.Write
2684+
- label:
2685+
"Does the device implement SoundVolume attribute with write access?"
2686+
id: DRLK.S.M.SoundVolumeAttributeWritable
27012687

27022688
- label:
2703-
"Does the DUT(server) support the EnablePrivacyModeButton attribute?"
2704-
id: DRLK.S.A002b.Write
2689+
"Does the device implement OperatingMode attribute with write access?"
2690+
id: DRLK.S.M.OperatingModeAttributeWritable
27052691

27062692
- label:
2707-
"Does the DUT(server) support the LocalProgrammingFeatures attribute?"
2708-
id: DRLK.S.A002c.Write
2693+
"Does the device implement EnableLocalProgramming attribute with write
2694+
access?"
2695+
id: DRLK.S.M.EnableLocalProgrammingAttributeWritable
27092696

2710-
- label: "Does the DUT(server) support the WrongCodeEntryLimit attribute?"
2711-
id: DRLK.S.A0030.Write
2697+
- label:
2698+
"Does the device implement LocalProgrammingFeatures attribute with
2699+
write access?"
2700+
id: DRLK.S.M.LocalProgrammingFeaturesAttributeWritable
27122701

27132702
- label:
2714-
"Does the DUT(server) support the UserCodedTemporaryDisableTime
2715-
attribute?"
2716-
id: DRLK.S.A0031.Write
2703+
"Does the device implement WrongCodeEntryLimit attribute with write
2704+
access?"
2705+
id: DRLK.S.M.WrongCodeEntryLimitAttributeWritable
27172706

2718-
- label: "Does the DUT(server) support the SendPINOverTheAir attribute?"
2719-
id: DRLK.S.A0032.Write
2707+
- label:
2708+
"Does the device implement UserCodedTemporaryDisableTime attribute
2709+
with write access?"
2710+
id: DRLK.S.M.UserCodedTemporaryDisableTimeAttributeWritable
27202711

27212712
- label:
2722-
"Does the DUT(server) support the RequirePINForRemoteOperation
2723-
attribute?"
2724-
id: DRLK.S.A0033.Write
2713+
"Does the device implement RequirePINForRemoteOperation attribute with
2714+
write access?"
2715+
id: DRLK.S.M.RequirePINForRemoteOperationAttributeWritable
27252716

2726-
- label: "Does the DUT(server) support the ExpiringUserTimeOut attribute?"
2727-
id: DRLK.S.A0035.Write
2717+
- label:
2718+
"Does the device implement ExpiringUserTimeOut attribute with write
2719+
access?"
2720+
id: DRLK.S.M.ExpiringUserTimeOutAttributeWritable
27282721

27292722
#
27302723
# server / commandsReceived
@@ -9237,6 +9230,9 @@ PICS:
92379230
"Can the Rinse attribute changed by physical control at the device?"
92389231
id: WASHERCTRL.S.M.ManuallyControlledRinse
92399232

9233+
- label: "Can the device be controlled manually?"
9234+
id: WASHERCTRL.S.M.ManuallyControlled
9235+
92409236
#
92419237
#RVC Run Mode
92429238
#

src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -557,13 +557,14 @@ tests:
557557
verification: |
558558
./chip-tool accesscontrol read extension 2 0 --commissioner-name beta --commissioner-nodeid 223344
559559
560-
On TH2(Chiptool) , Verify AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
560+
Via the TH2(chip-tool), Verify the AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
561561
562562
[1657289746.737641][19293:19298] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 1884338152
563563
[1657289746.737713][19293:19298] CHIP:TOO: Extension: 1 entries
564564
[1657289746.737778][19293:19298] CHIP:TOO: [1]: {
565565
[1657289746.737803][19293:19298] CHIP:TOO: Data: 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018
566-
[1657289746.737844][19293:19298] CHIP:TOO: Fab
566+
[1657289746.737844][19293:19298] CHIP:TOO: FabricIndex: 2
567+
[1657289746.737862][19293:19298] CHIP:TOO: }
567568
cluster: "LogCommands"
568569
command: "UserPrompt"
569570
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.A0001

src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ tests:
392392
#Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
393393
- label: "TH2 writes Extension attribute value as empty list"
394394
verification: |
395-
./chip-tool accesscontrol write extension '[{}]' 2 0 --commissioner-name beta --commissioner-nodeid 223344
395+
./chip-tool accesscontrol write extension '[]' 2 0 --commissioner-name beta --commissioner-nodeid 223344
396396
cluster: "LogCommands"
397397
command: "UserPrompt"
398398
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.A0001

src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml

100755100644
+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ tests:
451451
disabled: true
452452

453453
- label:
454-
"Step 6d: Verify SetupURL appended by '?/a='' and the decimal numeric
454+
"Step 6d: Verify SetupURL appended by '?/a=' and the decimal numeric
455455
value of one of the exposed ActionIDs (see step 5a) points to a site
456456
providing information about the action"
457457
PICS: ACT.S.A0002 && ACT.S.M.SetupURLWithSuffix

src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
1514

1615
name: 3.14.1. [TC-ALOGIN-12.1] Account Login Verification
1716

@@ -60,10 +59,11 @@ tests:
6059
- name: "Status"
6160
value: 0
6261

62+
#Issue: https://github.com/project-chip/connectedhomeip/issues/28992
6363
- label:
6464
"Step 1: TH sends a GetSetupPIN command to the DUT with test values
6565
provided by the product maker."
66-
PICS: ALOGIN.S.C00.Rsp
66+
PICS: ALOGIN.S.C00.Rsp && PICS_SKIP_SAMPLE_APP
6767
command: "GetSetupPIN"
6868
timedInteractionTimeoutMs: 10000
6969
arguments:
@@ -74,11 +74,13 @@ tests:
7474
values:
7575
- name: "SetupPIN"
7676
saveAs: setupPIN
77+
constraints:
78+
minLength: 11
7779

7880
- label:
7981
"Step 2: TH sends a Login command to the DUT with test values provided
8082
by the product maker."
81-
PICS: ALOGIN.S.C02.Rsp
83+
PICS: ALOGIN.S.C02.Rsp && PICS_SKIP_SAMPLE_APP
8284
command: "Login"
8385
timedInteractionTimeoutMs: 10000
8486
arguments:
@@ -91,6 +93,6 @@ tests:
9193
- label:
9294
"Step 3: TH sends a Logout command to the DUT with test values
9395
provided by the product maker."
94-
PICS: ALOGIN.S.C03.Rsp
96+
PICS: ALOGIN.S.C03.Rsp && PICS_SKIP_SAMPLE_APP
9597
command: "Logout"
9698
timedInteractionTimeoutMs: 10000

src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,7 @@ tests:
127127
128128
Run this command for lighting app in chip-tool:
129129
130-
./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 42,
131-
"groupKeySecurityPolicy": 0, "epochKey0":
132-
"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
133-
"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
134-
"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 2 0
130+
./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 42, "groupKeySecurityPolicy": 0, "epochKey0": "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1": "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2": "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 2 0
135131
136132
On TH1, Verify the success response for KeySetWrite
137133

src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml

+6-19
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,13 @@ tests:
3434
- name: "nodeId"
3535
value: nodeId
3636

37-
#Issue https://github.com/project-chip/connectedhomeip/issues/26602
3837
- label: "Step 2: TH reads the ClusterRevision from DUT"
39-
verification: |
40-
./chip-tool bridgeddevicebasicinformation read cluster-revision 1 3
41-
42-
Via the TH (chip-tool), verify:
43-
-that the ClusterRevision attribute contains value as 2.
44-
-that value is in the type of uint16.
45-
46-
[1657695910.794487][15411:15416] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_FFFD DataVersion: 2577979325
47-
[1657695910.794568][15411:15416] CHIP:TOO: ClusterRevision: 2
48-
cluster: "LogCommands"
49-
command: "UserPrompt"
50-
PICS: PICS_USER_PROMPT
51-
arguments:
52-
values:
53-
- name: "message"
54-
value: "Please enter 'y' for success"
55-
- name: "expectedValue"
56-
value: "y"
38+
command: "readAttribute"
39+
attribute: "ClusterRevision"
40+
response:
41+
value: 2
42+
constraints:
43+
type: int16u
5744

5845
- label: "Step 3: TH reads the FeatureMap from DUT"
5946
command: "readAttribute"

src/app/tests/suites/certification/Test_TC_BR_4.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6042,7 +6042,7 @@ tests:
60426042
contains the state of the battery of the (supported) devices from the
60436043
above list"
60446044
verification: |
6045-
./chip-tool powersource read bat-charge-level 1 9
6045+
./chip-tool powersource read bat-charge-level 1 6
60466046

60476047
Verify BatChargeLevel attribute response on TH(bridge-app) Log:
60486048

@@ -6063,7 +6063,7 @@ tests:
60636063
[1663925822.845919][1588:1588] CHIP:DMG: Attribute = 0x0000_000E,
60646064
[1663925822.845946][1588:1588] CHIP:DMG: }
60656065
[1663925822.845978][1588:1588] CHIP:DMG:
6066-
[1663925822.846007][1588:1588] CHIP:DMG: Data = 58,
6066+
[1663925822.846007][1588:1588] CHIP:DMG: Data = 3,
60676067
[1663925822.846035][1588:1588] CHIP:DMG: },
60686068
[1663925822.846063][1588:1588] CHIP:DMG:
60696069
[1663925822.846086][1588:1588] CHIP:DMG: },

src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ tests:
159159
verification: |
160160
On TH_CR3 send the below command
161161
162-
./chip-tool pairing onnetwork 3 20202021 --commissioner-name gamma
162+
./chip-tool pairing code 3 34970112332 --commissioner-name gamma
163163
164164
Verify you got below message on TH_CR3(chip-tool) log
165165
Device commissioning completed with success
@@ -210,7 +210,7 @@ tests:
210210
211211
212212
On 2nd controller using chip tool connect to the accessory
213-
./chip-tool pairing onnetwork 2 20202021 --commissioner-name beta
213+
./chip-tool pairing code 2 34970112332 --commissioner-name beta
214214
215215
Verify you got below message on TH_CR2(chip-tool) log
216216
Device commissioning completed with success

src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ tests:
221221
disabled: true
222222

223223
- label:
224-
"Verify DUT_CE is now discoverable over DNS-SD with 2 Operational
225-
service records (_matter._tcp SRV records)."
224+
"Step 10: Verify DUT_CE is now discoverable over DNS-SD with 2
225+
Operational service records (_matter._tcp SRV records)."
226226
PICS: CADMIN.S.C00.Rsp
227227
verification: |
228228
Execute the below command in any linux platform or in TH_CR1

src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,8 @@ tests:
358358
disabled: true
359359

360360
- label:
361-
"Verify TH_CE is now discoverable over DNS-SD with 2 Operational
362-
service records (_matter._tcp SRV records)."
361+
"Step 10: Verify TH_CE is now discoverable over DNS-SD with 2
362+
Operational service records (_matter._tcp SRV records)."
363363
verification: |
364364
On any Linux platform execute this command or in TH_CR2
365365

src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ tests:
339339
disabled: true
340340

341341
- label:
342-
"Verify TH_CE is now discoverable over DNS-SD with 2 Operational
343-
service records (_matter._tcp SRV records)."
342+
"Step 10: Verify TH_CE is now discoverable over DNS-SD with 2
343+
Operational service records (_matter._tcp SRV records)."
344344
verification: |
345345
Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
346346

src/app/tests/suites/certification/Test_TC_CADMIN_1_25.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ name:
1717
36.1.25. [TC-CADMIN-1.25] Subscription to the attributes - verify
1818
subscription response [ECM] [DUT - Commissionee]
1919

20+
PICS:
21+
- CADMIN.S
22+
2023
config:
2124
nodeId: 0x12344321
2225
cluster: "Basic Information"

src/app/tests/suites/certification/Test_TC_CADMIN_1_26.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ name:
1717
36.1.26. [TC-CADMIN-1.26] Subscription to the attributes - verify
1818
subscription response [BCM] [DUT - Commissionee]
1919

20+
PICS:
21+
- CADMIN.S
22+
- CADMIN.S.F00
23+
2024
config:
2125
nodeId: 0x12344321
2226
cluster: "Basic Information"

src/app/tests/suites/certification/Test_TC_DA_1_8.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ name:
1717
29.1.8. [TC-DA-1.8] Device Attestation Request Validation-Success Scenario
1818
[DUT-Commissioner]
1919

20+
PICS:
21+
- MCORE.ROLE.COMMISSIONER
22+
2023
config:
2124
nodeId: 0x12344321
2225
cluster: "Basic Information"

0 commit comments

Comments
 (0)