[YAML] Add saveAs keyword for response fields and command arguments (#…

…11798) * Add src/app/tests/suites/TestSaveAs.yaml * [YAML] Add saveAs keyword for response fields and command arguments * Add saveAs keyword support for objective C * Reset TestCluster INT32U to default at the end of TestConstraints.yaml * Update generated content
project-chip · May 25, 2022 · e0a30eb · e0a30eb
1 parent e966e4c
commit e0a30eb
Show file tree

Hide file tree

Showing 17 changed files with 6,789 additions and 166 deletions.
diff --git a/examples/chip-tool/commands/tests/TestCommand.h b/examples/chip-tool/commands/tests/TestCommand.h
@@ -96,7 +96,14 @@ class TestCommand : public CHIPCommand
     {
         if (current == expected)
         {
-            Exit(std::string(itemName) + " value == notValue: " + std::to_string(current) + " == " + std::to_string(expected));
+            if (std::is_same<T, const chip::Span<const uint8_t>>::value || std::is_same<T, const chip::Span<const char>>::value)
+            {
+                Exit(std::string(itemName) + " value == notValue");
+            }
+            else
+            {
+                Exit(std::string(itemName) + " value == notValue: " + std::to_string(current) + " == " + std::to_string(expected));
+            }
             return false;
         }
 

diff --git a/examples/chip-tool/templates/partials/test_cluster.zapt b/examples/chip-tool/templates/partials/test_cluster.zapt
@@ -49,6 +49,14 @@ class {{filename}}: public TestCommand
     std::atomic_uint16_t mTestIndex;
     const uint16_t mTestCount = {{totalTests}};
 
+    {{#chip_tests_items}}
+    {{#chip_tests_item_response_parameters}}
+    {{#if saveAs}}
+    {{chipType}} {{saveAs}};
+    {{/if}}
+    {{/chip_tests_item_response_parameters}}
+    {{/chip_tests_items}}
+
     {{#*inline "failureCallback"}}mOnFailureCallback_{{index}}{{/inline}}
     {{#*inline "successCallback"}}mOnSuccessCallback_{{index}}{{/inline}}
     {{#*inline "failureResponse"}}OnFailureCallback_{{index}}{{/inline}}
@@ -231,6 +239,10 @@ class {{filename}}: public TestCommand
               {{~#if expectedConstraints.maxValue}}VerifyOrReturn(CheckConstraintMaxValue<{{chipType}}>("{{>item}}", {{>item}}, {{expectedConstraints.maxValue}}));{{/if}}
               {{~#if expectedConstraints.notValue}}VerifyOrReturn(CheckConstraintNotValue<{{chipType}}>("{{>item}}", {{>item}}, {{expectedConstraints.notValue}}));{{/if}}
             {{/if}}
+
+            {{#if saveAs}}
+            {{saveAs}} = {{>item}};
+            {{/if}}
           {{/chip_tests_item_response_parameters}}
         {{#unless async}}NextTest();{{/unless}}
         {{/if}}

diff --git a/examples/chip-tool/templates/partials/test_cluster_command_value.zapt b/examples/chip-tool/templates/partials/test_cluster_command_value.zapt
@@ -39,7 +39,7 @@
       {{#if_is_bitmap type}}
       static_cast<{{zapTypeToEncodableClusterObjectType type ns=ns}}>({{definedValue}});
       {{else}}
-      {{definedValue}}{{asTypeLiteralSuffix type}};
+      {{asTypeLiteralSuffix definedValue type}};
       {{/if_is_bitmap}}
     {{/if_chip_enum}}
   {{/if_is_struct}}

diff --git a/examples/chip-tool/templates/partials/test_cluster_value_equals.zapt b/examples/chip-tool/templates/partials/test_cluster_value_equals.zapt
@@ -31,7 +31,7 @@
     VerifyOrReturn(CheckValue
       {{~#if (isOctetString type)}}AsString("{{label}}", {{actual}}, chip::ByteSpan(chip::Uint8::from_const_char("{{octetStringEscapedForCLiteral expected}}"), {{expected.length}}))
       {{else if (isCharString type)}}AsString("{{label}}", {{actual}}, chip::CharSpan("{{expected}}", {{expected.length}}))
-      {{else}}<{{chipType}}>("{{label}}", {{actual}}, {{expected}}{{asTypeLiteralSuffix type}})
+      {{else}}<{{chipType}}>("{{label}}", {{actual}}, {{asTypeLiteralSuffix expected type}})
       {{/if}}
     );
   {{/if_is_struct}}

diff --git a/examples/chip-tool/templates/tests.js b/examples/chip-tool/templates/tests.js
@@ -182,6 +182,7 @@ function getTests()
     'TestConstraints',
     'TestDelayCommands',
     'TestLogCommands',
+    'TestSaveAs',
     'TestDescriptorCluster',
     'TestBasicInformation',
     'TestIdentifyCluster',

diff --git a/src/app/tests/suites/TestConstraints.yaml b/src/app/tests/suites/TestConstraints.yaml
@@ -47,3 +47,9 @@ tests:
       response:
           constraints:
               notValue: 6
+
+    - label: "Write attribute INT32U Value Back to Default Value"
+      command: "writeAttribute"
+      attribute: "int32u"
+      arguments:
+          value: 0