[YAML] Update TestCommand.cpp so it does not automatically wait for t…

…he device to be retrieved but do it conditionally if WaitForCommissionee is used in the test (#11833)

* Update TestCommand.cpp so it does not automatically wait for the device to be retrieved but do it conditionally if WaitForCommissionee is used in the test

* Update the tests to use the WaitForCommissionee step

* [Darwin] Add WaitForCommissionee support in tests

* Update generated tests code

examples/chip-tool/commands/tests/TestCommand.cpp

@@ -19,6 +19,18 @@
 #include "TestCommand.h"
 
 CHIP_ERROR TestCommand::RunCommand()
+{
+    if (mPICSFilePath.HasValue())
+    {
+        PICS.SetValue(PICSBooleanReader::Read(mPICSFilePath.Value()));
+    }
+
+    NextTest();
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR TestCommand::WaitForCommissionee()
 {
     return CurrentCommissioner().GetConnectedDevice(mNodeId, &mOnDeviceConnectedCallback, &mOnDeviceConnectionFailureCallback);
 }
@@ -30,10 +42,6 @@ void TestCommand::OnDeviceConnectedFn(void * context, chip::OperationalDevicePro
     VerifyOrReturn(command != nullptr, ChipLogError(chipTool, "Device connected, but cannot run the test, as the context is null"));
     command->mDevice = device;
 
-    if (command->mPICSFilePath.HasValue())
-    {
-        command->PICS.SetValue(PICSBooleanReader::Read(command->mPICSFilePath.Value()));
-    }
     command->NextTest();
 }
 

src/app/tests/suites/TV_AccountLoginCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 3
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Get Setup PIN Command"
       command: "GetSetupPIN"
       arguments:

src/app/tests/suites/TV_ApplicationBasicCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 3
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Change Status Command"
       command: "ChangeStatus"
       arguments:

src/app/tests/suites/TV_ApplicationLauncherCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read attribute Application Launcher list"
       command: "readAttribute"
       attribute: "Application Launcher List"

src/app/tests/suites/TV_AudioOutputCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 2
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read attribute Audio Output list"
       command: "readAttribute"
       attribute: "Audio Output List"

src/app/tests/suites/TV_KeypadInputCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Send Key Command"
       command: "SendKey"
       arguments:

src/app/tests/suites/TV_LowPowerCluster.yaml

@@ -19,5 +19,9 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Sleep Input Status Command"
       command: "Sleep"

src/app/tests/suites/TV_MediaInputCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read attribute media input list"
       command: "readAttribute"
       attribute: "media input list"

src/app/tests/suites/TV_MediaPlaybackCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 3
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Media Playback Play Command"
       command: "MediaPlay"
       response:

src/app/tests/suites/TV_TargetNavigatorCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read attribute Target Navigator list"
       command: "readAttribute"
       attribute: "Target Navigator List"

src/app/tests/suites/TV_TvChannelCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read attribute TV Channel list"
       command: "readAttribute"
       attribute: "TV Channel list"

src/app/tests/suites/TV_WakeOnLanCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read mac address"
       command: "readAttribute"
       attribute: "wake on lan mac address"

src/app/tests/suites/TestBasicInformation.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read location"
       command: "readAttribute"
       attribute: "location"

src/app/tests/suites/TestCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Send Test Command"
       command: "test"
 

src/app/tests/suites/TestClusterComplexTypes.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Send Test Command with optional arg set to null."
       # Not in TestCluster.yaml for now because this test depends on
       # distinguishing "null" and "not sent" for a nullable+optional

src/app/tests/suites/TestConstraints.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     # Tests for INT32U attribute
 
     - label: "Write attribute INT32U Value"

src/app/tests/suites/TestDelayCommands.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Wait 100ms"
       cluster: "DelayCommands"
       command: "WaitForMs"

src/app/tests/suites/TestDescriptorCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read attribute Device list"
       command: "readAttribute"
       attribute: "Device List"

src/app/tests/suites/TestGroupMessaging.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     #TODO : Add Group membership command when implemented Issue #11077
     # - label: "Add device to Group"
     #   command: "TODO"

src/app/tests/suites/TestGroupsCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "View Group 0 (invalid)"
       command: "ViewGroup"
       arguments:

src/app/tests/suites/TestIdentifyCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Send Identify command and expect success response"
       command: "identify"
       arguments:

src/app/tests/suites/TestLogCommands.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Log a simple message"
       cluster: "LogCommands"
       command: "Log"

src/app/tests/suites/TestModeSelectCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read CurrentMode"
       command: "readAttribute"
       attribute: "CurrentMode"

src/app/tests/suites/TestOperationalCredentialsCluster.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read number of supported fabrics"
       command: "readAttribute"
       attribute: "SupportedFabrics"

src/app/tests/suites/TestSaveAs.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Send Test Add Arguments Command"
       command: "testAddArguments"
       arguments:

src/app/tests/suites/TestSubscribe_OnOff.yaml

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Set OnOff Attribute to false"
       command: "Off"
 

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

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "read the global attribute: ClusterRevision"
       command: "readAttribute"
       attribute: "ClusterRevision"

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

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read mandatory non-global attribute: OutOfService"
       command: "readAttribute"
       attribute: "out of service"

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

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Reads PresentValue attribute from DUT"
       command: "readAttribute"
       attribute: "present value"

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

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "read the global attribute: ClusterRevision"
       command: "readAttribute"
       attribute: "ClusterRevision"

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

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Read mandatory non-global attribute: StateValue"
       command: "readAttribute"
       attribute: "StateValue"

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

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "read the global attribute: ClusterRevision"
       disabled: true
       command: "readAttribute"

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

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Reads mandatory attribute: CurrentHue"
       command: "readAttribute"
       attribute: "current hue"

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

@@ -19,6 +19,10 @@ config:
     endpoint: 1
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+
     - label: "Turn on light for color control tests"
       cluster: "On/Off"
       command: "on"