Support notValue constraints on enums. (#17070)

Fixes #16995
project-chip · Apr 6, 2022 · 6811e34 · 6811e34
1 parent 60adc7e
commit 6811e34
Show file tree

Hide file tree

Showing 5 changed files with 822 additions and 635 deletions.
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml
@@ -50,7 +50,6 @@ tests:
           error: UNSUPPORTED_WRITE
 
     - label: "3b: reads back the RO mandatory attribute: Type"
-      disabled: true
       command: "readAttribute"
       attribute: "Type"
       response:
@@ -130,7 +129,6 @@ tests:
           error: UNSUPPORTED_WRITE
 
     - label: "3b: reads back the RO mandatory attribute: EndProductType"
-      disabled: true
       command: "readAttribute"
       attribute: "EndProductType"
       response:

diff --git a/src/app/tests/suites/include/ConstraintsChecker.h b/src/app/tests/suites/include/ConstraintsChecker.h
@@ -245,7 +245,7 @@ class ConstraintsChecker
         return CheckConstraintMaxValue(itemName, current.Value(), static_cast<T>(expected));
     }
 
-    template <typename T, typename U>
+    template <typename T, typename U, std::enable_if_t<!std::is_enum<T>::value, int> = 0>
     bool CheckConstraintNotValue(const char * itemName, T current, U expected)
     {
         if (current == expected)
@@ -257,6 +257,12 @@ class ConstraintsChecker
         return true;
     }
 
+    template <typename T, typename U, std::enable_if_t<std::is_enum<T>::value, int> = 0>
+    bool CheckConstraintNotValue(const char * itemName, T current, U expected)
+    {
+        return CheckConstraintNotValue(itemName, chip::to_underlying(current), expected);
+    }
+
     template <typename T>
     bool CheckConstraintNotValue(const char * itemName, chip::BitFlags<T> current, chip::BitFlags<T> expected)
     {