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

Restyle YAML : Constraints with nullable types fixed for Min, Max & NotValue #12959

Closed
wants to merge 2 commits into from
Closed

Restyle YAML : Constraints with nullable types fixed for Min, Max & NotValue #12959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84eccba
Fix: Constraintswith nullable type fixed for Min Max NotValue
jmeg-sfy Dec 13, 2021
384dc3f
Restyled by clang-format
restyled-commits Dec 13, 2021
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
27 changes: 27 additions & 0 deletions examples/chip-tool/commands/tests/TestCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@ class TestCommand : public CHIPCommand

return true;
}
template <typename T, typename U>
bool CheckConstraintMinValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current, U expected)
{
if (current.IsNull())
{
return true;
}
return CheckConstraintMinValue(itemName, current.Value(), static_cast<T>(expected));
}
template <typename T>
bool CheckConstraintMaxValue(const char * itemName, T current, T expected)
{
Expand All @@ -104,6 +113,15 @@ class TestCommand : public CHIPCommand
return true;
}
template <typename T, typename U>
bool CheckConstraintMaxValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current, U expected)
{
if (current.IsNull())
{
return true;
}
return CheckConstraintMaxValue(itemName, current.Value(), static_cast<T>(expected));
}
template <typename T, typename U>
bool CheckConstraintNotValue(const char * itemName, T current, U expected)
{
if (current == expected)
Expand All @@ -114,6 +132,15 @@ class TestCommand : public CHIPCommand

return true;
}
template <typename T, typename U>
bool CheckConstraintNotValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current, U expected)
{
if (current.IsNull())
{
return true;
}
return CheckConstraintNotValue(itemName, current.Value(), expected);
}

bool CheckConstraintNotValue(const char * itemName, chip::CharSpan current, chip::CharSpan expected)
{
Expand Down
4 changes: 2 additions & 2 deletions examples/chip-tool/templates/partials/test_cluster.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ class {{filename}}: public TestCommand
{{~#if expectedConstraints.endsWith}}VerifyOrReturn(CheckConstraintEndsWith("{{>item}}", {{>item}}, "{{expectedConstraints.endsWith}}"));{{/if}}
{{~#if expectedConstraints.minLength}}VerifyOrReturn(CheckConstraintMinLength("{{>item}}", {{>item}}.size(), {{expectedConstraints.minLength}}));{{/if}}
{{~#if expectedConstraints.maxLength}}VerifyOrReturn(CheckConstraintMaxLength("{{>item}}", {{>item}}.size(), {{expectedConstraints.maxLength}}));{{/if}}
{{~#if expectedConstraints.minValue}}VerifyOrReturn(CheckConstraintMinValue<{{chipType}}>("{{>item}}", {{>item}}, {{expectedConstraints.minValue}}));{{/if}}
{{~#if expectedConstraints.maxValue}}VerifyOrReturn(CheckConstraintMaxValue<{{chipType}}>("{{>item}}", {{>item}}, {{expectedConstraints.maxValue}}));{{/if}}
{{~#if expectedConstraints.minValue}}VerifyOrReturn(CheckConstraintMinValue<{{chipType}}>("{{>item}}", {{>item}}, {{asTypedLiteral expectedConstraints.minValue type}}));{{/if}}
{{~#if expectedConstraints.maxValue}}VerifyOrReturn(CheckConstraintMaxValue<{{chipType}}>("{{>item}}", {{>item}}, {{asTypedLiteral expectedConstraints.maxValue type}}));{{/if}}
{{~#if expectedConstraints.notValue}}VerifyOrReturn(CheckConstraintNotValue("{{>item}}", {{>item}}, {{asTypedLiteral expectedConstraints.notValue type}}));{{/if}}
{{/if}}

Expand Down
Loading