Add tests for float/double attributes.

project-chip · Dec 1, 2021 · 79e3a9e · 79e3a9e
1 parent f81c357
commit 79e3a9e
Show file tree

Hide file tree

Showing 6 changed files with 5,551 additions and 3,240 deletions.
diff --git a/examples/chip-tool/templates/tests-commands.zapt b/examples/chip-tool/templates/tests-commands.zapt
@@ -4,6 +4,7 @@
 
 #include <commands/tests/TestCommand.h>
 #include <commands/common/CommandInvoker.h>
+#include <math.h> // For INFINITY
 
 class TestList : public Command
 {

diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
@@ -526,6 +526,118 @@ tests:
       response:
           value: 0
 
+    # Tests for float attribute
+
+    - label: "Read attribute SINGLE Default Value"
+      command: "readAttribute"
+      attribute: "float_single"
+      response:
+          value: 0
+
+    - label: "Write attribute SINGLE medium Value"
+      command: "writeAttribute"
+      attribute: "float_single"
+      arguments:
+          value: 0.1
+
+    - label: "Read attribute SINGLE medium Value"
+      command: "readAttribute"
+      attribute: "float_single"
+      response:
+          value: 0.1
+
+    - label: "Write attribute SINGLE large Value"
+      command: "writeAttribute"
+      attribute: "float_single"
+      arguments:
+          value: 1.7e10
+
+    - label: "Read attribute SINGLE large Value"
+      command: "readAttribute"
+      attribute: "float_single"
+      response:
+          value: 1.7e10
+
+    - label: "Write attribute SINGLE small Value"
+      command: "writeAttribute"
+      attribute: "float_single"
+      arguments:
+          value: 1.7e-10
+
+    - label: "Read attribute SINGLE small Value"
+      command: "readAttribute"
+      attribute: "float_single"
+      response:
+          value: 1.7e-10
+
+    - label: "Write attribute SINGLE Default Value"
+      command: "writeAttribute"
+      attribute: "float_single"
+      arguments:
+          value: 0
+
+    - label: "Read attribute SINGLE Default Value"
+      command: "readAttribute"
+      attribute: "float_single"
+      response:
+          value: 0
+
+    # Tests for double attribute
+
+    - label: "Read attribute DOUBLE Default Value"
+      command: "readAttribute"
+      attribute: "float_double"
+      response:
+          value: 0
+
+    - label: "Write attribute DOUBLE medium Value"
+      command: "writeAttribute"
+      attribute: "float_double"
+      arguments:
+          value: 0.1234567890123
+
+    - label: "Read attribute DOUBLE medium Value"
+      command: "readAttribute"
+      attribute: "float_double"
+      response:
+          value: 0.1234567890123
+
+    - label: "Write attribute DOUBLE large Value"
+      command: "writeAttribute"
+      attribute: "float_double"
+      arguments:
+          value: 1.7e200
+
+    - label: "Read attribute DOUBLE large Value"
+      command: "readAttribute"
+      attribute: "float_double"
+      response:
+          value: 1.7e200
+
+    - label: "Write attribute DOUBLE small Value"
+      command: "writeAttribute"
+      attribute: "float_double"
+      arguments:
+          value: 1.7e-200
+
+    - label: "Read attribute DOUBLE small Value"
+      command: "readAttribute"
+      attribute: "float_double"
+      response:
+          value: 1.7e-200
+
+    - label: "Write attribute DOUBLE Default Value"
+      command: "writeAttribute"
+      attribute: "float_double"
+      arguments:
+          value: 0
+
+    - label: "Read attribute DOUBLE Default Value"
+      command: "readAttribute"
+      attribute: "float_double"
+      response:
+          value: 0
+
     # Tests for Enum8 attribute
 
     - label: "Read attribute ENUM8 Default Value"
@@ -1941,6 +2053,130 @@ tests:
       response:
           value: null
 
+    # Tests for float attribute
+
+    - label: "Write attribute NULLABLE_SINGLE medium Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_single"
+      arguments:
+          value: 0.1
+
+    - label: "Read attribute NULLABLE_SINGLE medium Value"
+      command: "readAttribute"
+      attribute: "nullable_float_single"
+      response:
+          value: 0.1
+
+    - label: "Write attribute NULLABLE_SINGLE largest Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_single"
+      arguments:
+          value: Infinity
+
+    - label: "Read attribute NULLABLE_SINGLE largest Value"
+      command: "readAttribute"
+      attribute: "nullable_float_single"
+      response:
+          value: Infinity
+
+    - label: "Write attribute NULLABLE_SINGLE smallest Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_single"
+      arguments:
+          value: -Infinity
+
+    - label: "Read attribute NULLABLE_SINGLE smallest Value"
+      command: "readAttribute"
+      attribute: "nullable_float_single"
+      response:
+          value: -Infinity
+
+    - label: "Write attribute NULLABLE_SINGLE null Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_single"
+      arguments:
+          value: null
+
+    - label: "Read attribute NULLABLE_SINGLE null Value"
+      command: "readAttribute"
+      attribute: "nullable_float_single"
+      response:
+          value: null
+
+    - label: "Write attribute NULLABLE_SINGLE 0 Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_single"
+      arguments:
+          value: 0
+
+    - label: "Read attribute NULLABLE_SINGLE 0 Value"
+      command: "readAttribute"
+      attribute: "nullable_float_single"
+      response:
+          value: 0
+
+    # Tests for double attribute
+
+    - label: "Write attribute NULLABLE_DOUBLE medium Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_double"
+      arguments:
+          value: 0.1234567890123
+
+    - label: "Read attribute NULLABLE_DOUBLE medium Value"
+      command: "readAttribute"
+      attribute: "nullable_float_double"
+      response:
+          value: 0.1234567890123
+
+    - label: "Write attribute NULLABLE_DOUBLE largest Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_double"
+      arguments:
+          value: Infinity
+
+    - label: "Read attribute NULLABLE_DOUBLE largest Value"
+      command: "readAttribute"
+      attribute: "nullable_float_double"
+      response:
+          value: Infinity
+
+    - label: "Write attribute NULLABLE_DOUBLE smallest Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_double"
+      arguments:
+          value: -Infinity
+
+    - label: "Read attribute NULLABLE_DOUBLE smallest Value"
+      command: "readAttribute"
+      attribute: "nullable_float_double"
+      response:
+          value: -Infinity
+
+    - label: "Write attribute NULLABLE_DOUBLE null Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_double"
+      arguments:
+          value: null
+
+    - label: "Read attribute NULLABLE_DOUBLE null Value"
+      command: "readAttribute"
+      attribute: "nullable_float_double"
+      response:
+          value: null
+
+    - label: "Write attribute NULLABLE_DOUBLE 0 Value"
+      command: "writeAttribute"
+      attribute: "nullable_float_double"
+      arguments:
+          value: 0
+
+    - label: "Read attribute NULLABLE_DOUBLE 0 Value"
+      command: "readAttribute"
+      attribute: "nullable_float_double"
+      response:
+          value: 0
+
     # Tests for Enum8 attribute
 
     - label: "Write attribute NULLABLE_ENUM8 Max Value"

diff --git a/src/app/zap-templates/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js
@@ -283,13 +283,26 @@ function asTypedLiteral(value, type)
       case 'uint64_t':
         return value + (valueIsANumber ? 'ULL' : '');
       case 'float':
-        if (!valueIsANumber || value == 0) {
-          // "0f" is not a valid value, so don't output that; just leave it
-          // as "0".
+        if (!valueIsANumber) {
           return value;
         }
+        if (value == Infinity || value == -Infinity) {
+          return `${(value < 0) ? '-' : ''}INFINITY`
+        }
+        // If the number looks like an integer, append ".0" to the end;
+        // otherwise adding an "f" suffix makes compilers complain.
+        value = value.toString();
+        if (value.match(/^[0-9]+$/)) {
+          value = value + ".0";
+        }
         return value + 'f';
       default:
+        if (!valueIsANumber) {
+          return value;
+        }
+        if (value == Infinity || value == -Infinity) {
+          return `${(value < 0) ? '-' : ''}INFINITY`
+        }
         return value;
       }
     })

diff --git a/src/darwin/Framework/CHIP/templates/clusters-tests.zapt b/src/darwin/Framework/CHIP/templates/clusters-tests.zapt
@@ -11,6 +11,8 @@
 
 #import <app/util/af-enums.h>
 
+#import <math.h> // For INFINITY
+
 // system dependencies
 #import <XCTest/XCTest.h>