Move the list of YAML tests runned with chip-tool under examples/chip-tool/templates/tests.js

examples/chip-tool/templates/templates.json

@@ -7,7 +7,8 @@
         "../../../src/app/zap-templates/templates/app/helper.js",
         "../../../src/app/zap-templates/templates/chip/helper.js",
         "../../../src/app/zap-templates/common/ClusterTestGeneration.js",
-        "helper.js"
+        "helper.js",
+        "tests.js"
     ],
     "override": "../../../src/app/zap-templates/common/override.js",
     "partials": [

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

@@ -4,4 +4,4 @@
 
 #include <commands/tests/TestCommand.h>
 
-{{>test_cluster tests="TV_TargetNavigatorCluster, TV_AudioOutputCluster, TV_ApplicationLauncherCluster, TV_KeypadInputCluster, TV_AccountLoginCluster, TV_WakeOnLanCluster, TV_ApplicationBasicCluster, TV_MediaPlaybackCluster, TV_TvChannelCluster, TV_LowPowerCluster, TV_MediaInputCluster, TestCluster, TestClusterComplexTypes, TestConstraints, TestDelayCommands, TestDescriptorCluster, TestSubscribe_OnOff, Test_TC_OO_1_1, Test_TC_OO_2_1, Test_TC_OO_2_2, Test_TC_DM_1_1, Test_TC_DM_3_1, Test_TC_WNCV_1_1, Test_TC_WNCV_2_1, Test_TC_WNCV_3_1, Test_TC_WNCV_3_2, Test_TC_WNCV_3_3, Test_TC_BI_1_1, Test_TC_FLW_1_1, Test_TC_TM_1_1, Test_TC_OCC_1_1, TestOperationalCredentialsCluster, Test_TC_LVL_1_1, Test_TC_LVL_2_1, Test_TC_LVL_3_1, Test_TC_CC_1_1, Test_TC_RH_1_1, Test_TC_MC_1_1, Test_TC_TSTAT_1_1, Test_TC_PCC_1_1, Test_TC_TSUIC_1_1, Test_TC_DIAGTH_1_1, Test_TC_TM_2_1, Test_TC_TSUIC_2_1, Test_TC_PCC_2_1, Test_TC_CC_3_1, Test_TC_CC_3_2, Test_TC_CC_3_3, Test_TC_CC_4_1, Test_TC_CC_4_2, Test_TC_CC_4_3, Test_TC_CC_4_4, Test_TC_CC_5_1, Test_TC_CC_5_2, Test_TC_CC_5_3, Test_TC_CC_6_1, Test_TC_CC_6_2, Test_TC_CC_6_3, Test_TC_CC_7_1, Test_TC_CC_7_2, Test_TC_CC_7_3, Test_TC_CC_7_4, Test_TC_CC_8_1"}}
+{{>test_cluster tests=(getTests)}}

examples/chip-tool/templates/tests.js

@@ -0,0 +1,163 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+function getTests()
+{
+  const BinaryInput = [
+    'Test_TC_BI_1_1',
+  ];
+
+  const ColorControl = [
+    'Test_TC_CC_1_1',
+    'Test_TC_CC_3_1',
+    'Test_TC_CC_3_2',
+    'Test_TC_CC_3_3',
+    'Test_TC_CC_4_1',
+    'Test_TC_CC_4_2',
+    'Test_TC_CC_4_3',
+    'Test_TC_CC_4_4',
+    'Test_TC_CC_5_1',
+    'Test_TC_CC_5_2',
+    'Test_TC_CC_5_3',
+    'Test_TC_CC_6_1',
+    'Test_TC_CC_6_2',
+    'Test_TC_CC_6_3',
+    'Test_TC_CC_7_1',
+    'Test_TC_CC_7_2',
+    'Test_TC_CC_7_3',
+    'Test_TC_CC_7_4',
+    'Test_TC_CC_8_1',
+  ];
+
+  const DeviceManagement = [
+    'Test_TC_DM_1_1',
+    'Test_TC_DM_3_1',
+  ];
+
+  const FlowMeasurement = [
+    'Test_TC_FLW_1_1',
+  ];
+
+  const OccupancySensing = [
+    'Test_TC_OCC_1_1',
+  ];
+
+  const LevelControl = [
+    'Test_TC_LVL_1_1',
+    'Test_TC_LVL_2_1',
+    'Test_TC_LVL_3_1',
+  ];
+
+  const MediaControl = [
+    'Test_TC_MC_1_1',
+  ];
+
+  const OnOff = [
+    'Test_TC_OO_1_1',
+    'Test_TC_OO_2_1',
+    'Test_TC_OO_2_2',
+  ];
+
+  const PumpConfigurationControl = [
+    'Test_TC_PCC_1_1',
+    'Test_TC_PCC_2_1',
+  ];
+
+  const RelativeHumidityMeasurement = [
+    'Test_TC_RH_1_1',
+  ];
+
+  const TemperatureMeasurement = [
+    'Test_TC_TM_1_1',
+    'Test_TC_TM_2_1',
+  ];
+
+  const Thermostat = [
+    'Test_TC_TSTAT_1_1',
+  ];
+
+  const ThermostatUserConfiguration = [
+    'Test_TC_TSUIC_1_1',
+    'Test_TC_TSUIC_2_1',
+  ];
+
+  const ThreadNetworkDiagnostics = [
+    'Test_TC_DIAGTH_1_1',
+  ];
+
+  const WindowCovering = [
+    'Test_TC_WNCV_1_1',
+    'Test_TC_WNCV_2_1',
+    'Test_TC_WNCV_3_1',
+    'Test_TC_WNCV_3_2',
+    'Test_TC_WNCV_3_3',
+  ];
+
+  const TV = [
+    'TV_TargetNavigatorCluster',
+    'TV_AudioOutputCluster',
+    'TV_ApplicationLauncherCluster',
+    'TV_KeypadInputCluster',
+    'TV_AccountLoginCluster',
+    'TV_WakeOnLanCluster',
+    'TV_ApplicationBasicCluster',
+    'TV_MediaPlaybackCluster',
+    'TV_TvChannelCluster',
+    'TV_LowPowerCluster',
+    'TV_MediaInputCluster',
+  ];
+
+  const Others = [
+    'TestCluster',
+    'TestClusterComplexTypes',
+    'TestConstraints',
+    'TestDelayCommands',
+    'TestDescriptorCluster',
+    'TestOperationalCredentialsCluster',
+  ];
+
+  const Subscriptions = [
+    'TestSubscribe_OnOff',
+  ];
+
+  const tests = [
+    BinaryInput, //
+    ColorControl, //
+    DeviceManagement, //
+    FlowMeasurement, //
+    LevelControl, //
+    MediaControl, //
+    OccupancySensing, //
+    OnOff, //
+    PumpConfigurationControl, //
+    RelativeHumidityMeasurement, //
+    TemperatureMeasurement, //
+    Thermostat, //
+    ThermostatUserConfiguration, //
+    ThreadNetworkDiagnostics, //
+    WindowCovering, //
+    TV, //
+    Others, //
+    Subscriptions, //
+  ];
+  return tests.flat(1);
+}
+
+//
+// Module exports
+//
+exports.getTests = getTests;

src/app/zap-templates/common/ClusterTestGeneration.js

@@ -326,9 +326,10 @@ function assertCommandOrAttribute(context)
 //
 // Templates
 //
-function chip_tests(items, options)
+function chip_tests(list, options)
 {
-  const names = items.split(',').map(name => name.trim());
+  const items = Array.isArray(list) ? list : list.split(',');
+  const names = items.map(name => name.trim());
   const tests = names.map(item => parse(item));
   return templateUtil.collectBlocks(tests, options, this);
 }