iotagent-node-lib 2.18.0 → 2.19.0

package/test/unit/ngsiv2/provisioning/listProvisionedDevices-test.js

@@ -27,10 +27,11 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const nock = require('nock');
 const async = require('async');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     logLevel: 'FATAL',
@@ -144,12 +145,11 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should return all the provisioned devices', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
-                should.exist(parsedBody.devices);
+                should.exist(body.devices);
                 response.statusCode.should.equal(200);
-                parsedBody.devices.length.should.equal(3);
-                parsedBody.count.should.equal(3);
+                body.devices.length.should.equal(3);
+                body.count.should.equal(3);
                 done();
             });
         });
@@ -158,22 +158,20 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             /* jshint camelcase:false */
 
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
-
-                should.exist(parsedBody.devices[0].attributes);
-                parsedBody.devices[0].attributes.length.should.equal(1);
+                should.exist(body.devices[0].attributes);
+                body.devices[0].attributes.length.should.equal(1);
 
-                should.exist(parsedBody.devices[0].device_id);
-                parsedBody.devices[0].device_id.should.equal('Light1');
+                should.exist(body.devices[0].device_id);
+                body.devices[0].device_id.should.equal('Light1');
 
-                should.exist(parsedBody.devices[0].entity_name);
-                parsedBody.devices[0].entity_name.should.equal('TheFirstLight');
+                should.exist(body.devices[0].entity_name);
+                body.devices[0].entity_name.should.equal('TheFirstLight');
 
-                should.exist(parsedBody.devices[0].protocol);
-                parsedBody.devices[0].protocol.should.equal('GENERIC_PROTO');
+                should.exist(body.devices[0].protocol);
+                body.devices[0].protocol.should.equal('GENERIC_PROTO');
 
-                should.exist(parsedBody.devices[0].static_attributes);
-                parsedBody.devices[0].static_attributes.length.should.equal(1);
+                should.exist(body.devices[0].static_attributes);
+                body.devices[0].static_attributes.length.should.equal(1);
 
                 done();
             });
@@ -181,16 +179,14 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should return all the plugin attributes', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
-
-                should.exist(parsedBody.devices[2].attributes[0].entity_name);
-                should.exist(parsedBody.devices[2].attributes[0].entity_type);
-                should.exist(parsedBody.devices[2].attributes[1].expression);
-                should.exist(parsedBody.devices[2].attributes[2].reverse);
-                parsedBody.devices[2].attributes[0].entity_name.should.equal('Higro2000');
-                parsedBody.devices[2].attributes[0].entity_type.should.equal('Higrometer');
-                parsedBody.devices[2].attributes[1].expression.should.equal('${@humidity * 20}');
-                parsedBody.devices[2].attributes[2].reverse.length.should.equal(2);
+                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();
             });
         });
@@ -210,9 +206,8 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
                 should.not.exist(error);
                 response.statusCode.should.equal(200);
 
-                const parsedBody = JSON.parse(body);
-                parsedBody.entity_name.should.equal('TheFirstLight');
-                parsedBody.device_id.should.equal('Light1');
+                body.entity_name.should.equal('TheFirstLight');
+                body.device_id.should.equal('Light1');
                 done();
             });
         });
@@ -221,11 +216,10 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             request(options, function (error, response, body) {
                 should.not.exist(error);
 
-                const parsedBody = JSON.parse(body);
-                should.exist(parsedBody.attributes[0].object_id);
-                parsedBody.attributes[0].object_id.should.equal('attr_name');
-                parsedBody.attributes[0].name.should.equal('attr_name');
-                parsedBody.attributes[0].type.should.equal('string');
+                should.exist(body.attributes[0].object_id);
+                body.attributes[0].object_id.should.equal('attr_name');
+                body.attributes[0].name.should.equal('attr_name');
+                body.attributes[0].type.should.equal('string');
                 done();
             });
         });
@@ -244,15 +238,14 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
             request(options, function (error, response, body) {
                 should.not.exist(error);
 
-                const parsedBody = JSON.parse(body);
-                should.exist(parsedBody.attributes[0].entity_name);
-                should.exist(parsedBody.attributes[0].entity_type);
-                should.exist(parsedBody.attributes[1].expression);
-                should.exist(parsedBody.attributes[2].reverse);
-                parsedBody.attributes[0].entity_name.should.equal('Higro2000');
-                parsedBody.attributes[0].entity_type.should.equal('Higrometer');
-                parsedBody.attributes[1].expression.should.equal('${@humidity * 20}');
-                parsedBody.attributes[2].reverse.length.should.equal(2);
+                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();
             });
         });
@@ -329,18 +322,16 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should return just 3 devices', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
-                parsedBody.devices.length.should.equal(3);
+                body.devices.length.should.equal(3);
                 done();
             });
         });
 
         it('should return a count with the complete number of devices', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
-                parsedBody.count.should.equal(10);
+                body.count.should.equal(10);
                 done();
             });
         });
@@ -394,11 +385,10 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should skip the first 3 devices', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
 
