Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Matter zap cleanup #21713

Merged
merged 11 commits into from
Aug 16, 2022
Merged

Matter zap cleanup #21713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
03552c1
Add the sdk.json for zap regeneration.
tecimovic Jul 19, 2022
3d37dc1
Rework the helper infrastructure to support aliases and categories.
tecimovic Jul 29, 2022
6860575
Use ZAP_PATH to run zap from other location than third_party/zap.
tecimovic Aug 5, 2022
86b46a5
Convert the tests to JSON files.
tecimovic Aug 6, 2022
9dbe3c3
Remove all the duplicated and unneeded js code.
tecimovic Aug 7, 2022
a7ecd72
Keep tests in sync with the changes on master.
tecimovic Aug 9, 2022
f9ae43d
Update zap submodule.
tecimovic Aug 12, 2022
cc573af
Add the updates from the mainline.
tecimovic Aug 13, 2022
5acb6f4
Restyled by whitespace
restyled-commits Aug 13, 2022
42356ae
Restyled by prettier-json
restyled-commits Aug 13, 2022
1c93a9b
Remove a manual test.
tecimovic Aug 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 0 additions & 153 deletions examples/chip-tool/templates/helper.js
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions examples/chip-tool/templates/templates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
12 changes: 6 additions & 6 deletions examples/chip-tool/templates/tests/commands.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
krypton36 marked this conversation as resolved.
Show resolved Hide resolved

return CHIP_NO_ERROR;
}
Expand All @@ -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

Expand All @@ -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"}}
tecimovic marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
109 changes: 0 additions & 109 deletions examples/chip-tool/templates/tests/helper.js
View file
Open in desktop

This file was deleted.

20 changes: 12 additions & 8 deletions examples/chip-tool/templates/tests/templates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
35 changes: 0 additions & 35 deletions examples/chip-tool/templates/tests/tests.js
View file
Open in desktop

This file was deleted.

Loading