Linting codebase

- Remove console.error statements.
- Allow for disabled tests.
- remove unused comparision

Author: jason-fox

lib/services/devices/deviceService.js

@@ -334,8 +334,6 @@ function executeWithSecurity(requestOptions, deviceData, callback) {
                             callback(new errors.SecurityInformationMissing(typeInformation.type));
                         }
                         else {
-
-                            // console.error(JSON.stringify(requestOptions, null, 4));
                             requestOptions.headers[config.getConfig().authentication.header] = token;
                             request(requestOptions, callback);
                         }
@@ -345,7 +343,6 @@ function executeWithSecurity(requestOptions, deviceData, callback) {
                         typeInformation ? typeInformation.type : deviceData.type));
                 }
             } else {
-               // console.error(JSON.stringify(requestOptions, null, 4));
                 request(requestOptions, callback);
             }
         });
@@ -453,9 +450,6 @@ function createInitialEntityNgsi2(deviceData, newDevice, callback) {
             value: moment()
         };
     }
-
-      // console.error(JSON.stringify(options, null, 4));
-
     logger.debug(context, 'Creating initial entity in the Context Broker:\n %s', JSON.stringify(options, null, 4));
     executeWithSecurity(options, newDevice, createInitialEntityHandlerNgsi2(deviceData, newDevice, callback));
 }

lib/services/ngsi/ngsiService.js

@@ -893,8 +893,6 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
             logger.debug(context, 'Updating device value in the Context Broker at [%s]', options.url);
             logger.debug(context, 'Using the following NGSI-LD request:\n\n%s\n\n', JSON.stringify(options, null, 4));
 
-             // console.error(JSON.stringify(options.json, null, 4))
-
             request(options,
                 generateNGSILDOperationHandler('update', entityName, typeInformation, token, options, callback));
         }
@@ -975,16 +973,9 @@ function sendUpdateValueNgsi1(entityName, attributes, typeInformation, token, ca
 
             }
 
-
-             
-
-
             logger.debug(context, 'Updating device value in the Context Broker at [%s]', options.url);
             logger.debug(context, 'Using the following NGSI-v1 request:\n\n%s\n\n', JSON.stringify(options, null, 4));
 
-
-            // console.error(JSON.stringify(options.json, null, 4))
-
             request(options,
                 generateNGSIOperationHandler('update', entityName, typeInformation, token, options, callback));
         }

lib/services/ngsi/subscriptionService.js

@@ -198,8 +198,6 @@ function subscribeNgsi1(device, triggers, content, callback) {
  * @param {Object} content      Array with the names of the attributes to retrieve in the notification.
  */
 function subscribeNgsi2(device, triggers, content, callback) {
-
-   // console.error(device);
    var options = {
         method: 'POST',
         headers: {
@@ -243,8 +241,6 @@ function subscribeNgsi2(device, triggers, content, callback) {
     } else {
         options.uri = config.getConfig().contextBroker.url + '/v2/subscriptions';
     }
-
-    // console.error(JSON.stringify(options));
     deviceService.executeWithSecurity(options,
         device, createSubscriptionHandlerNgsi2(device, triggers, store, callback));
 }
@@ -259,18 +255,14 @@ function subscribeNgsi2(device, triggers, content, callback) {
  * @param {Object} triggers     Array with the names of the attributes that would trigger the subscription
  * @param {Object} content      Array with the names of the attributes to retrieve in the notification.
  */
-function subscribeNgsiLD(device, triggers, content, callback) {
-
-   // console.error(JSON.stringify(device))
-
-   
+function subscribeNgsiLD(device, triggers, content, callback) {   
    var options = {
         method: 'POST',
         headers: {
             'fiware-service': device.service
         },
         json: {
-            type: "Subscription",
+            type: 'Subscription',
             entities: [
                         {
                             id: device.name,
@@ -301,8 +293,6 @@ function subscribeNgsiLD(device, triggers, content, callback) {
     } else {
         options.uri = config.getConfig().contextBroker.url + '/ngsi-ld/v1/subscriptions/';
     }
-
-     // console.error(JSON.stringify(options));
     deviceService.executeWithSecurity(options,
         device, createSubscriptionHandlerNgsi2(device, triggers, store, callback));
 }
@@ -320,7 +310,6 @@ function subscribe(device, triggers, content, callback) {
     if (config.checkNgsiLD()) {
         subscribeNgsiLD(device, triggers, content, callback);
     } else if (config.checkNgsi2()) {
-        // console.error(device);
         subscribeNgsi2(device, triggers, content, callback);
     } else {
         subscribeNgsi1(device, triggers, content, callback);

test/.jshintrc

@@ -30,6 +30,6 @@
     },
     "predef":
         [
-            "describe", "beforeEach", "afterEach", "it"
+            "describe", "beforeEach", "afterEach", "it", "xdescribe", "xit"
         ]
 }

test/unit/ngsi-ld/general/https-support-test.js

@@ -230,10 +230,8 @@ describe('NGSI-LD - HTTPS support tests', function() {
                 .matchHeader('fiware-service', 'smartGondor')
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .reply(200);
-
-            var nockBody = utils.readExampleFile(
-                './test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent1.json');
-            contextBrokerMock
+ 
+            contextBrokerMock = nock('https://192.168.1.1:1026')
                 .matchHeader('fiware-service', 'smartGondor')
                 .post('/ngsi-ld/v1/csourceRegistrations/')
                 .reply(201, null, {'Location': '/v2/registrations/6319a7f5254b05844116584d'});