iotagent-node-lib 3.4.4 → 4.0.0

package/test/unit/ngsi-ld/general/contextBrokerOAuthSecurityAccess-test.js

@@ -289,16 +289,6 @@ describe('NGSI-LD - Secured access to the Context Broker with OAuth2 provider',
                     )
                     .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations//6319a7f5254b05844116584d' });
 
-                contextBrokerMock
-                    .post(
-                        '/ngsi-ld/v1/entityOperations/upsert/',
-                        utils.readExampleFile(
-                            './test/unit/ngsi-ld/examples/' +
-                                'contextRequests/createProvisionedDeviceWithGroupAndStatic3.json'
-                        )
-                    )
-                    .reply(204);
-
                 contextBrokerMock
                     .post(
                         '/ngsi-ld/v1/subscriptions/',
@@ -316,38 +306,38 @@ describe('NGSI-LD - Secured access to the Context Broker with OAuth2 provider',
                 });
             });
         });
-        // FIXME: disabled test by #1421
-        // it('subscribe requests use auth header', function (done) {
-        //     iotAgentLib.getDevice('Light1', null, 'smartgondor', 'electricity', function (error, device) {
-        //         iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
-        //             should.not.exist(error);
-
-        //             contextBrokerMock.done();
-
-        //             done();
-        //         });
-        //     });
-        // });
-        // FIXME: disabled test by #1421
-        // it('unsubscribe requests use auth header', function (done) {
-        //     oauth2Mock
-        //         .post(
-        //             '/auth/realms/default/protocol/openid-connect/token',
-        //             utils.readExampleFile('./test/unit/examples/oauthRequests/getTokenFromTrust.json', true)
-        //         )
-        //         .reply(201, utils.readExampleFile('./test/unit/examples/oauthResponses/tokenFromTrust.json'), {});
-
-        //     contextBrokerMock.delete('/ngsi-ld/v1/subscriptions/51c0ac9ed714fb3b37d7d5a8', '').reply(204);
-
-        //     iotAgentLib.getDevice('Light1', null, 'smartgondor', 'electricity', function (error, device) {
-        //         iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
-        //             iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
-        //                 contextBrokerMock.done();
-        //                 done();
-        //             });
-        //         });
-        //     });
-        // });
+
+        it('subscribe requests use auth header', function (done) {
+            iotAgentLib.getDevice('Light1', null, 'smartgondor', 'electricity', function (error, device) {
+                iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
+                    should.not.exist(error);
+
+                    contextBrokerMock.done();
+
+                    done();
+                });
+            });
+        });
+
+        it('unsubscribe requests use auth header', function (done) {
+            oauth2Mock
+                .post(
+                    '/auth/realms/default/protocol/openid-connect/token',
+                    utils.readExampleFile('./test/unit/examples/oauthRequests/getTokenFromTrust.json', true)
+                )
+                .reply(201, utils.readExampleFile('./test/unit/examples/oauthResponses/tokenFromTrust.json'), {});
+
+            contextBrokerMock.delete('/ngsi-ld/v1/subscriptions/51c0ac9ed714fb3b37d7d5a8', '').reply(204);
+
+            iotAgentLib.getDevice('Light1', null, 'smartgondor', 'electricity', function (error, device) {
+                iotAgentLib.subscribe(device, ['dimming'], null, function (error) {
+                    iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
+                        contextBrokerMock.done();
+                        done();
+                    });
+                });
+            });
+        });
     });
 });
 