-                for (let i = 0; i < parsedBody.devices.length; i++) {
-                    ['Light1_0', 'Light1_1', 'Light1_2'].indexOf(parsedBody.devices[i].id).should.equal(-1);
+                for (let i = 0; i < body.devices.length; i++) {
+                    ['Light1_0', 'Light1_1', 'Light1_2'].indexOf(body.devices[i].id).should.equal(-1);
                 }
 
                 done();
@@ -440,10 +430,9 @@ describe('NGSI-v2 - Device provisioning API: List provisioned devices', function
 
         it('should return just the ones in the selected service', function (done) {
             request(options, function (error, response, body) {
-                const parsedBody = JSON.parse(body);
                 should.not.exist(error);
                 response.statusCode.should.equal(200);
-                parsedBody.devices.length.should.equal(3);
+                body.devices.length.should.equal(3);
                 done();
             });
         });

package/test/unit/ngsiv2/provisioning/provisionDeviceMultientity-test.js

@@ -27,9 +27,10 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const nock = require('nock');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     logLevel: 'FATAL',

package/test/unit/ngsiv2/provisioning/removeProvisionedDevice-test.js

@@ -27,10 +27,11 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const nock = require('nock');
 const async = require('async');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     logLevel: 'FATAL',
@@ -119,7 +120,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204);
 
             // This mock does not check the payload since the aim of the test is not to verify
@@ -179,8 +180,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
                 };
 
                 request(options, function (error, response, body) {
-                    const parsedBody = JSON.parse(body);
-                    parsedBody.devices.length.should.equal(2);
+                    body.devices.length.should.equal(2);
                     done();
                 });
             });

package/test/unit/ngsiv2/provisioning/singleConfigurationMode-test.js

@@ -27,10 +27,11 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const nock = require('nock');
 let contextBrokerMock;
-const request = require('request');
+
 const iotAgentConfig = {
     logLevel: 'FATAL',
     contextBroker: {
@@ -264,9 +265,7 @@ describe('NGSI-v2 - Provisioning API: Single service mode', function () {
         it('should be provisioned with the default type', function (done) {
             request(deviceCreation, function (error, response, body) {
                 request(getDevice, function (error, response, body) {
-                    const parsedBody = JSON.parse(body);
-
-                    parsedBody.entity_type.should.equal('SensorMachine');
+                    body.entity_type.should.equal('SensorMachine');
 
                     done();
                 });

package/test/unit/ngsiv2/provisioning/updateProvisionedDevices-test.js

@@ -27,10 +27,11 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const nock = require('nock');
 const async = require('async');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     logLevel: 'FATAL',
@@ -133,7 +134,7 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/registrations/6719a7f5254b058441165849')
+                .delete('/v2/registrations/6719a7f5254b058441165849', '')
                 .reply(204);
 
             const nockBody3 = utils.readExampleFile(
@@ -191,7 +192,7 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/registrations/6319a7f5254b05844116584d')
+                .delete('/v2/registrations/6319a7f5254b05844116584d', '')
                 .reply(204);
 
             contextBrokerMock
@@ -239,9 +240,8 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
                 request(options, function (error, response, body) {
                     /* jshint camelcase:false */
 
-                    const parsedBody = JSON.parse(body);
-                    parsedBody.entity_name.should.equal('ANewLightName');
-                    parsedBody.timezone.should.equal('Europe/Madrid');
+                    body.entity_name.should.equal('ANewLightName');
+                    body.timezone.should.equal('Europe/Madrid');
                     done();
                 });
             });
@@ -261,9 +261,8 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
                 request(options, function (error, response, body) {
                     /* jshint camelcase:false */
 
-                    const parsedBody = JSON.parse(body);
-                    parsedBody.entity_type.should.equal('TheLightType');
-                    parsedBody.service.should.equal('smartgondor');
+                    body.entity_type.should.equal('TheLightType');
+                    body.service.should.equal('smartgondor');
                     done();
                 });
             });
@@ -370,10 +369,8 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
                     should.not.exist(error);
                     response.statusCode.should.equal(200);
 
-                    const parsedBody = JSON.parse(body);
-
-                    parsedBody.attributes.length.should.equal(1);
-                    parsedBody.attributes[0].name.should.equal('newAttribute');
+                    body.attributes.length.should.equal(1);
+                    body.attributes[0].name.should.equal('newAttribute');
                     done();
                 });
             });
@@ -440,10 +437,8 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
                     should.not.exist(error);
                     response.statusCode.should.equal(200);
 
-                    const parsedBody = JSON.parse(body);
-
-                    parsedBody.static_attributes.length.should.equal(3);
-                    parsedBody.static_attributes[0].name.should.equal('cellID');
+                    body.static_attributes.length.should.equal(3);
+                    body.static_attributes[0].name.should.equal('cellID');
                     done();
                 });
             });
@@ -493,8 +488,7 @@ describe('NGSI-v2 - Device provisioning API: Update provisioned devices', functi
                     should.not.exist(error);
                     response.statusCode.should.equal(200);
 
-                    const parsedBody = JSON.parse(body);
-                    parsedBody.explicitAttrs.should.equal(false);
+                    body.explicitAttrs.should.equal(false);
                     done();
                 });
             });

package/test/unit/plugins/capture-configuration-inPlugins_test.js

@@ -24,9 +24,11 @@
 /* eslint-disable no-unused-vars */
 
 const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
+const utils = require('../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const logger = require('logops');
-const request = require('request');
+
 const iotAgentConfig = {
     contextBroker: {
         host: '192.168.1.1',

package/test/unit/plugins/capture-provision-inPlugins_test.js

@@ -25,10 +25,11 @@
 
 const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
 const utils = require('../../tools/utils');
+const request = utils.request;
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     contextBroker: {

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

@@ -1,25 +0,0 @@
-[
-    {
-        "@context": "http://context.json-ld",
-        "longitude": {
-            "type": "Property",
-            "value": 0.44
-        },
-        "latitude": {
-            "type": "Property",
-            "value": 10
-        },
-        "location": {
-            "type": "GeoProperty",
-            "value": {
-                "type": "Point",
-                "coordinates": [
-                    0.44,
-                    10
-                ]
-            }
-        },
-        "id": "urn:ngsi-ld:WeatherStation:ws1",
-        "type": "WeatherStation"
-    }
-]