Add support for null in the notValue constraint. (#13107)

Now (for a nullable value) you can write: notValue: null in the constraints in yaml and it will do what one expects.
project-chip · Feb 5, 2024 · 3a796a7 · 3a796a7
1 parent 1385ad8
commit 3a796a7
Show file tree

Hide file tree

Showing 5 changed files with 2,489 additions and 2,620 deletions.
diff --git a/examples/chip-tool/templates/partials/test_cluster.zapt b/examples/chip-tool/templates/partials/test_cluster.zapt
@@ -320,7 +320,11 @@ class {{filename}}: public TestCommand
               {{~#if expectedConstraints.maxLength}}VerifyOrReturn(CheckConstraintMaxLength("{{>item}}", {{>item}}.size(), {{expectedConstraints.maxLength}}));{{/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 expectedConstraints.notValue}}
+                VerifyOrReturn(CheckConstraintNotValue("{{>item}}", {{>item}}, {{asTypedLiteral expectedConstraints.notValue type}}));
+              {{else if (isLiteralNull expectedConstraints.notValue)}}
+                VerifyOrReturn(CheckValueNonNull("{{>item}}", {{>item}}));
+              {{/if}}
             {{/if}}
 
             {{#if saveAs}}

diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
@@ -1783,6 +1783,13 @@ tests:
       response:
           value: 254
 
+    - label: "Read attribute NULLABLE_INT8U unchanged Value with constraint"
+      command: "readAttribute"
+      attribute: "nullable_int8u"
+      response:
+          constraints:
+              notValue: null
+
     - label: "Write attribute NULLABLE_INT8U null Value"
       command: "writeAttribute"
       attribute: "nullable_int8u"

diff --git a/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt b/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt
@@ -155,6 +155,11 @@ ResponseHandler {{> subscribeDataCallback}} = nil;
             XCTAssertNotEqual([actualValue {{asObjectiveCNumberType "" type true}}Value], {{asTypedLiteral expectedConstraints.notValue type}});
           }
         }
+        {{else if (isLiteralNull expectedConstraints.notValue)}}
+        {
+          {{> actualValue}}
+          XCTAssertFalse(actualValue == nil);
+        }
         {{/if}}
         {{/if}}
         {{/chip_tests_item_response_parameters}}