Reordering of struct EmberAfAttributeMetadata members (#878)

milanr-q · web-flow · commit 9e7cabbc6b7c · 2023-01-09T17:00:41.000-05:00
* Reordering of struct EmberAfAttributeMetadata members

* Test updated
diff --git a/src-electron/generator/helper-endpointconfig.js b/src-electron/generator/helper-endpointconfig.js
@@ -288,7 +288,7 @@ function endpoint_attribute_list(options) {
       }
       finalDefaultValue = `ZAP_SIMPLE_DEFAULT(${defaultValue})`
     }
-    ret += `  { ${at.id}, ${at.type}, ${at.size}, ${mask}, ${finalDefaultValue} }, /* ${at.name} */  \\\n`
+    ret += `  { ${finalDefaultValue}, ${at.id}, ${at.size}, ${at.type}, ${mask} }, /* ${at.name} */  \\\n`
   })
   ret += '}\n'
 
diff --git a/test/endpoint-config.test.js b/test/endpoint-config.test.js
@@ -199,7 +199,7 @@ test(
       '{ ZAP_REPORT_DIRECTION(REPORTED), 0x0029, 0x00000101, 0x00000000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65534, 0 }} }, /* lock state */'
     )
     expect(epc).toContain(
-      '{ 0x00000004, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_LONG_DEFAULTS_INDEX(0) }'
+      '{ ZAP_LONG_DEFAULTS_INDEX(0), 0x00000004, 33, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(TOKENIZE) }'
     )
     expect(epc.includes(bin.hexToCBytes(bin.stringToHex('Very long user id'))))
     expect(epc).toContain('#define FIXED_NETWORKS { 1, 1, 2 }')

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ function endpoint_attribute_list(options) {`
`288`	`288`	`}`
`289`	`289`	finalDefaultValue = `ZAP_SIMPLE_DEFAULT(${defaultValue})`
`290`	`290`	`}`
`291`		- ret += ` { ${at.id}, ${at.type}, ${at.size}, ${mask}, ${finalDefaultValue} }, /* ${at.name} */ \\\n`
	`291`	+ ret += ` { ${finalDefaultValue}, ${at.id}, ${at.size}, ${at.type}, ${mask} }, /* ${at.name} */ \\\n`
`292`	`292`	`})`
`293`	`293`	`ret += '}\n'`
`294`	`294`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ test(`
`199`	`199`	`'{ ZAP_REPORT_DIRECTION(REPORTED), 0x0029, 0x00000101, 0x00000000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65534, 0 }} }, /* lock state */'`
`200`	`200`	`)`
`201`	`201`	`expect(epc).toContain(`
`202`		`- '{ 0x00000004, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_LONG_DEFAULTS_INDEX(0) }'`
	`202`	`+ '{ ZAP_LONG_DEFAULTS_INDEX(0), 0x00000004, 33, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(TOKENIZE) }'`
`203`	`203`	`)`
`204`	`204`	`expect(epc.includes(bin.hexToCBytes(bin.stringToHex('Very long user id'))))`
`205`	`205`	`expect(epc).toContain('#define FIXED_NETWORKS { 1, 1, 2 }')`