Skip to content

Prepend NGSI-v1 to the v1 tests, NGSI-v2 to the v2 tests #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 11, 2020
Merged

Prepend NGSI-v1 to the v1 tests, NGSI-v2 to the v2 tests #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9447878
Prepend NGSI-v2 to the v2 tests
jason-fox Feb 7, 2020
72a27f4
Prepend NGSI-v2 to the v2 tests
jason-fox Feb 7, 2020
718ca29
Prepend NGSI-v1 to the v1 tests
jason-fox Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/unit/expressions/expressionBasedTransformations-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
deviceRegistrationDuration: 'P1M'
};

describe('Expression-based transformations plugin', function() {
describe('NGSI-v1 - Expression-based transformations plugin', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
2 changes: 1 addition & 1 deletion test/unit/general/contextBrokerKeystoneSecurityAccess-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
deviceRegistrationDuration: 'P1M'
};

describe('Secured access to the Context Broker with Keystone', function() {
describe('NGSI-v1 - Secured access to the Context Broker with Keystone', function() {
var values = [
{
name: 'state',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/general/contextBrokerOAuthSecurityAccess-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
deviceRegistrationDuration: 'P1M'
};

describe('Secured access to the Context Broker with OAuth2 provider', function() {
describe('NGSI-v1 - Secured access to the Context Broker with OAuth2 provider', function() {
var values = [
{
name: 'state',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/general/deviceService-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),


/* jshint camelcase: false */
describe('Device Service: utils', function() {
describe('NGSI-v1 - Device Service: utils', function() {
beforeEach(function(done) {
nock.cleanAll();
logger.setLevel('FATAL');
Expand Down
4 changes: 2 additions & 2 deletions test/unit/general/https-support-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
iotamMock;


describe('HTTPS support tests IOTAM', function() {
describe('NGSI-v1 - HTTPS support tests IOTAM', function() {

describe('When the IoT Agents is started with https "iotManager" config', function() {
beforeEach(function(done) {
Expand Down Expand Up @@ -154,7 +154,7 @@ describe('HTTPS support tests IOTAM', function() {
});
});

describe('HTTPS support tests', function() {
describe('NGSI-v1 - HTTPS support tests', function() {

describe('When subscription is sent to HTTPS context broker', function() {
beforeEach(function(done) {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/general/iotam-autoregistration-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
},
iotamMock;

describe('IoT Manager autoregistration', function() {
describe('NGSI-v1 - IoT Manager autoregistration', function() {
describe('When the IoT Agent is started without a "iotManager" config parameter and empty services', function() {
beforeEach(function() {
nock.cleanAll();
Expand Down
2 changes: 1 addition & 1 deletion test/unit/general/startup-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
iotAgentConfigNoTypes = _.clone(iotAgentConfig),
iotamMock;

describe('Startup tests', function() {
describe('NGSI-v1 - Startup tests', function() {
describe('When the IoT Agent is started without a "providerUrl" config parameter', function() {
beforeEach(function() {
delete iotAgentConfigNoUrl.providerUrl;
Expand Down
2 changes: 1 addition & 1 deletion test/unit/lazyAndCommands/active-devices-attribute-update-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
subservice: 'gardens'
};

describe('Update attribute functionalities', function() {
describe('NGSI-v1 - Update attribute functionalities', function() {

beforeEach(function(done) {
logger.setLevel('FATAL');
Expand Down
2 changes: 1 addition & 1 deletion test/unit/lazyAndCommands/command-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
subservice: 'gardens'
};

describe('Command functionalities', function() {
describe('NGSI-v1 - Command functionalities', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
2 changes: 1 addition & 1 deletion test/unit/lazyAndCommands/lazy-devices-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
}
};

describe('IoT Agent Lazy Devices', function() {
describe('NGSI-v1 - IoT Agent Lazy Devices', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');
mongoUtils.cleanDbs(done);
Expand Down
2 changes: 1 addition & 1 deletion test/unit/lazyAndCommands/polling-commands-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
polling: true
};

describe('Polling commands', function() {
describe('NGSI-v1 - Polling commands', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiService/active-devices-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
deviceRegistrationDuration: 'P1M'
};

describe('Active attributes test', function() {
describe('NGSI-v1 - Active attributes test', function() {
var values = [
{
name: 'state',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiService/staticAttributes-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
};


describe('Static attributes test', function() {
describe('NGSI-v1 - Static attributes test', function() {
var values = [
{
name: 'state',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiService/subscriptions-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
deviceRegistrationDuration: 'P1M'
};

describe('Subscription tests', function() {
describe('NGSI-v1 - Subscription tests', function() {
beforeEach(function(done) {
var optionsProvision = {
url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/expressions/expressionBasedTransformations-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Expression-based transformations plugin', function() {
describe('NGSI-v2 - Expression-based transformations plugin', function() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure but many of these tests are "parallel" to existing ones in NGSIv1 (maybe @dcalvoalonso could confirm, as he did great part of the implementation).

In that case, maybe it's a good idea to add a 'NGSI-v1 - prefix also in those ones, for the sake of completeness.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed 718ca29

beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
8 changes: 4 additions & 4 deletions test/unit/ngsiv2/general/contextBrokerOAuthSecurityAccess-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Secured access to the Context Broker with OAuth2 provider', function() {
describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider', function() {
var values = [
{
name: 'state',
Expand Down Expand Up @@ -344,7 +344,7 @@ describe('Secured access to the Context Broker with OAuth2 provider', function()
});
});

describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)', function() {
describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)', function() {

var values = [
{
Expand Down Expand Up @@ -527,7 +527,7 @@ describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyr
});
});

describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)' +
describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)' +
'configured through group provisioning', function() {
var groupCreation = {
url: 'http://localhost:4041/iot/services',
Expand Down Expand Up @@ -727,7 +727,7 @@ describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyr
});
});

describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)' +
describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)' +
'configured through group provisioning. Permanent token', function() {
var groupCreation = {
url: 'http://localhost:4041/iot/services',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/general/deviceService-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),


/* jshint camelcase: false */
describe('Device Service: utils', function() {
describe('NGSI-v2 - Device Service: utils', function() {
beforeEach(function(done) {
nock.cleanAll();
logger.setLevel('FATAL');
Expand Down
4 changes: 2 additions & 2 deletions test/unit/ngsiv2/general/https-support-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
iotamMock;


describe('HTTPS support tests IOTAM', function() {
describe('NGSI-v2 - HTTPS support tests IOTAM', function() {

describe('When the IoT Agents is started with https "iotManager" config', function() {
beforeEach(function(done) {
Expand Down Expand Up @@ -154,7 +154,7 @@ describe('HTTPS support tests IOTAM', function() {
});
});

describe('HTTPS support tests', function() {
describe('NGSI-v2 - HTTPS support tests', function() {

describe('When subscription is sent to HTTPS context broker', function() {
beforeEach(function(done) {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/general/iotam-autoregistration-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
},
iotamMock;

describe('IoT Manager autoregistration', function() {
describe('NGSI-v2 - IoT Manager autoregistration', function() {
describe('When the IoT Agent is started without a "iotManager" config parameter and empty services', function() {
beforeEach(function() {
nock.cleanAll();
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/general/startup-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
},
iotamMock;

describe('Startup tests', function() {
describe('NGSI-v2 - Startup tests', function() {

describe('When the IoT Agent is started with environment variables', function() {
beforeEach(function() {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/lazyAndCommands/active-devices-attribute-update-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
subservice: 'gardens'
};

describe('Update attribute functionalities', function() {
describe('NGSI-v2 - Update attribute functionalities', function() {

beforeEach(function(done) {
logger.setLevel('FATAL');
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/lazyAndCommands/command-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
subservice: 'gardens'
};

describe('Command functionalities', function() {
describe('NGSI-v2 - Command functionalities', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');
var time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/lazyAndCommands/lazy-devices-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
}
};

describe('IoT Agent Lazy Devices', function() {
describe('NGSI-v2 - IoT Agent Lazy Devices', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/lazyAndCommands/polling-commands-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
polling: true
};

describe('Polling commands', function() {
describe('NGSI-v2 - Polling commands', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/ngsiService/active-devices-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Active attributes test', function() {
describe('NGSI-v2 - Active attributes test', function() {
var values = [
{
name: 'state',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/ngsiService/autocast-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('JSON native types autocast test', function() {
describe('NGSI-v2 - JSON native types autocast test', function() {
beforeEach(function() {
logger.setLevel('FATAL');
});
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/ngsiService/staticAttributes-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
};


describe('Static attributes test', function() {
describe('NGSI-v2 - Static attributes test', function() {
var values = [
{
name: 'state',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/ngsiService/subscriptions-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Subscription tests', function() {
describe('NGSI-v2 - Subscription tests', function() {
beforeEach(function(done) {
var optionsProvision = {
url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/plugins/alias-plugin_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Attribute alias plugin', function() {
describe('NGSI-v2 - Attribute alias plugin', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
4 changes: 2 additions & 2 deletions test/unit/ngsiv2/plugins/bidirectional-plugin_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Bidirectional data plugin', function() {
describe('NGSI-v2 - Bidirectional data plugin', function() {
var options = {
url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
method: 'POST',
Expand Down Expand Up @@ -388,7 +388,7 @@ describe('Bidirectional data plugin', function() {
});
});

describe('Bidirectional data plugin and CB is defined using environment variables', function() {
describe('NGSI-v2 - Bidirectional data plugin and CB is defined using environment variables', function() {
var options = {
url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
method: 'POST',
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/plugins/compress-timestamp-plugin_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Timestamp compression plugin', function() {
describe('NGSI-v2 - Timestamp compression plugin', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');
iotAgentLib.activate(iotAgentConfig, function() {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/plugins/event-plugin_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Event plugin', function() {
describe('NGSI-v2 - Event plugin', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
6 changes: 3 additions & 3 deletions test/unit/ngsiv2/plugins/multientity-plugin_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Multi-entity plugin', function() {
describe('NGSI-v2 - Multi-entity plugin', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down Expand Up @@ -526,7 +526,7 @@ describe('Multi-entity plugin', function() {

});

describe('Multi-entity plugin is executed before timestamp process plugin', function() {
describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plugin', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down Expand Up @@ -692,7 +692,7 @@ describe('Multi-entity plugin is executed before timestamp process plugin', func
});
});

describe('Multi-entity plugin is executed for a command update for a regular entity ', function () {
describe('NGSI-v2 - Multi-entity plugin is executed for a command update for a regular entity ', function () {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/plugins/timestamp-processing-plugin_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Timestamp processing plugin', function() {
describe('NGSI-v2 - Timestamp processing plugin', function() {
beforeEach(function(done) {
logger.setLevel('FATAL');

Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/provisioning/device-provisioning-api_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
providerUrl: 'http://smartGondor.com'
};

describe('Device provisioning API: Provision devices', function() {
describe('NGSI-v2 - Device provisioning API: Provision devices', function() {
beforeEach(function(done) {
nock.cleanAll();

Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/provisioning/device-registration_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
subservice: 'gardens'
};

describe('IoT Agent Device Registration', function() {
describe('NGSI-v2 - IoT Agent Device Registration', function() {
beforeEach(function() {
logger.setLevel('FATAL');
});
Expand Down
Loading