Matter zap cleanup (project-chip#21713)

* Add the sdk.json for zap regeneration. * Rework the helper infrastructure to support aliases and categories. 0. Use the common helper aliases in the template json files. 1. Update templates.json with correct reference. 2. Update another template. 3. Add resources to the templates files, so that helpers can access the yaml stuff. 4. Fix wrong paths in templates.json * Use ZAP_PATH to run zap from other location than third_party/zap. * Convert the tests to JSON files. * Remove all the duplicated and unneeded js code. * Keep tests in sync with the changes on master. * Update zap submodule. * Add the updates from the mainline. * Restyled by whitespace * Restyled by prettier-json * Remove a manual test. Co-authored-by: Restyled.io <[email protected]>
isiu-apple · Sep 16, 2022 · 172d025 · 172d025
1 parent c5b66a1
commit 172d025
Show file tree

Hide file tree

Showing 55 changed files with 1,132 additions and 6,831 deletions.
diff --git a/examples/chip-tool/templates/helper.js b/examples/chip-tool/templates/helper.js
diff --git a/examples/chip-tool/templates/templates.json b/examples/chip-tool/templates/templates.json
@@ -2,11 +2,11 @@
     "name": "CHIP Tool templates",
     "version": "chip-v1",
     "helpers": [
-        "../../../src/app/zap-templates/partials/helper.js",
-        "../../../src/app/zap-templates/common/StringHelper.js",
-        "../../../src/app/zap-templates/templates/app/helper.js",
-        "../../../src/app/zap-templates/templates/chip/helper.js",
-        "helper.js"
+        "partials/helper.js",
+        "common/StringHelper.js",
+        "templates/app/helper.js",
+        "templates/chip/helper.js",
+        "chip-tool/templates/helper.js"
     ],
     "override": "../../../src/app/zap-templates/common/override.js",
     "partials": [

diff --git a/examples/chip-tool/templates/tests/commands.zapt b/examples/chip-tool/templates/tests/commands.zapt
@@ -17,7 +17,7 @@ public:
     TestList() : Command("list") {};
     CHIP_ERROR Run() override
     {
-        {{#chip_tests (getTests)}}printf("{{filename}}\n");{{/chip_tests}}
+        {{#chip_tests "../../../../src/app/tests/suites/ciTests.json"}}printf("{{filename}}\n");{{/chip_tests}}
 
         return CHIP_NO_ERROR;
     }
@@ -29,14 +29,14 @@ public:
     ManualTestList() : Command("list-manual") {};
     CHIP_ERROR Run() override
     {
-        {{#chip_tests (getManualTests)}}printf("{{filename}}\n");{{/chip_tests}}
+        {{#chip_tests "../../../../src/app/tests/suites/manualTests.json"}}printf("{{filename}}\n");{{/chip_tests}}
 
         return CHIP_NO_ERROR;
     }
 };
 
-{{>test_cluster tests=(getTests) credsIssuerConfigArg=true needsWaitDuration=true}}
-{{>test_cluster tests=(getManualTests) credsIssuerConfigArg=true needsWaitDuration=true}}
+{{>test_cluster tests="../../../../src/app/tests/suites/ciTests.json" credsIssuerConfigArg=true needsWaitDuration=true}}
+{{>test_cluster tests="../../../../src/app/tests/suites/manualTests.json" credsIssuerConfigArg=true needsWaitDuration=true}}
 
 #endif // CONFIG_ENABLE_YAML_TESTS
 
@@ -48,10 +48,10 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
 #if CONFIG_ENABLE_YAML_TESTS
         make_unique<TestList>(),
         make_unique<ManualTestList>(),
-      {{#chip_tests (getTests)}}
+      {{#chip_tests "../../../../src/app/tests/suites/ciTests.json"}}
         make_unique<{{filename}}Suite>(credsIssuerConfig),
       {{/chip_tests}}
-      {{#chip_tests (getManualTests)}}
+      {{#chip_tests "../../../../src/app/tests/suites/manualTests.json"}}
         make_unique<{{filename}}Suite>(credsIssuerConfig),
       {{/chip_tests}}
 #endif // CONFIG_ENABLE_YAML_TESTS

diff --git a/examples/chip-tool/templates/tests/helper.js b/examples/chip-tool/templates/tests/helper.js
diff --git a/examples/chip-tool/templates/tests/templates.json b/examples/chip-tool/templates/tests/templates.json
@@ -2,15 +2,19 @@
     "name": "CHIP Tool Tests templates",
     "version": "chip-v1",
     "helpers": [
-        "../../../../src/app/zap-templates/partials/helper.js",
-        "../../../../src/app/zap-templates/common/StringHelper.js",
-        "../../../../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"
+        "partials/helper.js",
+        "common/StringHelper.js",
+        "templates/app/helper.js",
+        "templates/chip/helper.js",
+        "common/ClusterTestGeneration.js",
+        "chip-tool/templates/helper.js",
+        "chip-tool/templates/tests/helper.js"
     ],
+    "resources": {
+        "pics-metafile": "../../../../src/app/tests/suites/certification/PICS.yaml",
+        "certification-metadir": "../../../../src/app/tests/suites/certification",
+        "test-metadir": "../../../../src/app/tests/suites"
+    },
     "override": "../../../../src/app/zap-templates/common/override.js",
     "partials": [
         {

diff --git a/examples/chip-tool/templates/tests/tests.js b/examples/chip-tool/templates/tests/tests.js