iotagent-node-lib 2.15.1 → 2.19.0

package/test/unit/ngsiv2/expressions/jexlBasedTransformations-test.js

@@ -30,6 +30,7 @@ const utils = require('../../../tools/utils');
 const should = require('should');
 const logger = require('logops');
 const nock = require('nock');
+const timekeeper = require('timekeeper');
 let contextBrokerMock;
 const iotAgentConfig = {
     logLevel: 'FATAL',
@@ -140,6 +141,37 @@ const iotAgentConfig = {
                 }
             ]
         },
+        WeatherStationUndef: {
+            commands: [],
+            type: 'WeatherStation',
+            lazy: [],
+            active: [
+                {
+                    object_id: 'u',
+                    name: 'undef',
+                    type: 'json',
+                    expression: 'u["no"]'
+                },
+                {
+                    object_id: 'n',
+                    name: 'nil',
+                    type: 'json',
+                    expression: 'u["no"]?u["no"]:null'
+                },
+                {
+                    object_id: 'f',
+                    name: 'falsy',
+                    type: 'Boolean',
+                    expression: 'u["no"]?u["no"]:false'
+                },
+                {
+                    object_id: 'z',
+                    name: 'zero',
+                    type: 'Number',
+                    expression: 'u["no"]?u["no"]:0'
+                }
+            ]
+        },
         WeatherStationMultiple: {
             commands: [],
             type: 'WeatherStation',
@@ -185,15 +217,175 @@ const iotAgentConfig = {
                     expression: 'updated|trim'
                 }
             ]
+        },
+        GPS: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            active: [
+                {
+                    name: 'location',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                },
+                {
+                    name: 'TimeInstant',
+                    type: 'DateTime',
+                    expression: 'ts|toisodate'
+                }
+            ],
+            explicitAttrs: true
+        },
+        GPS2: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            active: [
+                {
+                    name: 'location',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                }
+            ],
+            explicitAttrs: true
+        },
+        GPS3: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            static: [
+                {
+                    name: 'color',
+                    type: 'string',
+                    value: 'blue'
+                }
+            ],
+            active: [
+                {
+                    name: 'price',
+                    type: 'number'
+                },
+                {
+                    name: 'location',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                }
+            ],
+            explicitAttrs: '[ "location" ]'
+        },
+        GPS4: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            static: [
+                {
+                    name: 'color',
+                    type: 'string',
+                    value: 'blue'
+                }
+            ],
+            active: [
+                {
+                    name: 'price',
+                    type: 'number'
+                },
+                {
+                    name: 'location',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                }
+            ],
+            explicitAttrs: '[ "loca" + "tion" ]'
+        },
+        GPS5: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            static: [
+                {
+                    name: 'color',
+                    type: 'string',
+                    value: 'blue'
+                }
+            ],
+            active: [
+                {
+                    name: 'price',
+                    type: 'number'
+                },
+                {
+                    name: 'location',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                }
+            ],
+            explicitAttrs: '[ myattr ]'
+        },
+        GPS6: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            static: [
+                {
+                    name: 'lat',
+                    type: 'Number',
+                    value: 52
+                },
+                {
+                    name: 'lon',
+                    type: 'Number',
+                    value: 13
+                }
+            ],
+            active: [
+                {
+                    name: 'location',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                }
+            ],
+            explicitAttrs: true
         }
     },
-    service: 'smartGondor',
+    service: 'smartgondor',
     subservice: 'gardens',
-    providerUrl: 'http://smartGondor.com',
+    providerUrl: 'http://smartgondor.com',
     deviceRegistrationDuration: 'P1M',
     throttling: 'PT5S'
 };
 
