iotagent-node-lib 4.2.0 → 4.4.0

package/test/functional/testUtils.js

@@ -112,7 +112,9 @@ function jsonToIotaMeasures(json) {
             if (key === 'TimeInstant') {
                 measure.type = 'DateTime';
             } else {
-                measure.type = 'string';
+                // Although the type is not meaningfull and we could have picked any string for this,
+                // we have aligned with DEFAULT_ATTRIBUTE_TYPE constant in IOTA-JSON and IOTA-UL repositories
+                measure.type = 'Text';
             }
             measures.push(measure);
         }

package/test/unit/ngsi-ld/ngsiService/active-devices-test.js

@@ -600,7 +600,6 @@ describe('NGSI-LD - Active attributes test', function () {
                 should.exist(error.name);
                 error.code.should.equal(207);
                 error.details.notUpdated.should.equal('someEntities');
-                error.message.should.equal('Error accesing entity data for device: light1 of type: Light');
                 error.name.should.equal('ENTITY_GENERIC_ERROR');
                 contextBrokerMock.done();
                 done();

package/test/unit/ngsiv2/ngsiService/active-devices-test.js

@@ -905,17 +905,17 @@ describe('NGSI-v2 - Active attributes test', function () {
         const valuesIdType = [
             {
                 name: 'id',
-                type: 'text',
+                type: 'aTypeProvidedByIoTACodeCallingUpdateOnLib1',
                 value: 'idIoTA'
             },
             {
                 name: 'type',
-                type: 'text',
+                type: 'aTypeProvidedByIoTACodeCallingUpdateOnLib2',
                 value: 'typeIoTA'
             },
             {
                 name: 'm',
-                type: 'text',
+                type: 'aTypeProvidedByIoTACodeCallingUpdateOnLib3',
                 value: 'measIoTA'
             }
         ];
@@ -923,6 +923,9 @@ describe('NGSI-v2 - Active attributes test', function () {
         beforeEach(function (done) {
             nock.cleanAll();
 
+            // Note that in the case of measure_id and measure_type the type provided by the IOTA when calling iotAgentLib.update()
+            // is used (thus ignoring the one of the StupidDevice group for id or type, which is 'text') but in the case of measIoTA the type provided in the
+            // provisioning ('String') is used
             contextBrokerMock = nock('http://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
@@ -934,11 +937,11 @@ describe('NGSI-v2 - Active attributes test', function () {
                         type: 'String'
                     },
                     measure_id: {
-                        type: 'text',
+                        type: 'aTypeProvidedByIoTACodeCallingUpdateOnLib1',
                         value: 'idIoTA'
                     },
                     measure_type: {
-                        type: 'text',
+                        type: 'aTypeProvidedByIoTACodeCallingUpdateOnLib2',
                         value: 'typeIoTA'
                     }
                 })

package/test/unit/ngsiv2/plugins/multientity-plugin_test.js

@@ -307,6 +307,38 @@ const iotAgentConfig = {
                 }
             ]
         },
+        WeatherStation10: {
+            commands: [],
+            type: 'WeatherStation',
+            lazy: [],
+            active: [
+                {
+                    object_id: 'p',
+                    name: 'pressure',
+                    type: 'Hgmm'
+                },
+                {
+                    object_id: 'h',
+                    name: 'humidity',
+                    type: 'Percentage',
+                    entity_name: 'Higro2000',
+                    entity_type: 'Higrometer',
+                    metadata: {
+                        unitCode: {
+                            type: 'Text',
+                            value: 'Hgmm'
+                        }
+                    }
+                },
+                {
+                    object_id: 'TimeInstant',
+                    name: 'TimeInstant',
+                    type: 'DateTime',
+                    entity_name: 'Higro2000',
+                    entity_type: 'Higrometer'
+                }
+            ]
+        },
         Sensor001: {
             commands: [],
             type: 'Sensor',
@@ -1488,7 +1520,7 @@ describe('NGSI-v2 - Multi-entity plugin', function () {
 
 describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plugin', function () {
     beforeEach(function (done) {
-        logger.setLevel('FATAL');
+        logger.setLevel('DEBUG');
         iotAgentConfig.timestamp = true;
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
@@ -1635,7 +1667,7 @@ describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plu
                     value: '2018-06-13T13:28:34.611Z'
                 }
             ];
-            iotAgentLib.update('ws5', 'WeatherStation', '', tsValue, function (error) {
+            iotAgentLib.update('ws5', 'WeatherStation10', '', tsValue, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();

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

@@ -161,7 +161,7 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
             method: 'DELETE'
         };
 
-        it('should return a 200 OK and no errors', function (done) {
+        it('should return a 204 OK and no errors', function (done) {
             request(options, function (error, response, body) {
                 should.not.exist(error);
                 response.statusCode.should.equal(204);
@@ -231,7 +231,42 @@ describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', functi
             method: 'DELETE'
         };
 
-        it('should return a 200 OK and no errors', function (done) {
+        it('should return a 204 OK and no errors', function (done) {
+            request(options, function (error, response, body) {
+                should.not.exist(error);
+                response.statusCode.should.equal(204);
+                done();
+            });
+        });
+    });
+
+    describe('When a request to remove a provision devices arrives', function () {
+        const options = {
+            url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/op/delete',
+            headers: {
+                'fiware-service': 'smartgondor',
+                'fiware-servicepath': '/gardens'
+            },
+            method: 'POST',
+            json: {
+                devices: [
+                    {
+                        deviceId: 'Light1',
+                        apikey: ''
+                    },
+                    {
+                        deviceId: 'Light2',
+                        apikey: ''
+                    },
+                    {
+                        deviceId: 'Light3',
+                        apikey: ''
+                    }
+                ]
+            }
+        };
+
+        it('should return a 204 OK and no errors', function (done) {
             request(options, function (error, response, body) {
                 should.not.exist(error);
                 response.statusCode.should.equal(204);