iotagent-node-lib 4.5.0 → 4.6.0

package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin2.json

@@ -1,25 +1,25 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "humidity": {
-            "type": "Property",
-            "value": {
-                "@type": "Percentage",
-                "@value": "12"
-            }
-        },
-        "id": "urn:ngsi-ld:WeatherStation:ws1",
-        "pressure": {
-            "type": "Property",
-            "value": 1040
-        },
-        "type": "WeatherStation",
-        "weather": {
-            "type": "Property",
-            "value": {
-                "@type": "Summary",
-                "@value": "Humidity 6 and pressure 1040"
-            }
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:WeatherStation:ws1",
+    "type": "WeatherStation",
+    "pressure": {
+      "type": "Property",
+      "value": 1040
+    },
+    "humidity": {
+      "type": "Property",
+      "value": {
+        "@type": "Percentage",
+        "@value": "12"
+      }
+    },
+    "weather": {
+      "type": "Property",
+      "value": {
+        "@type": "Summary",
+        "@value": "Humidity 6 and pressure 20800"
+      }
     }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin29.json

@@ -1,6 +1,8 @@
 [
   {
     "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:WeatherStation:ws1",
+    "type": "WeatherStation",
     "pressure": {
       "type": "Property",
       "value": 1040
@@ -9,10 +11,8 @@
       "type": "Property",
       "value": {
         "@type": "Summary",
-        "@value": "Humidity NaN and pressure 1040"
+        "@value": "Humidity NaN and pressure 20800"
       }
-    },
-    "id": "urn:ngsi-ld:WeatherStation:ws1",
-    "type": "WeatherStation"
+    }
   }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin32.json

@@ -1,18 +1,17 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:GPS:gps1",
-        "type": "GPS",
-        "location": {
-            "type": "GeoProperty",
-            "value": {
-                "coordinates": [
-                    13,
-                    52
-                ],
-                "type": "Point"
-            },
-            "observedAt": "1970-01-01T00:00:00.001Z"
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:GPS:gps1",
+    "type": "GPS",
+    "location": {
+      "type": "GeoProperty",
+      "value": {
+        "coordinates": [
+          13,
+          52
+        ],
+        "type": "Point"
+      }
     }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin1.json

@@ -1,26 +1,26 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WeatherStation:ws4",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "52"
-            }
-        },
-        "type": "WeatherStation"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "humidity": {
-            "type": "Property",
-            "value": {
-                "@type": "Percentage",
-                "@value": "12"
-            }
-        },
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "type": "Higrometer"
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:WeatherStation:ws4",
+    "type": "WeatherStation",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "52"
+      }
     }
+  },
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2000",
+    "type": "Higrometer",
+    "humidity": {
+      "type": "Property",
+      "value": {
+        "@type": "Percentage",
+        "@value": "12"
+      }
+    }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin15.json

@@ -1,9 +1,4 @@
 [
-        {
-            "@context": "http://context.json-ld",
-            "id": "urn:ngsi-ld:GPS:gps1",
-            "type": "GPS"
-        },
         {
             "@context": "http://context.json-ld",
             "explicit": {

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin4.json

@@ -1,19 +1,14 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WeatherStation:ws5",
-        "type": "WeatherStation"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "16"
-            }
-        },
-        "type": "Higrometer"
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2000",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "16"
+      }
     }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin5.json

@@ -1,31 +1,26 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WeatherStation:ws6",
-        "type": "WeatherStation"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "type": "Higrometer",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "16"
-            }
-        }
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2002",
-        "type": "Higrometer",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "17"
-            }
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2002",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "17"
+      }
     }
+  },
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2000",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "16"
+      }
+    }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin6.json