+const iotAgentConfigTS = {
+    logLevel: 'FATAL',
+    contextBroker: {
+        host: '192.168.1.1',
+        port: '1026',
+        ngsiVersion: 'v2'
+    },
+    defaultExpressionLanguage: 'jexl',
+    server: {
+        port: 4041
+    },
+    types: {
+        GPS: {
+            commands: [],
+            type: 'GPS',
+            lazy: [],
+            active: [
+                {
+                    name: 'location',
+                    type: 'geo:json',
+                    expression: "{coordinates: [lon,lat], type: 'Point'}"
+                }
+            ],
+            explicitAttrs: true
+        }
+    },
+    timestamp: true,
+    service: 'smartgondor',
+    subservice: 'gardens',
+    providerUrl: 'http://smartgondor.com'
+};
+
 describe('Java expression language (JEXL) based transformations plugin', function () {
     beforeEach(function (done) {
         logger.setLevel('FATAL');
@@ -253,9 +445,9 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/ws1/attrs',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin2.json'
@@ -294,9 +486,9 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/ws1/attrs',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin4.json'
@@ -329,9 +521,9 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin11.json'
@@ -364,9 +556,9 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/ws1/attrs',
                     utils.readExampleFile(
                         './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin1.json'
@@ -385,13 +577,14 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes with string expression and type integer', function () {
-        // Case: Update for an integer attribute with string expression
+    describe('When an update comes for attributes without expressions and type float', function () {
+        // Case: Update for a Float attribute without expressions
+
         const values = [
             {
                 name: 'e',
                 type: 'Number',
-                value: 52
+                value: 0.44
             }
         ];
 
@@ -399,20 +592,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/ws1/attrs',
+                .patch(
+                    '/v2/entities/light1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin11.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin3.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
+                .query({ type: 'Light' })
                 .reply(204);
         });
 
         it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('ws1', 'WeatherStationMultiple', '', values, function (error) {
+            iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -420,8 +613,8 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes without expressions and type float', function () {
-        // Case: Update for a Float attribute without expressions
+    describe('When an update comes for attributes with numeric expressions and type float', function () {
+        // Case: Update for a Float attribute with arithmetic expression
 
         const values = [
             {
@@ -435,12 +628,48 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .patch(
+                    '/v2/entities/ws1/attrs',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin8.json'
+                    )
+                )
+                .query({ type: 'WeatherStation' })
+                .reply(204);
+        });
+
+        it('should apply the expression before sending the values', function (done) {
+            iotAgentLib.update('ws1', 'WeatherStation', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
+    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(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin3.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin5.json'
                     )
                 )
                 .query({ type: 'Light' })
@@ -456,14 +685,14 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes with numeric expressions and type float', function () {
-        // Case: Update for a Float attribute with arithmetic expression
+    describe('When an update comes for attributes without expressions and Boolean type', function () {
+        // Case: Update for a Boolean attribute without expression
 
         const values = [
             {
-                name: 'e',
-                type: 'Number',
-                value: 0.44
+                name: 'u',
+                type: 'Boolean',
+                value: true
             }
         ];
 
@@ -471,20 +700,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/ws1/attrs',
+                .patch(
+                    '/v2/entities/light1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin8.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin9.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
+                .query({ type: 'Light' })
                 .reply(204);
         });
 
         it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('ws1', 'WeatherStation', '', values, function (error) {
+            iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -492,14 +721,13 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes with string expressions and type float', function () {
-        // Case: Update for a Float attribute with string expression
-
+    describe('When an update comes for attributes without expressions and Object type', function () {
+        // Case: Update for a JSON document attribute without expression
         const values = [
             {
-                name: 'e',
-                type: 'Number',
-                value: 0.44
+                name: 'm',
+                type: 'Object',
+                value: { name: 'Manufacturer1', VAT: 'U12345678' }
             }
         ];
 
@@ -507,20 +735,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/ws1/attrs',
+                .patch(
+                    '/v2/entities/light1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin3.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin6.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
+                .query({ type: 'Light' })
                 .reply(204);
         });
 
         it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('ws1', 'WeatherStationMultiple', '', values, function (error) {
+            iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -528,14 +756,14 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes without expressions and NULL type', function () {
-        // Case: Update for a Null attribute without expression
+    describe('When an update comes for attributes without expressions and Object type', function () {
+        // Case: Update for a JSON array attribute without expression
 
         const values = [
             {
-                name: 'a',
-                type: 'None',
-                value: null
+                name: 'r',
+                type: 'Object',
+                value: ['v0.1', 'v0.2', 'v0.3']
             }
         ];
 
@@ -543,12 +771,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin5.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin7.json'
                     )
                 )
                 .query({ type: 'Light' })
@@ -564,14 +792,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes with numeric expressions and NULL type', function () {
-        // Case: Update for a Null attribute with arithmetic expression
-
+    describe('When there are expressions including other attributes and they are not updated', function () {
         const values = [
             {
-                name: 'a',
-                type: 'None',
-                value: null
+                name: 'x',
+                type: 'Number',
+                value: 0.44
             }
         ];
 
@@ -579,20 +805,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/ws1/attrs',
+                .patch(
+                    '/v2/entities/light1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin5.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin12.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
+                .query({ type: 'Light' })
                 .reply(204);
         });
 
         it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('ws1', 'WeatherStation', '', values, function (error) {
+            iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -600,14 +826,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes with string expressions and NULL type', function () {
-        // Case: Update for a Null attribute with string expression
-
+    describe('When there are expressions including other attributes and they are updated', function () {
         const values = [
             {
-                name: 'a',
-                type: 'None',
-                value: null
+                name: 'p',
+                type: 'Number',
+                value: 10
             }
         ];
 
@@ -615,20 +839,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/ws1/attrs',
+                .patch(
+                    '/v2/entities/light1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin5.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin13.json'
                     )
                 )
-                .query({ type: 'WeatherStation' })
+                .query({ type: 'Light' })
                 .reply(204);
         });
 
         it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('ws1', 'WeatherStationMultiple', '', values, function (error) {
+            iotAgentLib.update('light1', 'Light', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -636,14 +860,17 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes without expressions and Boolean type', function () {
-        // Case: Update for a Boolean attribute without expression
-
+    describe('When there are expressions including other attributes and they are updated (overriding situation)', function () {
         const values = [
             {
-                name: 'u',
-                type: 'Boolean',
-                value: true
+                name: 'x',
+                type: 'Number',
+                value: 0.44
+            },
+            {
+                name: 'p',
+                type: 'Number',
+                value: 10
             }
         ];
 
@@ -651,12 +878,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/light1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin9.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin13.json'
                     )
                 )
                 .query({ type: 'Light' })
@@ -672,14 +899,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes with numeric expressions and Boolean type', function () {
-        // Case: Update for a Boolean attribute with arithmetic expression
-
+    describe('When a measure arrives and there is not enough information to calculate an expression', function () {
         const values = [
             {
-                name: 'u',
-                type: 'Boolean',
-                value: true
+                name: 'p',
+                type: 'centigrades',
+                value: '52'
             }
         ];
 
@@ -687,19 +912,19 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/ws1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin10.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin29.json'
                     )
                 )
                 .query({ type: 'WeatherStation' })
                 .reply(204);
         });
 
-        it('should apply the expression before sending the values', function (done) {
+        it('should not calculate the expression', function (done) {
             iotAgentLib.update('ws1', 'WeatherStation', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
@@ -707,14 +932,12 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             });
         });
     });
-
-    describe('When an update comes for attributes with string expressions and Boolean type', function () {
-        // Case: Update for a Boolean attribute with string expression
+    describe('When a measure arrives and there is not enough information to calculate an expression', function () {
         const values = [
             {
                 name: 'u',
-                type: 'Boolean',
-                value: true
+                type: 'json',
+                value: '{}'
             }
         ];
 
@@ -722,20 +945,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
+                .patch(
                     '/v2/entities/ws1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin9.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin31.json'
                     )
                 )
                 .query({ type: 'WeatherStation' })
                 .reply(204);
         });
 
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('ws1', 'WeatherStationMultiple', '', values, function (error) {
+        it('should not calculate the expression and allow falsy values', function (done) {
+            iotAgentLib.update('ws1', 'WeatherStationUndef', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -743,13 +966,23 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes without expressions and Object type', function () {
-        // Case: Update for a JSON document attribute without expression
+    describe('When there are additional attributes sent by the device to be calculated and removed', function () {
+        // Case: Expression which results is sent as a new attribute
         const values = [
             {
-                name: 'm',
-                type: 'Object',
-                value: { name: 'Manufacturer1', VAT: 'U12345678' }
+                name: 'lat',
+                type: 'Number',
+                value: 52
+            },
+            {
+                name: 'lon',
+                type: 'Number',
+                value: 13
+            },
+            {
+                name: 'ts',
+                type: 'Number',
+                value: 1
             }
         ];
 
@@ -757,20 +990,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/light1/attrs',
+                .patch(
+                    '/v2/entities/gps1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin6.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin32.json'
                     )
                 )
-                .query({ type: 'Light' })
+                .query({ type: 'GPS' })
                 .reply(204);
         });
 
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'Light', '', values, function (error) {
+        it('should calculate them and remove non-explicitAttrs from the payload', function (done) {
+            iotAgentLib.update('gps1', 'GPS', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -778,14 +1011,68 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When an update comes for attributes without expressions and Object type', function () {
-        // Case: Update for a JSON array attribute without expression
+    describe('When there is an extra TimeInstant sent by the device to be removed', function () {
+        // Case: Expression which results is sent as a new attribute
+        const values = [
+            {
+                name: 'lat',
+                type: 'Number',
+                value: 52
+            },
+            {
+                name: 'lon',
+                type: 'Number',
+                value: 13
+            },
+            {
+                name: 'TimeInstant',
+                type: 'DateTime',
+                value: '2015-08-05T07:35:01.468+00:00'
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .patch(
+                    '/v2/entities/gps1/attrs',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json'
+                    )
+                )
+                .query({ type: 'GPS' })
+                .reply(204);
+        });
 
+        it('should calculate them and remove non-explicitAttrs from the payload', function (done) {
+            iotAgentLib.update('gps1', 'GPS2', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+
+    describe('When there is an extra TimeInstant sent by the device to be removed by string', function () {
+        // Case: Expression which results is sent as a new attribute
         const values = [
             {
-                name: 'r',
-                type: 'Object',
-                value: ['v0.1', 'v0.2', 'v0.3']
+                name: 'lat',
+                type: 'Number',
+                value: 52
+            },
+            {
+                name: 'lon',
+                type: 'Number',
+                value: 13
+            },
+            {
+                name: 'TimeInstant',
+                type: 'DateTime',
+                value: '2015-08-05T07:35:01.468+00:00'
             }
         ];
 
@@ -793,20 +1080,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/light1/attrs',
+                .patch(
+                    '/v2/entities/gps1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin7.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json'
                     )
                 )
-                .query({ type: 'Light' })
+                .query({ type: 'GPS' })
                 .reply(204);
         });
 
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'Light', '', values, function (error) {
+        it('should calculate them and remove non-explicitAttrs by string from the payload', function (done) {
+            iotAgentLib.update('gps1', 'GPS3', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -814,12 +1101,23 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When there are expressions including other attributes and they are not updated', function () {
+    describe('When there is an extra TimeInstant sent by the device to be removed by jexl expression', function () {
+        // Case: Expression which results is sent as a new attribute
         const values = [
             {
-                name: 'x',
+                name: 'lat',
                 type: 'Number',
-                value: 0.44
+                value: 52
+            },
+            {
+                name: 'lon',
+                type: 'Number',
+                value: 13
+            },
+            {
+                name: 'TimeInstant',
+                type: 'DateTime',
+                value: '2015-08-05T07:35:01.468+00:00'
             }
         ];
 
@@ -827,20 +1125,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/light1/attrs',
+                .patch(
+                    '/v2/entities/gps1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin12.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json'
                     )
                 )
-                .query({ type: 'Light' })
+                .query({ type: 'GPS' })
                 .reply(204);
         });
 
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'Light', '', values, function (error) {
+        it('should calculate them and remove non-explicitAttrs by jexl expression from the payload', function (done) {
+            iotAgentLib.update('gps1', 'GPS4', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -848,12 +1146,28 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When there are expressions including other attributes and they are updated', function () {
+    describe('When there is an extra TimeInstant sent by the device to be removed by jexl expression with context ', function () {
+        // Case: Expression which results is sent as a new attribute
         const values = [
             {
-                name: 'p',
+                name: 'lat',
                 type: 'Number',
-                value: 10
+                value: 52
+            },
+            {
+                name: 'lon',
+                type: 'Number',
+                value: 13
+            },
+            {
+                name: 'myattr',
+                type: 'String',
+                value: 'location'
+            },
+            {
+                name: 'TimeInstant',
+                type: 'DateTime',
+                value: '2015-08-05T07:35:01.468+00:00'
             }
         ];
 
@@ -861,20 +1175,20 @@ describe('Java expression language (JEXL) based transformations plugin', functio
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/light1/attrs',
+                .patch(
+                    '/v2/entities/gps1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin13.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json'
                     )
                 )
-                .query({ type: 'Light' })
+                .query({ type: 'GPS' })
                 .reply(204);
         });
 
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'Light', '', values, function (error) {
+        it('should calculate them and remove non-explicitAttrs by jexl expression with context from the payload ', function (done) {
+            iotAgentLib.update('gps1', 'GPS5', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();
@@ -882,38 +1196,108 @@ describe('Java expression language (JEXL) based transformations plugin', functio
         });
     });
 
-    describe('When there are expressions including other attributes and they are updated (overriding situation)', function () {
+    describe('When there is an extra TimeInstant sent by the device to be removedb jexl expression using static attrs', function () {
+        // Case: Expression which results is sent as a new attribute
         const values = [
             {
-                name: 'x',
+                name: 'TimeInstant',
+                type: 'DateTime',
+                value: '2015-08-05T07:35:01.468+00:00'
+            }
+        ];
+
+        beforeEach(function () {
+            nock.cleanAll();
+
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', 'gardens')
+                .patch(
+                    '/v2/entities/gps1/attrs',
+                    utils.readExampleFile(
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json'
+                    )
+                )
+                .query({ type: 'GPS' })
+                .reply(204);
+        });
+
+        it('should calculate them and remove non-explicitAttrs from the payload', function (done) {
+            iotAgentLib.update('gps1', 'GPS6', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
+            });
+        });
+    });
+});
+
+describe('Java expression language (JEXL) based transformations plugin - Timestamps', function () {
+    beforeEach(function (done) {
+        logger.setLevel('FATAL');
+
+        iotAgentLib.activate(iotAgentConfigTS, function () {
+            iotAgentLib.clearAll(function () {
+                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
+                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
+                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
+                done();
+            });
+        });
+    });
+
+    afterEach(function (done) {
+        iotAgentLib.clearAll(function () {
+            iotAgentLib.deactivate(done);
+        });
+    });
+
+    describe('When timestamps are added but are not explicitly defined', function () {
+        // Case: Expression which results is sent as a new attribute
+        const values = [
+            {
+                name: 'lat',
                 type: 'Number',
-                value: 0.44
+                value: 52
             },
             {
-                name: 'p',
+                name: 'lon',
                 type: 'Number',
-                value: 10
+                value: 13
+            },
+            {
+                name: 'ts',
+                type: 'Number',
+                value: 1
             }
         ];
 
         beforeEach(function () {
+            const time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
+
+            timekeeper.freeze(time);
             nock.cleanAll();
 
             contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartGondor')
+                .matchHeader('fiware-service', 'smartgondor')
                 .matchHeader('fiware-servicepath', 'gardens')
-                .post(
-                    '/v2/entities/light1/attrs',
+                .patch(
+                    '/v2/entities/gps1/attrs',
                     utils.readExampleFile(
-                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin13.json'
+                        './test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin33.json'
                     )
                 )
-                .query({ type: 'Light' })
+                .query({ type: 'GPS' })
                 .reply(204);
         });
 
-        it('should apply the expression before sending the values', function (done) {
-            iotAgentLib.update('light1', 'Light', '', values, function (error) {
+        afterEach(function (done) {
+            timekeeper.reset();
+            done();
+        });
+
+        it('should calculate them and not remove the timestamp from the payload', function (done) {
+            iotAgentLib.update('gps1', 'GPS', '', values, function (error) {
                 should.not.exist(error);
                 contextBrokerMock.done();
                 done();