iotagent-node-lib 2.17.0 → 2.20.0

package/test/unit/{ngsiService → ngsiv2/ngsiService}/queryDeviceInformationInCb-test.js

@@ -21,8 +21,7 @@
  * please contact with::[contacto@tid.es]
  */
 
-const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
-const utils = require('../../tools/utils');
+const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
@@ -30,7 +29,8 @@ let contextBrokerMock;
 const iotAgentConfig = {
     contextBroker: {
         host: '192.168.1.1',
-        port: '1026'
+        port: '1026',
+        ngsiVersion: 'v2'
     },
     server: {
         port: 4041
@@ -115,7 +115,7 @@ const iotAgentConfig = {
     deviceRegistrationDuration: 'P1M'
 };
 
-describe('Query device information in the Context Broker', function () {
+describe('NGSI-v2 - Query device information in the Context Broker', function () {
     const attributes = ['state', 'dimming'];
 
     beforeEach(function (done) {
@@ -135,11 +135,8 @@ describe('Query device information in the Context Broker', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/queryContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/queryContext1.json')
-                )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/queryContext1Success.json'));
+                .get('/v2/entities/light1/attrs?attrs=state,dimming&type=Light')
+                .reply(200, {});
         });
 
         it('should return the information about the desired attributes', function (done) {
@@ -158,11 +155,11 @@ describe('Query device information in the Context Broker', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/queryContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/queryContext2.json')
-                )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/queryContext2Error.json'));
+                .get('/v2/entities/light3/attrs?attrs=state,dimming&type=Light')
+                .reply(404, {
+                    error: 'NotFound',
+                    description: 'The requested entity has not been found. Check type and id'
+                });
         });
 
         it('should return a DEVICE_NOT_FOUND_ERROR', function (done) {
@@ -174,29 +171,6 @@ describe('Query device information in the Context Broker', function () {
         });
     });
 
-    describe('When the user requests information and there are multiple responses, one of them a failure', function () {
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/queryContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/queryContext2.json')
-                )
-                .reply(200, utils.readExampleFile('./test/unit/examples/contextResponses/queryContext3Error.json'));
-        });
-
-        it('should return a ATTRIBUTE_NOT_FOUND_ERROR', function (done) {
-            iotAgentLib.query('light3', 'Light', '', attributes, function (error) {
-                should.exist(error);
-                error.name.should.equal('ATTRIBUTE_NOT_FOUND');
-                done();
-            });
-        });
-    });
-
     describe('When the user requests information and there is an unknown errorCode in the response', function () {
         beforeEach(function () {
             nock.cleanAll();
@@ -204,25 +178,22 @@ describe('Query device information in the Context Broker', function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v1/queryContext',
-                    utils.readExampleFile('./test/unit/examples/contextRequests/queryContext2.json')
-                )
-                .reply(
-                    200,
-                    utils.readExampleFile('./test/unit/examples/contextResponses/queryContext2UnknownError.json')
-                );
+                .get('/v2/entities/light3/attrs?attrs=state,dimming&type=Light')
+                .reply(503, {
+                    error: 'Service Unavailable',
+                    description: 'The context broker is current down for maintenence'
+                });
         });
 
         it('should return a ENTITY_GENERIC_ERROR', function (done) {
             iotAgentLib.query('light3', 'Light', '', attributes, function (error) {
                 should.exist(error);
                 should.exist(error.name);
-                should.exist(error.details.code);
-                should.exist(error.details.reasonPhrase);
+                should.exist(error.code);
+                should.exist(error.details.description);
                 error.name.should.equal('ENTITY_GENERIC_ERROR');
-                error.details.code.should.equal('516');
-                error.details.reasonPhrase.should.equal('A new and unknown error');
+                error.code.should.equal(503);
+                error.details.description.should.equal('The context broker is current down for maintenence');
                 done();
             });
         });

package/test/unit/ngsiv2/ngsiService/subscriptions-test.js

@@ -27,8 +27,9 @@
 
 const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
 const utils = require('../../../tools/utils');
+const request = utils.request;
 const should = require('should');
-const request = require('request');
+
 const nock = require('nock');
 let contextBrokerMock;
 const iotAgentConfig = {
@@ -133,7 +134,7 @@ describe('NGSI-v2 - Subscription tests', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8')
+                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8', '')
                 .reply(204);
 
             done();
@@ -171,7 +172,7 @@ describe('NGSI-v2 - Subscription tests', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8')
+                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8', '')
                 .reply(204);
 
             done();

package/test/unit/ngsiv2/plugins/bidirectional-plugin_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 logger = require('logops');
 const nock = require('nock');
-const request = require('request');
+
 let contextBrokerMock;
 const iotAgentConfig = {
     contextBroker: {
@@ -147,7 +148,7 @@ describe('NGSI-v2 - Bidirectional data plugin', function () {
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', '/gardens')
-                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8')
+                .delete('/v2/subscriptions/51c0ac9ed714fb3b37d7d5a8', '')
                 .reply(204);
         });