@@ -1,16 +1,11 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Sensor:Sensor",
-        "type": "Sensor"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WM:SO1",
-        "type": "WM",
-        "vol": {
-            "type": "Property",
-            "value": 38
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:WM:SO1",
+    "type": "WM",
+    "vol": {
+      "type": "Property",
+      "value": 38
     }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin7.json

@@ -1,9 +1,4 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Sensor:Sensor",
-        "type": "Sensor"
-    },
     {
         "@context": "http://context.json-ld",
         "id": "urn:ngsi-ld:WM:SO1",

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin8.json

@@ -1,32 +1,27 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WeatherStation:ws7",
-        "type": "WeatherStation"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "type": "Higrometer",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "16"
-            }
-        }
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2002",
-        "type": "Higrometer",
-        "pressure": {
-            "type": "Property",
-            "value": {
-                "@type": "Hgmm",
-                "@value": "17"
-            },
-            "unitCode": "Hgmm"
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2002",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "17"
+      },
+      "unitCode": "Hgmm"
     }
+  },
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2000",
+    "type": "Higrometer",
+    "pressure": {
+      "type": "Property",
+      "value": {
+        "@type": "Hgmm",
+        "@value": "16"
+      }
+    }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityTimestampPlugin2.json

@@ -1,20 +1,15 @@
 [
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WeatherStation:ws4",
-        "type": "WeatherStation"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "type": "Higrometer",
-        "humidity": {
-            "type": "Property",
-            "value": {
-                "@type": "Percentage",
-                "@value": "12"
-            },
-            "observedAt": "2023-03-21T16:54:11.464Z"
-        }
+  {
+    "@context": "http://context.json-ld",
+    "id": "urn:ngsi-ld:Higrometer:Higro2000",
+    "type": "Higrometer",
+    "humidity": {
+      "type": "Property",
+      "value": {
+        "@type": "Percentage",
+        "@value": "12"
+      },
+      "observedAt": "2024-06-25T16:04:13.914Z"
     }
+  }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextStaticLinkedAttributes.json

@@ -1,14 +1,8 @@
 [
   {
     "@context": "http://context.json-ld",
-    "luminosity": {
-      "type": "Property",
-      "value": 87,
-      "providedBy": {
-        "type": "Relationship",
-        "object": "urn:ngsi-ld:Lamp:lamp1"
-      }
-    },
+    "id": "urn:ngsi-ld:Lamp:lamp1",
+    "type": "Lamp",
     "controlledAsset": {
       "type": "Relationship",
       "object": "urn:ngsi-ld:Building:001"
@@ -21,8 +15,15 @@
         "value": "bell"
       }
     },
-    "id": "urn:ngsi-ld:Lamp:lamp1",
-    "type": "Lamp"
+    "luminosity": {
+      "type": "Property",
+      "value": 87,
+      "unitCode": "CAL",
+      "providedBy": {
+        "type": "Relationship",
+        "object": "urn:ngsi-ld:Lamp:lamp1"
+      }
+    }
   },
   {
     "@context": "http://context.json-ld",
@@ -31,6 +32,7 @@
     "luminosity": {
       "type": "Property",
       "value": 87,
+      "unitCode": "CAL",
       "providedBy": {
         "type": "Relationship",
         "object": "urn:ngsi-ld:Lamp:lamp1"

package/test/unit/ngsi-ld/expressions/jexlBasedTransformations-test.js

@@ -306,40 +306,6 @@ describe('NGSI-LD: JEXL', function () {
         });
     });
 
-    describe('When an update comes for expressions with syntax errors', function () {
-        // Case: Update for an attribute with bad expression
-        const values = [
-            {
-                name: 'p',
-                type: 'centigrades',
-                value: '52'
-            }
-        ];
-
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin30.json'
-                    )
-                )
-                .reply(204);
-        });
-
-        it('should ignore the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'LightError', '', values, function (error) {
-                should.not.exist(error);
-                contextBrokerMock.done();
-                done();
-            });
-        });
-    });
-
     describe('When there are expression attributes that are just calculated (not sent by the device)', function () {
         // Case: Expression which results is sent as a new attribute
         const values = [
@@ -557,41 +523,6 @@ describe('NGSI-LD: JEXL', function () {
         });
     });
 
-    describe('When an update comes for attributes without expressions and NULL type', function () {
-        // Case: Update for a Null attribute without expression
-
-        const values = [
-            {
-                name: 'a',
-                type: 'None',
-                value: null
-            }
-        ];
-
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin5.json'
-                    )
-                )
-                .reply(204);
-        });
-
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'Light', '', values, function (error) {
-                should.not.exist(error);
-                contextBrokerMock.done();
-                done();
-            });
-        });
-    });
-
     describe('When an update comes for attributes without expressions and Boolean type', function () {
         // Case: Update for a Boolean attribute without expression
 
@@ -696,39 +627,6 @@ describe('NGSI-LD: JEXL', function () {
         });
     });
 
