[YAML - Darwin] Generate saveAs code not only when the 'value' keywor…

…d is used (#14322)
project-chip · Jan 26, 2022 · d123146 · d123146
1 parent 2802ba5
commit d123146
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 11 deletions.
diff --git a/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt b/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt
@@ -102,15 +102,6 @@ ResponseHandler {{> subscribeDataCallback}} = nil;
         {
           {{> actualValue}}
           {{>check_test_value actual="actualValue" expected=expectedValue cluster=../cluster}}
-          {{#if saveAs}}
-          {{#if (isOctetString type)}}
-          {{saveAs}} = [NSMutableData dataWithData:actualValue];
-          {{else if (isCharString type)}}
-          {{saveAs}} = [NSMutableString stringWithString:actualValue];
-          {{else}}
-          {{saveAs}} = [actualValue {{asObjectiveCNumberType "" type true}}Value];
-          {{/if}}
-          {{/if}}
         }
         {{/if}}
         {{#if hasExpectedConstraints}}
@@ -193,6 +184,18 @@ ResponseHandler {{> subscribeDataCallback}} = nil;
         }
         {{/if}}
         {{/if}}
+        {{#if saveAs}}
+        {
+          {{> actualValue}}
+          {{#if (isOctetString type)}}
+        {{saveAs}} = [NSMutableData dataWithData:actualValue];
+          {{else if (isCharString type)}}
+        {{saveAs}} = [NSMutableString stringWithString:actualValue];
+          {{else}}
+        {{saveAs}} = [actualValue {{asObjectiveCNumberType "" type true}}Value];
+          {{/if}}
+        }
+        {{/if}}
         {{/chip_tests_item_response_parameters}}
 
         {{#unless async}}

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