@@ -745,7 +735,7 @@ describe(
                     .matchHeader('fiware-service', 'testservice')
                     .matchHeader('authorization', 'Bearer bea752e377680acd1349a3ed59db855a1db07zxc')
                     .post(
-                        '/ngsi-ld/v1/entityOperations/upsert/',
+                        '/ngsi-ld/v1/entityOperations/upsert/?options=update',
                         utils.readExampleFile(
                             './test/unit/ngsi-ld/examples/' +
                                 'contextRequests/createProvisionedDeviceWithGroupAndStatic2.json'
@@ -753,15 +743,6 @@ describe(
                     )
                     .reply(204);
 
-                contextBrokerMock3 = nock('http://unexistentHost:1026')
-                    .matchHeader('fiware-service', 'testservice')
-                    .matchHeader('authorization', 'Bearer zzz752e377680acd1349a3ed59db855a1db07bbb')
-                    .post(
-                        '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                        utils.readExampleFile('./test/unit/ngsi-ld/examples/contextRequests/updateContext5.json')
-                    )
-                    .reply(204);
-
                 iotAgentConfig.authentication.tokenPath = '/oauth2/token';
                 iotAgentLib.activate(iotAgentConfig, function () {
                     done();
@@ -773,24 +754,23 @@ describe(
 
                 done();
             });
-            // FIXME: disabled test by #1421
-            // it('should not raise any error', function (done) {
-            //     request(deviceCreation, function (error, response, body) {
-            //         should.not.exist(error);
-            //         response.statusCode.should.equal(201);
-            //         contextBrokerMock.done();
-            //         contextBrokerMock2.done();
-            //         done();
-            //     });
-            // });
-            // FIXME: disabled test by #1421
-            // it('should send the mixed data to the Context Broker', function (done) {
-            //     iotAgentLib.update('Light1', 'SensorMachine', '', values, function (error) {
-            //         should.not.exist(error);
-            //         contextBrokerMock3.done();
-            //         done();
-            //     });
-            // });
+
+            it('should not raise any error', function (done) {
+                request(deviceCreation, function (error, response, body) {
+                    should.not.exist(error);
+                    response.statusCode.should.equal(201);
+                    contextBrokerMock.done();
+                    done();
+                });
+            });
+
+            it('should send the mixed data to the Context Broker', function (done) {
+                iotAgentLib.update('Light1', 'SensorMachine', '', values, function (error) {
+                    should.not.exist(error);
+                    contextBrokerMock2.done();
+                    done();
+                });
+            });
         });
     }
 );
@@ -833,7 +813,7 @@ describe(
 
                 contextBrokerMock = nock('http://unexistentHost:1026')
                     .matchHeader('fiware-service', 'testservice')
-                    .matchHeader('Authorization', 'Bearer 999210dacf913772606c95dd0b895d5506cbc988')
+                    .matchHeader('Authorization', 'Bearer 000210dacf913772606c95dd0b895d5506cbc700')
                     .post(
                         '/ngsi-ld/v1/entityOperations/upsert/?options=update',
                         utils.readExampleFile(
@@ -849,22 +829,22 @@ describe(
                     });
                 });
             });
-            // FIXME: disabled test by #1421
-            // it('should send the permanent token in the auth header', function (done) {
-            //     iotAgentLib.update('machine1', 'SensorMachine', '', values, function (error) {
-            //         should.not.exist(error);
-            //         contextBrokerMock.done();
-            //         done();
-            //     });
-            // });
-            // FIXME: disabled test by #1421
-            // it('should use the permanent trust token in the following requests', function (done) {
-            //     iotAgentLib.update('machine1', 'SensorMachine', '', values, function (error) {
-            //         should.not.exist(error);
-            //         contextBrokerMock.done();
-            //         done();
-            //     });
-            // });
+
+            it('should send the permanent token in the auth header', function (done) {
+                iotAgentLib.update('machine1', 'SensorMachine', '', values, function (error) {
+                    should.not.exist(error);
+                    contextBrokerMock.done();
+                    done();
+                });
+            });
+
+            it('should use the permanent trust token in the following requests', function (done) {
+                iotAgentLib.update('machine1', 'SensorMachine', '', values, function (error) {
+                    should.not.exist(error);
+                    contextBrokerMock.done();
+                    done();
+                });
+            });
         });
     }
 );

package/test/unit/ngsi-ld/lazyAndCommands/command-test.js

@@ -131,11 +131,6 @@ describe('NGSI-LD - Command functionalities', function () {
             )
             .reply(201, null, { Location: '/ngsi-ld/v1/csourceRegistrations/6319a7f5254b05844116584d' });
 
-        contextBrokerMock
-            .matchHeader('fiware-service', 'smartgondor')
-            .post('/ngsi-ld/v1/entityOperations/upsert/')
-            .reply(204);
-
         iotAgentLib.activate(iotAgentConfig, done);
     });
 
