[YAML] Add startsWith/endsWith constraints (#12286)

* [YAML] Add startsWith/endsWith constraints * Update generated test content
project-chip · Jul 20, 2022 · 1550006 · 1550006
1 parent e068d00
commit 1550006
Show file tree

Hide file tree

Showing 7 changed files with 412 additions and 2 deletions.
diff --git a/examples/chip-tool/commands/tests/TestCommand.cpp b/examples/chip-tool/commands/tests/TestCommand.cpp
@@ -92,6 +92,30 @@ bool TestCommand::CheckConstraintFormat(const char * itemName, const char * curr
     return true;
 }
 
+bool TestCommand::CheckConstraintStartsWith(const char * itemName, const chip::Span<const char> current, const char * expected)
+{
+    std::string value(current.data(), current.size());
+    if (value.rfind(expected, 0) != 0)
+    {
+        Exit(std::string(itemName) + " (\"" + value + "\") does not starts with: \"" + std::string(expected) + "\"");
+        return false;
+    }
+
+    return true;
+}
+
+bool TestCommand::CheckConstraintEndsWith(const char * itemName, const chip::Span<const char> current, const char * expected)
+{
+    std::string value(current.data(), current.size());
+    if (value.find(expected, value.size() - strlen(expected)) == std::string::npos)
+    {
+        Exit(std::string(itemName) + " (\"" + value + "\") does not ends with: \"" + std::string(expected) + "\"");
+        return false;
+    }
+
+    return true;
+}
+
 bool TestCommand::CheckConstraintMinLength(const char * itemName, uint64_t current, uint64_t expected)
 {
     if (current < expected)

diff --git a/examples/chip-tool/commands/tests/TestCommand.h b/examples/chip-tool/commands/tests/TestCommand.h
@@ -70,6 +70,8 @@ class TestCommand : public CHIPCommand
     bool CheckConstraintFormat(const char * itemName, const char * current, const char * expected);
     bool CheckConstraintMinLength(const char * itemName, uint64_t current, uint64_t expected);
     bool CheckConstraintMaxLength(const char * itemName, uint64_t current, uint64_t expected);
+    bool CheckConstraintStartsWith(const char * itemName, const chip::Span<const char> current, const char * expected);
+    bool CheckConstraintEndsWith(const char * itemName, const chip::Span<const char> current, const char * expected);
     template <typename T>
     bool CheckConstraintMinValue(const char * itemName, T current, T expected)
     {

diff --git a/examples/chip-tool/templates/partials/test_cluster.zapt b/examples/chip-tool/templates/partials/test_cluster.zapt
@@ -258,6 +258,8 @@ class {{filename}}: public TestCommand
               {{/if}}
               {{#if expectedConstraints.type}}VerifyOrReturn(CheckConstraintType("{{>item}}", "", "{{expectedConstraints.type}}"));{{/if}}
               {{~#if expectedConstraints.format}}VerifyOrReturn(CheckConstraintFormat("{{>item}}", "", "{{expectedConstraints.format}}"));{{/if}}
+              {{~#if expectedConstraints.startsWith}}VerifyOrReturn(CheckConstraintStartsWith("{{>item}}", {{>item}}, "{{expectedConstraints.startsWith}}"));{{/if}}
+              {{~#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}}

diff --git a/src/app/tests/suites/TestConstraints.yaml b/src/app/tests/suites/TestConstraints.yaml
@@ -19,7 +19,7 @@ config:
     endpoint: 1
 
 tests:
-    # Tests for UInt32 attribute
+    # Tests for INT32U attribute
 
     - label: "Write attribute INT32U Value"
       command: "writeAttribute"
@@ -53,3 +53,45 @@ tests:
       attribute: "int32u"
       arguments:
           value: 0
+
+    # Tests for CHAR_STRING attribute
+
+    - label: "Write attribute CHAR_STRING Value"
+      command: "writeAttribute"
+      attribute: "char_string"
+      arguments:
+          value: "** Test **"
+
+    - label: "Read attribute CHAR_STRING Value MinLength Constraints"
+      command: "readAttribute"
+      attribute: "char_string"
+      response:
+          constraints:
+              minLength: 5
+
+    - label: "Read attribute CHAR_STRING Value MaxLength Constraints"
+      command: "readAttribute"
+      attribute: "char_string"
+      response:
+          constraints:
+              maxLength: 20
+
+    - label: "Read attribute CHAR_STRING Value StartsWith Constraints"
+      command: "readAttribute"
+      attribute: "char_string"
+      response:
+          constraints:
+              startsWith: "**"
+
+    - label: "Read attribute CHAR_STRING Value EndsWith Constraints"
+      command: "readAttribute"
+      attribute: "char_string"
+      response:
+          constraints:
+              endsWith: "**"
+
+    - label: "Write attribute CHAR_STRING Value Back to Default Value"
+      command: "writeAttribute"
+      attribute: "char_string"
+      arguments:
+          value: ""
diff --git a/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt b/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt
@@ -106,6 +106,18 @@ bool testSendCluster{{parent.filename}}_{{asTestIndex index}}_{{asUpperCamelCase
           XCTAssertGreaterThanOrEqual([actualValue length], {{expectedConstraints.minLength}});
         }
         {{/if}}
+        {{#if expectedConstraints.startsWith}}
+        {
+          {{> actualValue}}
+          XCTAssertTrue([actualValue hasPrefix:@"{{expectedConstraints.startsWith}}"]);
+        }
+        {{/if}}
+        {{#if expectedConstraints.endsWith}}
+        {
+          {{> actualValue}}
+          XCTAssertTrue([actualValue hasSuffix:@"{{expectedConstraints.endsWith}}"]);
+        }
+        {{/if}}
         {{#if expectedConstraints.maxLength}}
         {
           {{> actualValue}}

diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m