-    describe('When there are expressions including other attributes and they are not updated', function () {
-        const values = [
-            {
-                name: 'x',
-                type: 'Number',
-                value: 0.44
-            }
-        ];
-
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin12a.json'
-                    )
-                )
-                .reply(204);
-        });
-
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'Light', '', values, function (error) {
-                should.not.exist(error);
-                contextBrokerMock.done();
-                done();
-            });
-        });
-    });
-
     describe('When there are expressions including other attributes and they are updated', function () {
         const values = [
             {

package/test/unit/ngsi-ld/plugins/multientity-plugin_test.js

@@ -696,17 +696,16 @@ describe('NGSI-LD - Multi-entity plugin is executed before timestamp process plu
                         './test/unit/ngsi-ld/examples' +
                             '/contextRequests/updateContextMultientityTimestampPlugin2.json'
                     );
-
                     // Note that TimeInstant fields are not included in the json used by this mock as they are dynamic
                     // fields. The following code just checks that TimeInstant fields are present.
-                    if (!body[1].humidity.observedAt) {
+                    if (!body[0].humidity.observedAt) {
                         return false;
                     }
 
-                    const timeInstantAtt = body[1].humidity.observedAt;
+                    const timeInstantAtt = body[0].humidity.observedAt;
                     if (moment(timeInstantAtt, 'YYYY-MM-DDTHH:mm:ss.SSSZ').isValid) {
-                        delete body[1].humidity.observedAt;
-                        delete expectedBody[1].humidity.observedAt;
+                        delete body[0].humidity.observedAt;
+                        delete expectedBody[0].humidity.observedAt;
                         return JSON.stringify(body) === JSON.stringify(expectedBody);
                     }
                     return false;

package/test/unit/ngsi-ld/provisioning/listProvisionedDevices-test.js

@@ -184,11 +184,9 @@ describe('NGSI-LD - Device provisioning API: List provisioned devices', function
                 should.exist(body.devices[2].attributes[0].entity_name);
                 should.exist(body.devices[2].attributes[0].entity_type);
                 should.exist(body.devices[2].attributes[1].expression);
-                should.exist(body.devices[2].attributes[2].reverse);
                 body.devices[2].attributes[0].entity_name.should.equal('Higro2000');
                 body.devices[2].attributes[0].entity_type.should.equal('Higrometer');
                 body.devices[2].attributes[1].expression.should.equal('${@humidity * 20}');
-                body.devices[2].attributes[2].reverse.length.should.equal(2);
                 done();
             });
         });
@@ -245,11 +243,9 @@ describe('NGSI-LD - Device provisioning API: List provisioned devices', function
                 should.exist(body.attributes[0].entity_name);
                 should.exist(body.attributes[0].entity_type);
                 should.exist(body.attributes[1].expression);
-                should.exist(body.attributes[2].reverse);
                 body.attributes[0].entity_name.should.equal('Higro2000');
                 body.attributes[0].entity_type.should.equal('Higrometer');
                 body.attributes[1].expression.should.equal('${@humidity * 20}');
-                body.attributes[2].reverse.length.should.equal(2);
                 done();
             });
         });