@@ -155,14 +150,13 @@ describe('NGSI-LD - Command functionalities', function () {
     });
 
     describe('When a device is preregistered with commands', function () {
-        // FIXME: disabled test by #1421
-        // it('should register as Context Provider of the commands', function (done) {
-        //     iotAgentLib.register(device3, function (error) {
-        //         should.not.exist(error);
-        //         contextBrokerMock.done();
-        //         done();
-        //     });
-        // });
+        it('should register as Context Provider of the commands', function (done) {
+            iotAgentLib.register(device3, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
     });
 
     describe('When multiple command updates via PATCH /attrs arrive to the IoT Agent as Context Provider', function () {

package/test/unit/ngsi-ld/lazyAndCommands/merge-patch-test.js

@@ -55,17 +55,7 @@ const iotAgentConfig = {
     types: {
         Robot: {
             internalAttributes: [],
-            commands: [
-                {
-                    name: 'position',
-                    object_id: 'pos',
-                    type: 'Object'
-                },
-                {
-                    name: 'orientation',
-                    type: 'Object'
-                }
-            ],
+            commands: [],
             lazy: [
                 {
                     name: 'batteryLevel',
@@ -82,7 +72,18 @@ const iotAgentConfig = {
 const device3 = {
     id: 'r2d2',
     type: 'Robot',
-    service: 'smartgondor'
+    service: 'smartgondor',
+    commands: [
+        {
+            name: 'position',
+            object_id: 'pos',
+            type: 'Object'
+        },
+        {
+            name: 'orientation',
+            type: 'Object'
+        }
+    ]
 };
 
 describe('NGSI-LD - Merge-Patch functionalities', function () {
@@ -154,37 +155,36 @@ describe('NGSI-LD - Merge-Patch functionalities', function () {
             });
         });
 
-        // FIXME: after (PR#1396)
-        // it('should call the client handler once', function (done) {
-        //     let handlerCalled = 0;
-
-        //     iotAgentLib.setMergePatchHandler(function (id, type, service, subservice, attributes, callback) {
-        //         id.should.equal('urn:ngsi-ld:' + device3.type + ':' + device3.id);
-        //         type.should.equal(device3.type);
-        //         attributes[0].name.should.equal('position');
-        //         attributes[1].name.should.equal('orientation');
-        //         should.equal(attributes[1].value, null);
-        //         handlerCalled++;
-        //         callback(null, {
-        //             id,
-        //             type,
-        //             attributes: [
-        //                 {
-        //                     name: 'position',
-        //                     type: 'Array',
-        //                     value: '[28, -104, 23]'
-        //                 }
-        //             ]
-        //         });
-        //     });
-
-        //     request(options, function (error, response, body) {
-        //         should.not.exist(error);
-        //         response.statusCode.should.equal(200);
-        //         handlerCalled.should.equal(1);
-        //         done();
-        //     });
-        // });
+        it('should call the client handler once', function (done) {
+            let handlerCalled = 0;
+
+            iotAgentLib.setMergePatchHandler(function (id, type, service, subservice, attributes, callback) {
+                id.should.equal('urn:ngsi-ld:' + device3.type + ':' + device3.id);
+                type.should.equal(device3.type);
+                attributes[0].name.should.equal('position');
+                attributes[1].name.should.equal('orientation');
+                should.equal(attributes[1].value, null);
+                handlerCalled++;
+                callback(null, {
+                    id,
+                    type,
+                    attributes: [
+                        {
+                            name: 'position',
+                            type: 'Array',
+                            value: '[28, -104, 23]'
+                        }
+                    ]
+                });
+            });
+
+            request(options, function (error, response, body) {
+                should.not.exist(error);
+                response.statusCode.should.equal(200);
+                handlerCalled.should.equal(1);
+                done();
+            });
+        });
     });
 
     xdescribe('When a partial update PATCH with an NGSI-LD Null arrives to the IoT Agent as Context Provider', function () {

package/test/unit/ngsi-ld/lazyAndCommands/polling-commands-test.js

@@ -90,12 +90,7 @@ const iotAgentConfig = {
             active: []
         },
         Robot: {
-            commands: [
-                {
-                    name: 'position',
-                    type: 'Array'
-                }
-            ],
+            commands: [],
             lazy: [],
             staticAttributes: [],
             active: []
@@ -121,7 +116,13 @@ const device3 = {
     type: 'Robot',
     service: 'smartgondor',
     subservice: 'gardens',
-    polling: true
+    polling: true,
+    commands: [
+        {
+            name: 'position',
+            type: 'Array'
+        }
+    ]
 };
 
 describe('NGSI-LD - Polling commands', function () {
@@ -170,16 +171,6 @@ describe('NGSI-LD - Polling commands', function () {
         };
 
         beforeEach(function (done) {
-            statusAttributeMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/updateContextCommandStatus1.json'
-                    )
-                )
-                .reply(204);
-
             iotAgentLib.register(device3, function (error) {
                 done();
             });
@@ -209,18 +200,17 @@ describe('NGSI-LD - Polling commands', function () {
                 done();
             });
         });
-        // FIXME: disabled test by #1421
-        // it('should create the attribute with the "_status" prefix in the Context Broker', function (done) {
-        //     iotAgentLib.setCommandHandler(function (id, type, service, subservice, attributes, callback) {
-        //         callback(null);
-        //     });
-
-        //     request(options, function (error, response, body) {
-        //         should.not.exist(error);
-        //         statusAttributeMock.done();
-        //         done();
-        //     });
-        // });
+
+        it('should create the attribute with the "_status" prefix in the Context Broker', function (done) {
+            iotAgentLib.setCommandHandler(function (id, type, service, subservice, attributes, callback) {
+                callback(null);
+            });
+
+            request(options, function (error, response, body) {
+                should.not.exist(error);
+                done();
+            });
+        });
         xit('should store the commands in the queue', function (done) {
             iotAgentLib.setCommandHandler(function (id, type, service, subservice, attributes, callback) {
                 callback(null);

package/test/unit/ngsi-ld/ngsiService/languageProperties-test.js

@@ -33,7 +33,6 @@ const logger = require('logops');
 const nock = require('nock');
 let contextBrokerMock;
 const iotAgentConfig = {
-    autocast: true,
     contextBroker: {
         host: '192.168.1.1',
         port: '1026',

package/test/unit/ngsi-ld/ngsiService/subscriptions-test.js

@@ -66,16 +66,6 @@ describe('NGSI-LD - Subscription tests', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .post(
-                    '/ngsi-ld/v1/entityOperations/upsert/',
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextRequests/createMinimumProvisionedDevice.json'
-                    )
-                )
-                .reply(204);
-
-            contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
                 .post(
                     '/ngsi-ld/v1/subscriptions/',
@@ -102,18 +92,17 @@ describe('NGSI-LD - Subscription tests', function () {
     });
 
     describe('When a client invokes the subscribe() function for device', function () {
-        // FIXME: disabled test by #1421
-        // it('should send the appropriate request to the Context Broker', function (done) {
-        //     iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
-        //         iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
-        //             should.not.exist(error);
-
-        //             contextBrokerMock.done();
-
-        //             done();
-        //         });
-        //     });
-        // });
+        it('should send the appropriate request to the Context Broker', function (done) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
+                iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
+                    should.not.exist(error);
+
+                    contextBrokerMock.done();
+
+                    done();
+                });
+            });
+        });
         it('should store the subscription ID in the Device Registry', function (done) {
             iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
@@ -139,19 +128,19 @@ describe('NGSI-LD - Subscription tests', function () {
 
             done();
         });
-        // FIXME: disabled test by #1421
-        // it('should delete the subscription from the CB', function (done) {
-        //     iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
-        //         iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
-        //             iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
-        //                 iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
-        //                     contextBrokerMock.done();
-        //                     done();
-        //                 });
-        //             });
-        //         });
-        //     });
-        // });
+
+        it('should delete the subscription from the CB', function (done) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
+                iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
+                    iotAgentLib.unsubscribe(device, '51c0ac9ed714fb3b37d7d5a8', function (error) {
+                        iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
+                            contextBrokerMock.done();
+                            done();
+                        });
+                    });
+                });
+            });
+        });
         it('should remove the id from the subscriptions array', function (done) {
             iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
                 iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
@@ -177,17 +166,17 @@ describe('NGSI-LD - Subscription tests', function () {
 
             done();
         });
-        // FIXME: disabled test by #1421
-        // it('should delete the subscription from the CB', function (done) {
-        //     iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
-        //         iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
-        //             iotAgentLib.unregister(device.id, null, 'smartgondor', '/gardens', function (error) {
-        //                 contextBrokerMock.done();
-        //                 done();
-        //             });
-        //         });
-        //     });
-        // });
+
+        it('should delete the subscription from the CB', function (done) {
+            iotAgentLib.getDevice('MicroLight1', null, 'smartgondor', '/gardens', function (error, device) {
+                iotAgentLib.subscribe(device, ['attr_name'], null, function (error) {
+                    iotAgentLib.unregister(device.id, null, 'smartgondor', '/gardens', function (error) {
+                        contextBrokerMock.done();
+                        done();
+                    });
+                });
+            });
+        });
     });
     describe('When a new notification comes to the IoTAgent', function () {
         beforeEach(function (done) {

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

@@ -33,7 +33,6 @@ const logger = require('logops');
 const nock = require('nock');
 let contextBrokerMock;
 const iotAgentConfig = {
-    autocast: true,
     contextBroker: {
         host: '192.168.1.1',
         port: '1026',
@@ -154,7 +153,7 @@ describe('NGSI-LD - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -183,7 +182,7 @@ describe('NGSI-LD - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -242,7 +241,7 @@ describe('NGSI-LD - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -272,7 +271,7 @@ describe('NGSI-LD - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -302,7 +301,7 @@ describe('NGSI-LD - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -332,7 +331,7 @@ describe('NGSI-LD - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -362,7 +361,7 @@ describe('NGSI-LD - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -392,7 +391,7 @@ describe('NGSI-LD - Attribute alias plugin', function () {
                 .reply(204);
         });
 
-        it('should rename the attributes as expected by the alias mappings and cast values to JSON native types', function (done) {
+        it('should rename the attributes as expected by the alias mappings', function (done) {
             iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();