YAML : Constraints with nullable types fixed for Min, Max & NotValue (#…

…12958) * Fix: Constraintswith nullable type fixed for Min Max NotValue * Restyled by clang-format * DEV: Add constraint checks on nullable * DEV: Update darwin test_cluster.zapt * Restyled by prettier-yaml * Darwin compile remove large integer u64x tests Co-authored-by: Restyled.io <commits@restyled.io>
project-chip · Dec 17, 2021 · 1070648 · 1070648
1 parent 34a46d6
commit 1070648
Show file tree

Hide file tree

Showing 6 changed files with 4,394 additions and 2,021 deletions.
diff --git a/examples/chip-tool/commands/tests/TestCommand.h b/examples/chip-tool/commands/tests/TestCommand.h
@@ -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)
  {
@@ -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)
@@ -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)
  {

diff --git a/examples/chip-tool/templates/partials/test_cluster.zapt b/examples/chip-tool/templates/partials/test_cluster.zapt
@@ -318,8 +318,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}}