Merge pull request #737 from telefonicaid/task/do_not_create_initial_…

…entity remove initial entity from mocks
telefonicaid · Aug 9, 2023 · 6aa26c7 · 6aa26c7
2 parents ef782f8 + 372db01
commit 6aa26c7
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 206 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+- Fix: update tests to not create initial entity when append mode is enabled
 - Fix: update tests according new default value for appendMode
 - Fix: use 'options=upsert' when update ngsiv2 CB entities and appendMode is enabled (iotagent-node-lib#956)
 - Fix: do not propagate group config (timestamp and explicitAttrs) to autoprovisioned devices (at database level) (iotagent-node-lib#1377)

diff --git a/test/unit/ngsiv2/HTTP_commands_test.js b/test/unit/ngsiv2/HTTP_commands_test.js
@@ -58,12 +58,6 @@ describe('HTTP: Commands', function () {
             .post('/v2/registrations')
             .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-        contextBrokerMock
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
-
         iotagentMqtt.start(config, function () {
             request(provisionOptions, function (error, response, body) {
                 done();
@@ -159,12 +153,6 @@ describe('HTTP: Commands with expressions', function () {
             .post('/v2/registrations')
             .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-        contextBrokerMock
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
-
         iotagentMqtt.start(config, function () {
             request(provisionOptions, function (error, response, body) {
                 done();

diff --git a/test/unit/ngsiv2/HTTP_get-configuration_test.js b/test/unit/ngsiv2/HTTP_get-configuration_test.js
@@ -56,12 +56,6 @@ describe('HTTP: Get configuration from the devices', function () {
             .post('/v2/registrations')
             .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-        contextBrokerMock
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
-
         oldConfigurationFlag = config.configRetrieval;
         config.configRetrieval = true;
 

diff --git a/test/unit/ngsiv2/HTTP_receive_measures-test3.js b/test/unit/ngsiv2/HTTP_receive_measures-test3.js
@@ -82,11 +82,7 @@ describe('HTTP: Measure reception ', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026');
 
         iotaJson.start(config, function () {
             request(provisionOptions, function (error, response, body) {

diff --git a/test/unit/ngsiv2/HTTP_reveice_measures-test.js b/test/unit/ngsiv2/HTTP_reveice_measures-test.js
@@ -82,11 +82,7 @@ describe('HTTP: Measure reception ', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026');
 
         iotaJson.start(config, function () {
             request(provisionOptions, function (error, response, body) {
@@ -186,11 +182,7 @@ describe('HTTP: Measure reception ', function () {
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder of iotagent-node-lib
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerMock = nock('http://192.168.1.1:1026');
 
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
@@ -253,11 +245,7 @@ describe('HTTP: Measure reception ', function () {
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder of iotagent-node-lib
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerMock = nock('http://192.168.1.1:1026');
 
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
@@ -320,11 +308,7 @@ describe('HTTP: Measure reception ', function () {
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder of iotagent-node-lib
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerMock = nock('http://192.168.1.1:1026');
 
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
@@ -387,11 +371,7 @@ describe('HTTP: Measure reception ', function () {
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder of iotagent-node-lib
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerMock = nock('http://192.168.1.1:1026');
 
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
@@ -442,11 +422,7 @@ describe('HTTP: Measure reception ', function () {
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
         beforeEach(function (done) {
-            contextBrokerUnprovMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerUnprovMock = nock('http://192.168.1.1:1026');
 
             contextBrokerUnprovMock
                 .matchHeader('fiware-service', 'smartgondor')

diff --git a/test/unit/ngsiv2/HTTP_reveice_measures-test2.js b/test/unit/ngsiv2/HTTP_reveice_measures-test2.js
@@ -82,11 +82,7 @@ describe('HTTP: Measure reception ', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026');
 
         iotaJson.start(config, function () {
             request(provisionOptions, function (error, response, body) {
@@ -213,11 +209,7 @@ describe('HTTP: Measure reception ', function () {
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder of iotagent-node-lib
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerMock = nock('http://192.168.1.1:1026');
 
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
@@ -293,11 +285,7 @@ describe('HTTP: Measure reception ', function () {
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder of iotagent-node-lib
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerMock = nock('http://192.168.1.1:1026');
 
             contextBrokerMock
                 .matchHeader('fiware-service', 'smartgondor')
@@ -363,11 +351,7 @@ describe('HTTP: Measure reception ', function () {
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
         beforeEach(function (done) {
-            contextBrokerUnprovMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerUnprovMock = nock('http://192.168.1.1:1026');
 
             contextBrokerUnprovMock
                 .matchHeader('fiware-service', 'smartgondor')

diff --git a/test/unit/ngsiv2/MQTT_commands_test.js b/test/unit/ngsiv2/MQTT_commands_test.js
@@ -67,12 +67,6 @@ describe('MQTT: Commands', function () {
             .post('/v2/registrations')
             .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-        contextBrokerMock
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
-
         iotagentMqtt.start(config, function () {
             request(provisionOptions, function (error, response, body) {
                 done();

diff --git a/test/unit/ngsiv2/MQTT_get-configuration_test.js b/test/unit/ngsiv2/MQTT_get-configuration_test.js
@@ -56,11 +56,7 @@ describe('MQTT: Get configuration from the devices', function () {
             connectTimeout: 60 * 60 * 1000
         });
 
-        contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026');
 
         oldConfigurationFlag = config.configRetrieval;
         config.configRetrieval = true;

diff --git a/test/unit/ngsiv2/MQTT_receive_measures-test.js b/test/unit/ngsiv2/MQTT_receive_measures-test.js
@@ -88,11 +88,7 @@ describe('MQTT: Measure reception ', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026');
 
         iotaJson.start(config, function () {
             request(provisionOptions, function (error, response, body) {
@@ -168,11 +164,7 @@ describe('MQTT: Measure reception ', function () {
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder of iotagent-node-lib
-            contextBrokerUnprovMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerUnprovMock = nock('http://192.168.1.1:1026');
 
             contextBrokerUnprovMock
                 .matchHeader('fiware-service', 'smartgondor')

diff --git a/test/unit/ngsiv2/MQTT_receive_measures-test2.js b/test/unit/ngsiv2/MQTT_receive_measures-test2.js
@@ -88,11 +88,7 @@ describe('MQTT: Measure reception ', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026');
 
         iotaJson.start(config, function () {
             request(provisionOptions, function (error, response, body) {
@@ -205,11 +201,7 @@ describe('MQTT: Measure reception ', function () {
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder of iotagent-node-lib
-            contextBrokerUnprovMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .matchHeader('fiware-servicepath', '/gardens')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerUnprovMock = nock('http://192.168.1.1:1026');
 
             contextBrokerUnprovMock
                 .matchHeader('fiware-service', 'smartgondor')

diff --git a/test/unit/ngsiv2/_subscription-management_test.js b/test/unit/ngsiv2/_subscription-management_test.js
@@ -79,11 +79,7 @@ describe('Subscription management', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://192.168.1.1:1026', { allowUnmocked: false })
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026', { allowUnmocked: false });
 
         iotaJson.start(config, function () {
             iotAgentLib.clearAll(done);

diff --git a/test/unit/ngsiv2/amqpBinding-test.js b/test/unit/ngsiv2/amqpBinding-test.js
@@ -73,11 +73,7 @@ describe('AMQP Transport binding: measures', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026');
 
         async.series(
             [
@@ -135,11 +131,7 @@ describe('AMQP Transport binding: measures', function () {
             // This mock does not check the payload since the aim of the test is not to verify
             // device provisioning functionality. Appropriate verification is done in tests under
             // provisioning folder of iotagent-node-lib
-            contextBrokerUnprovMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'TestService')
-                .matchHeader('fiware-servicepath', '/testingPath')
-                .post('/v2/entities?options=upsert')
-                .reply(204);
+            contextBrokerUnprovMock = nock('http://192.168.1.1:1026');
 
             contextBrokerUnprovMock
                 .matchHeader('fiware-service', 'TestService')

diff --git a/test/unit/ngsiv2/amqpBinding-test2.js b/test/unit/ngsiv2/amqpBinding-test2.js
@@ -73,11 +73,7 @@ describe('AMQP Transport binding: multiple measures', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026');
 
         async.series(
             [

diff --git a/test/unit/ngsiv2/attribute-alias_test.js b/test/unit/ngsiv2/attribute-alias_test.js
@@ -59,11 +59,7 @@ describe('Attribute alias', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://192.168.1.1:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://192.168.1.1:1026');
 
         iotaJson.start(config, function () {
             request(provisionOptions, function (error, response, body) {

diff --git a/test/unit/ngsiv2/commandsAmqp-test.js b/test/unit/ngsiv2/commandsAmqp-test.js
@@ -76,12 +76,6 @@ describe('AMQP Transport binding: commands', function () {
             .post('/v2/registrations')
             .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-        contextBrokerMock
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
-
         oldTransport = config.defaultTransport;
         config.defaultTransport = 'AMQP';
 

diff --git a/test/unit/ngsiv2/commandsPolling-test.js b/test/unit/ngsiv2/commandsPolling-test.js
@@ -66,12 +66,6 @@ describe('HTTP Transport binding: polling commands', function () {
             .post('/v2/registrations')
             .reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
 
-        contextBrokerMock
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
-
         mockedClientServer = nock('http://localhost:9876')
             .post('/command', 'MQTT_2@PING|data=22')
             .reply(200, 'MQTT_2@PING|1234567890');

diff --git a/test/unit/ngsiv2/configuration-api_test.js b/test/unit/ngsiv2/configuration-api_test.js
@@ -99,11 +99,7 @@ describe('Configuration API support', function () {
         // This mock does not check the payload since the aim of the test is not to verify
         // device provisioning functionality. Appropriate verification is done in tests under
         // provisioning folder of iotagent-node-lib
-        contextBrokerMock = nock('http://unexistentHost:1026')
-            .matchHeader('fiware-service', 'smartgondor')
-            .matchHeader('fiware-servicepath', '/gardens')
-            .post('/v2/entities?options=upsert')
-            .reply(204);
+        contextBrokerMock = nock('http://unexistentHost:1026');
 
         iotagentJson.start(config, done);
     });