[matter_yamltests] Reproduce the c++ behavior for hasMasksSet

project-chip · Jun 14, 2023 · 10c261c · 10c261c
1 parent 8d2516a
commit 10c261c
Show file tree

Hide file tree

Showing 4 changed files with 320 additions and 220 deletions.
diff --git a/scripts/py_matter_yamltests/matter_yamltests/constraints.py b/scripts/py_matter_yamltests/matter_yamltests/constraints.py
@@ -728,7 +728,7 @@ def __init__(self, context, has_masks_set):
         self._has_masks_set = has_masks_set
 
     def check_response(self, value, value_type_name) -> bool:
-        return all([(value & mask) == mask for mask in self._has_masks_set])
+        return all([(value & mask) for mask in self._has_masks_set])
 
     def get_reason(self, value, value_type_name) -> str:
         expected_masks = []

diff --git a/src/app/tests/suites/TestConstraints.yaml b/src/app/tests/suites/TestConstraints.yaml
@@ -112,6 +112,22 @@ tests:
           constraints:
               hasMasksSet: [0x01, 0x04] # [MaskVal1, MaskVal3]
 
+    - label: "Write attribute BITMAP32 with MaskVal1"
+      command: "writeAttribute"
+      attribute: "bitmap32"
+      arguments:
+          value: 1 # MaskVal1
+
+    - label:
+          "Read attribute BITMAP32 with MaskVal1 and ensure Maskval1 or MaskVal3
+          are set"
+      command: "readAttribute"
+      attribute: "bitmap32"
+      response:
+          value: 1 # MaskVal1
+          constraints:
+              hasMasksSet: [0x05] # [MaskVal1, MaskVal3]
+
     - label: "Write attribute BITMAP32 Back to Default Value"
       command: "writeAttribute"
       attribute: "bitmap32"