From d539b3b5c6e24660c5b21302e91eafb16fe04ed0 Mon Sep 17 00:00:00 2001 From: lpbeliveau-silabs Date: Tue, 23 Jan 2024 11:09:41 -0500 Subject: [PATCH] Updated remaining transition times and added delay for Darwin CI test --- src/app/clusters/scenes-server/SceneTable.h | 2 +- .../suites/certification/Test_TC_S_2_2.yaml | 8 ++-- .../suites/certification/Test_TC_S_2_3.yaml | 42 +++++++++++++++---- .../suites/certification/Test_TC_S_2_4.yaml | 6 +-- .../suites/certification/Test_TC_S_2_5.yaml | 6 +-- .../suites/certification/Test_TC_S_2_6.yaml | 6 +-- .../zap-generated/test/Commands.h | 20 ++++----- 7 files changed, 60 insertions(+), 30 deletions(-) diff --git a/src/app/clusters/scenes-server/SceneTable.h b/src/app/clusters/scenes-server/SceneTable.h index 8f0353bf05da44..1b634211ead063 100644 --- a/src/app/clusters/scenes-server/SceneTable.h +++ b/src/app/clusters/scenes-server/SceneTable.h @@ -39,7 +39,7 @@ inline constexpr SceneId kUndefinedSceneId = 0xff; static constexpr size_t kIteratorsMax = CHIP_CONFIG_MAX_SCENES_CONCURRENT_ITERATORS; static constexpr size_t kSceneNameMaxLength = CHIP_CONFIG_SCENES_CLUSTER_MAXIMUM_NAME_LENGTH; -static constexpr size_t kScenesMaxTransitionTime = 6'000'000u; +static constexpr size_t kScenesMaxTransitionTime = 60'000'000u; /// @brief SceneHandlers are meant as interface between various clusters and the Scene table. /// When a scene command involving extension field sets is received, the Scene Table will go through diff --git a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml index e9a9c958ca9766..3d8c9ad1ea1492 100644 --- a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml @@ -208,6 +208,8 @@ tests: - name: "Status" value: 0x85 - name: "Capacity" + constraints: + anyOf: [fabricCapacity, 0xfe, null] value: null - name: "GroupID" value: GI @@ -592,7 +594,7 @@ tests: value: 0x00 - name: "Capacity" constraints: - anyOf: [fabricCapacity, 0xfe, 0x89] + anyOf: [fabricCapacity, 0xfe, null] - name: "GroupID" value: G1 @@ -749,7 +751,7 @@ tests: - label: "Step 8d: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set - to 7 000 000 (7 000s) and no extension field sets. This should fail + to 70 000 000 (70 000s) and no extension field sets. This should fail and return a status of 0x85 (INVALID_COMMAND)." PICS: S.S.C00.Rsp && PICS_SDK_CI_ONLY command: "AddScene" @@ -760,7 +762,7 @@ tests: - name: "SceneID" value: 0x01 - name: "TransitionTime" - value: 7000000 + value: 70000000 - name: "SceneName" value: "Scene1" - name: "ExtensionFieldSets" diff --git a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml index b4ce3f3edd5408..22118eaa396aa8 100644 --- a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml @@ -268,7 +268,7 @@ tests: - label: "Step 2: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to - 1s and a set of extension fields appropriate to AC1." + 1000 (1s) and a set of extension fields appropriate to AC1." PICS: S.S.C00.Rsp && PICS_SDK_CI_ONLY command: "AddScene" arguments: @@ -307,7 +307,7 @@ tests: - label: "Step 2: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to - 1s and a set of extension fields appropriate to AC1." + 1000 (1s) and a set of extension fields appropriate to AC1." verification: | Execute the following command in TH to generate the pre-condition to execute this test case: @@ -532,7 +532,7 @@ tests: - label: "Step 6a: TH sends a AddScene command to group G1 with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime - field set to 1s and a set of extension fields appropriate to + field set to 1000 (1s) and a set of extension fields appropriate to AC1." PICS: S.S.C00.Rsp && PICS_SDK_CI_ONLY command: "AddScene" @@ -707,6 +707,15 @@ tests: - name: "SceneID" value: 0x03 + - label: "Wait 1+ s to give CI time to process the RemoveScene command." + PICS: PICS_SDK_CI_ONLY + cluster: "DelayCommands" + command: "WaitForMs" + arguments: + values: + - name: "ms" + value: 1250 + - label: "Step 6e: TH sends a ViewScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x03." @@ -874,7 +883,7 @@ tests: value: 0x00 - name: "Capacity" constraints: - anyOf: [fabricCapacity - 4, 0xfe, 0x89] + anyOf: [fabricCapacity - 4, 0xfe, null] - name: "GroupID" value: G2 - name: "SceneList" @@ -916,7 +925,7 @@ tests: value: 0x00 - name: "Capacity" constraints: - anyOf: [fabricCapacity - 5, 0xfe, 0x89] + anyOf: [fabricCapacity - 5, 0xfe, null] - name: "GroupID" value: G2 - name: "SceneList" @@ -933,6 +942,15 @@ tests: - name: "GroupID" value: G1 + - label: "Wait 1+ s to give CI time to process the RemoveScene command." + PICS: PICS_SDK_CI_ONLY + cluster: "DelayCommands" + command: "WaitForMs" + arguments: + values: + - name: "ms" + value: 1250 + - label: "Step 9b: TH sends a GetSceneMembership command to DUT with the GroupID field set to G1." @@ -948,7 +966,7 @@ tests: value: 0x00 - name: "Capacity" constraints: - anyOf: [fabricCapacity - 3, 0xfe, 0x89] + anyOf: [fabricCapacity - 3, 0xfe, null] - name: "GroupID" value: G1 - name: "SceneList" @@ -964,6 +982,16 @@ tests: values: - name: "GroupID" value: G2 + + - label: "Wait 1+ s to give CI time to process the RemoveScene command." + PICS: PICS_SDK_CI_ONLY + cluster: "DelayCommands" + command: "WaitForMs" + arguments: + values: + - name: "ms" + value: 1250 + - label: "Step 10b: TH sends a GetSceneMembership command to DUT with the GroupID field set to G1." @@ -979,7 +1007,7 @@ tests: value: 0x00 - name: "Capacity" constraints: - anyOf: [fabricCapacity, 0xfe, 0x89] + anyOf: [fabricCapacity, 0xfe, null] - name: "GroupID" value: G2 - name: "SceneList" diff --git a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml index c95e5a6a7df984..a903b261b8150a 100644 --- a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml @@ -119,7 +119,7 @@ tests: - label: "Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to - 0x4E20 (20s) and no extension fields set." + 20000 (20s) and no extension fields set." PICS: S.S.C00.Rsp command: "AddScene" arguments: @@ -129,7 +129,7 @@ tests: - name: "SceneID" value: 0x01 - name: "TransitionTime" - value: 0x4E20 + value: 20000 - name: "SceneName" value: "Scene1" - name: "ExtensionFieldSets" @@ -330,7 +330,7 @@ tests: - label: "Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field - set to 5s." + set to 5000 5s." PICS: S.S.C05.Rsp && PICS_SC_RECALL_SCENE_TRANSITION_TIME command: "RecallScene" arguments: diff --git a/src/app/tests/suites/certification/Test_TC_S_2_5.yaml b/src/app/tests/suites/certification/Test_TC_S_2_5.yaml index 6353a639643125..95d720b95cb3ba 100644 --- a/src/app/tests/suites/certification/Test_TC_S_2_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_2_5.yaml @@ -141,10 +141,10 @@ tests: - label: "Step 5a: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set - to 20s and no extension field sets." + to 20000 (20s) and no extension field sets." PICS: S.S.C00.Rsp verification: | - ./chip-tool scenes add-scene 0x0001 0x1 0x4E20 scene1 [] 1 1 + ./chip-tool scenes add-scene 0x0001 0x1 20000 scene1 [] 1 1 CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0005 Command 0x0000_0000 CHIP:TOO: AddSceneResponse: { @@ -196,7 +196,7 @@ tests: - label: "Step 7a: If RemainingCapacity is greater than 0, TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set - to 0x03, the TransitionTime field set to 20s and no extension + to 0x03, the TransitionTime field set to 20000 (20s) and no extension field sets. If RemainingCapacity is 0, continue to Step 8a." PICS: S.S.C00.Rsp verification: | diff --git a/src/app/tests/suites/certification/Test_TC_S_2_6.yaml b/src/app/tests/suites/certification/Test_TC_S_2_6.yaml index a3d935b3b1faab..76c1d74a63bc34 100644 --- a/src/app/tests/suites/certification/Test_TC_S_2_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_2_6.yaml @@ -92,7 +92,7 @@ tests: - label: "Step 3a: TH1 sends a AddScene command to DUT with the GroupID field set to 0x0000, the SceneID field set to 0x01, the TransitionTime field - set to 20s and no extension field sets." + set to 20000 (20s) and no extension field sets." PICS: S.S.C00.Rsp verification: | ./chip-tool scenes add-scene 0x0000 0x1 20000 scene1 [] 1 1 @@ -130,7 +130,7 @@ tests: - label: "Step 4b: TH1 sends a AddScene command to DUT with the GroupID field set to 0x0000, the SceneID field set to 1 more than last value used in - step 4a, the TransitionTime field set to 20s and no extension + step 4a, the TransitionTime field set to 20000 (20s) and no extension field sets." PICS: S.S.C00.Rsp verification: | @@ -184,7 +184,7 @@ tests: - label: "Step 6b: TH3 sends a AddScene command to DUT with the GroupID field set to 0x0000, the SceneID field set to 0x01, the TransitionTime field - set to 20s and no extension field sets." + set to 20000 20s and no extension field sets." PICS: S.S.C00.Rsp verification: | ./chip-tool scenes add-scene 0x0000 0x12 20000 scene301 [] 3 1 --commissioner-name gamma diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index f9a5ebbf9b355a..8a20991c110827 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -190261,12 +190261,12 @@ class Test_TC_S_2_4 : public TestCommandBridge { err = TestStep2bThSendsARemoveAllScenesCommandToDutWithTheGroupIDFieldSetToG1_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x4E20 (20s) and no extension fields set.\n"); + ChipLogProgress(chipTool, " ***** Test Step 6 : Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 20000 (20s) and no extension fields set.\n"); if (ShouldSkip("S.S.C00.Rsp")) { NextTest(); return; } - err = TestStep3ThSendsAAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo0x4E2020sAndNoExtensionFieldsSet_6(); + err = TestStep3ThSendsAAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo2000020sAndNoExtensionFieldsSet_6(); break; case 7: ChipLogProgress(chipTool, " ***** Test Step 7 : Step 4a: TH configures AC1 on DUT for all implemented application clusters supporting scenes.\n"); @@ -190365,12 +190365,12 @@ class Test_TC_S_2_4 : public TestCommandBridge { err = TestStep6aThConfiguresAc2OnDutForAllImplementedApplicationClustersSupportingScenes_19(); break; case 20: - ChipLogProgress(chipTool, " ***** Test Step 20 : Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to 0x1388 (5s).\n"); + ChipLogProgress(chipTool, " ***** Test Step 20 : Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to 5000 5s.\n"); if (ShouldSkip("S.S.C05.Rsp && PICS_SC_RECALL_SCENE_TRANSITION_TIME")) { NextTest(); return; } - err = TestStep6bThSendsARecallSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01AndTheTransitionTimeFieldSetTo0x13885s_20(); + err = TestStep6bThSendsARecallSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01AndTheTransitionTimeFieldSetTo50005s_20(); break; case 21: ChipLogProgress(chipTool, " ***** Test Step 21 : Wait 5s\n"); @@ -190748,7 +190748,7 @@ class Test_TC_S_2_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep3ThSendsAAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo0x4E2020sAndNoExtensionFieldsSet_6() + CHIP_ERROR TestStep3ThSendsAAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo2000020sAndNoExtensionFieldsSet_6() { MTRBaseDevice * device = GetDevice("alpha"); @@ -190769,9 +190769,9 @@ class Test_TC_S_2_4 : public TestCommandBridge { [cluster addSceneWithParams:params completion: ^(MTRScenesManagementClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable err) { if (err != nil) { - NSLog(@"Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x4E20 (20s) and no extension fields set.: Error: %@", err); + NSLog(@"Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 20000 (20s) and no extension fields set.: Error: %@", err); } else { - NSLog(@"Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x4E20 (20s) and no extension fields set.: Success"); + NSLog(@"Step 3: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 20000 (20s) and no extension fields set.: Success"); } VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -191074,7 +191074,7 @@ class Test_TC_S_2_4 : public TestCommandBridge { return UserPrompt("alpha", value); } - CHIP_ERROR TestStep6bThSendsARecallSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01AndTheTransitionTimeFieldSetTo0x13885s_20() + CHIP_ERROR TestStep6bThSendsARecallSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01AndTheTransitionTimeFieldSetTo50005s_20() { MTRBaseDevice * device = GetDevice("alpha"); @@ -191090,9 +191090,9 @@ class Test_TC_S_2_4 : public TestCommandBridge { [cluster recallSceneWithParams:params completion: ^(NSError * _Nullable err) { if (err != nil) { - NSLog(@"Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to 0x1388 (5s).: Error: %@", err); + NSLog(@"Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to 5000 5s.: Error: %@", err); } else { - NSLog(@"Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to 0x1388 (5s).: Success"); + NSLog(@"Step 6b: TH sends a RecallScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01 and the TransitionTime field set to 5000 5s.: Success"); } VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));