Added a CheckConstraint Min and Max function where the expected is a …

…Nullable type (#27045) * Added a CheckConstraint Min and Max function where the expected is a Nullable type * Reversed the null check as it was wrong way around. Fixed new parameter to reference and const * Fixed return parameters Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Fixed return parameters Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Removed enable_if_t from new template functions --------- Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
project-chip · Nov 29, 2023 · 174ca71 · 174ca71
1 parent be3d09a
commit 174ca71
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/src/app/tests/suites/include/ConstraintsChecker.h b/src/app/tests/suites/include/ConstraintsChecker.h
@@ -299,6 +299,17 @@ class ConstraintsChecker
  return CheckConstraintMinValue(itemName, current.Value(), static_cast<T>(expected));
  }
 
+ template <typename T, typename U>
+ bool CheckConstraintMinValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current,
+ const chip::app::DataModel::Nullable<U> & expected)
+ {
+ if (expected.IsNull())
+ {
+ return true;
+ }
+ return CheckConstraintMinValue(itemName, current, expected.Value());
+ }
+
  template <typename T, typename U>
  bool CheckConstraintMinValue(const char * itemName, const T & current, const chip::Optional<U> & expected)
  {
@@ -375,6 +386,17 @@ class ConstraintsChecker
  return CheckConstraintMaxValue(itemName, current.Value(), static_cast<T>(expected));
  }
 
+ template <typename T, typename U>
+ bool CheckConstraintMaxValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current,
+ const chip::app::DataModel::Nullable<U> & expected)
+ {
+ if (expected.IsNull())
+ {
+ return true;
+ }
+ return CheckConstraintMaxValue(itemName, current, expected.Value());
+ }
+
  template <typename T, typename U>
  bool CheckConstraintMaxValue(const char * itemName, const T & current, const chip::Optional<U> & expected)
  {