From bc4f124d542678e379045f80c755943e0f7fa716 Mon Sep 17 00:00:00 2001
From: Noel Eck <noel.eck@intel.com>
Date: Wed, 1 Nov 2017 17:08:18 -0700
Subject: [PATCH] sensortemplate: Use SensorTemplate as class name in json

Replace TemplateItem with SensorTemplate in the sensortemplate.json and
json ctest.  Change to contributions.md which removes all objects
with a key starting with "//" from the generated sensor .json file.
This allows the json ctest to pass OOTB for new sensor libraries
generated from the make_new_sensor function.

Signed-off-by: Noel Eck <noel.eck@intel.com>
---
 docs/contributions.md                  | 2 ++
 src/sensortemplate/sensortemplate.json | 6 +++---
 tests/node/test.js                     | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/contributions.md b/docs/contributions.md
index 1a2ff8f1..e5122365 100644
--- a/docs/contributions.md
+++ b/docs/contributions.md
@@ -125,6 +125,8 @@ function make_new_sensor {
     # Search/replace the new files, replacing all instances of sensortemplate
     perl -p -i -e "s/SensorTemplate/${SensorName}/g" src/${sensorname}/* examples/*/*${sensorname}* examples/*/*${SensorName}*
     perl -p -i -e "s/sensortemplate/${sensorname}/g" src/${sensorname}/* examples/*/*${sensorname}* examples/*/*${SensorName}*
+    # Remove objects starting with "//" from the new library descriptor .json file
+    perl -p -i -e 'BEGIN{undef $/;} s/\s+"\/\/.*?},//smg' src/${sensorname}/${sensorname}.json
     # Add mynewmodule example target for java
     perl -p -i -e "s/^((.*)SensorTemplateSample sensortemplate(.*))/\1\n\2${SensorName}Sample ${sensorname}\3/g" examples/java/CMakeLists.txt
     # Add mynewmodule example mappings for doxygen
diff --git a/src/sensortemplate/sensortemplate.json b/src/sensortemplate/sensortemplate.json
index a4914c72..477c137f 100644
--- a/src/sensortemplate/sensortemplate.json
+++ b/src/sensortemplate/sensortemplate.json
@@ -17,12 +17,12 @@
         "required": true
     },
     "Sensor Class": {
-        "// TemplateItem": {
+        "// SensorTemplate": {
             "comment": "Template Item",
             "type": "object",
             "required": true
         },
-        "TemplateItem": {
+        "SensorTemplate": {
             "// Name": {
                 "comment": "Sensor display name as indicated by the datasheet or manufacturer",
                 "type": "string",
@@ -86,7 +86,7 @@
                 "type": "string",
                 "required": false
             },
-            "Image": "sensortemplate.jpg",
+            "Image": "sensortemplate.png",
             "// Examples": {
                 "comment": "Functional examples showing the main use cases for this sensor class. At least one is required.",
                 "type": "object",
diff --git a/tests/node/test.js b/tests/node/test.js
index 7856b5c9..a694e574 100644
--- a/tests/node/test.js
+++ b/tests/node/test.js
@@ -68,11 +68,11 @@ function checkObjectSpecs(object, target) {
       var realKeyName = key.replace('// ', '');
 
       /**
-       * "TemplateItem" is a special case
-       * For objects, the TemplateItem define
+       * "SensorTemplate" is a special case
+       * For objects, the SensorTemplate define
        * the specs for each of the items in the object
        */
-      if (realKeyName === 'TemplateItem') {
+      if (realKeyName === 'SensorTemplate') {
         for (var key in target) {
           (function(key, target){
             /**
@@ -89,7 +89,7 @@ function checkObjectSpecs(object, target) {
                 describe(key, function () {
                   checkObjectSpecs(object, target);
                 });
-              })(object['TemplateItem'], target[key]);
+              })(object['SensorTemplate'], target[key]);
             }
           })(key, target);
         }