Merge pull request #100 from andrerod/dev

Re-integrating jsHint.

lib/azure.js

@@ -101,7 +101,7 @@ exports.createServiceBusService = function (namespace, accessKey, issuer, acsNam
 * Other exports.
 */
 
-exports.ServiceClient = require('./services/serviceclient');
+exports.ServiceClient = require('./services/core/serviceclient');
 exports.TableQuery = require('./services/table/tablequery');
 exports.BatchServiceClient = require('./services/table/batchserviceclient');
 exports.Constants = require('./util/constants');

lib/http/webresource.js

@@ -15,7 +15,7 @@
 
 // Module dependencies.
 var azureutil = require('../util/util');
-var ServiceClient = require('../services/serviceclient');
+var ServiceClient = require('../services/core/serviceclient');
 var Constants = require('../util/constants');
 var HeaderConstants = Constants.HeaderConstants;
 var HttpConstants = Constants.HttpConstants;

lib/services/blob/blobservice.js

@@ -27,8 +27,8 @@ var ISO8061Date = require('../../util/iso8061date');
 
 var SharedKey = require('./sharedkey');
 var SharedAccessSignature = require('./sharedaccesssignature');
-var StorageServiceClient = require('../storageserviceclient');
-var ServiceClient = require('../serviceclient');
+var StorageServiceClient = require('../core/storageserviceclient');
+var ServiceClient = require('../core/serviceclient');
 var WebResource = require('../../http/webresource');
 var Constants = require('../../util/constants');
 var HeaderConstants = Constants.HeaderConstants;

lib/services/blob/sharedaccesssignature.js

@@ -19,7 +19,7 @@ var qs     = require('qs');
 
 var azureutil = require('../../util/util');
 
-var ServiceClient = require('../serviceclient');
+var ServiceClient = require('../core/serviceclient');
 var HmacSha256Sign = require('./hmacsha256sign');
 var Constants = require('../../util/constants');
 var BlobConstants = Constants.BlobConstants;

lib/services/core/servicebusserviceclient.js

@@ -16,11 +16,11 @@
 // Module dependencies.
 var util = require('util');
 
-var azureutil = require('../util/util');
+var azureutil = require('../../util/util');
 
 var ServiceClient = require('./serviceclient');
-var Wrap = require('./serviceBus/wrap');
-var Constants = require('../util/constants');
+var Wrap = require('../serviceBus/wrap');
+var Constants = require('../../util/constants');
 var HeaderConstants = Constants.HeaderConstants;
 var QueryStringConstants = Constants.QueryStringConstants;
 var HttpConstants = Constants.HttpConstants;
@@ -57,7 +57,7 @@ function ServiceBusServiceClient(host, namespace, accessKey, issuer, acsNamespac
 
   this.issuer = issuer;
   if (!this.issuer) {
-    this.issuer = process.env[ServiceClient.EnvironmentVariables.AZURE_SERVICEBUS_ISSUER]; ;
+    this.issuer = process.env[ServiceClient.EnvironmentVariables.AZURE_SERVICEBUS_ISSUER];
 
     if (!this.issuer) {
       this.issuer = ServiceClient.DEFAULT_SERVICEBUS_ISSUER;
@@ -66,7 +66,7 @@ function ServiceBusServiceClient(host, namespace, accessKey, issuer, acsNamespac
 
   this.accessKey = accessKey;
   if (!this.accessKey) {
-    this.accessKey = process.env[ServiceClient.EnvironmentVariables.AZURE_SERVICEBUS_ACCESS_KEY]; ;
+    this.accessKey = process.env[ServiceClient.EnvironmentVariables.AZURE_SERVICEBUS_ACCESS_KEY];
   }
 
   ServiceBusServiceClient.super_.call(this, host, authenticationProvider);

lib/services/core/serviceclient.js

@@ -22,12 +22,12 @@ var qs = require('qs');
 var crypto = require('crypto');
 var xml2js = require('xml2js');
 
-var azureutil = require('../util/util');
+var azureutil = require('../../util/util');
 
-var Constants = require('../util/constants');
+var Constants = require('../../util/constants');
 var HeaderConstants = Constants.HeaderConstants;
 var HttpConstants = Constants.HttpConstants;
-var Logger = require('../diagnostics/logger');
+var Logger = require('../../diagnostics/logger');
 
 // Expose 'ServiceClient'.
 exports = module.exports = ServiceClient;

lib/services/core/storageserviceclient.js

@@ -21,14 +21,14 @@ var qs = require('qs');
 var crypto = require('crypto');
 var xml2js = require('xml2js');
 
-var azureutil = require('../util/util');
+var azureutil = require('../../util/util');
 
 var ServiceClient = require('./serviceclient');
-var Constants = require('../util/constants');
+var Constants = require('../../util/constants');
 var HeaderConstants = Constants.HeaderConstants;
 var QueryStringConstants = Constants.QueryStringConstants;
 var HttpConstants = Constants.HttpConstants;
-var Logger = require('../diagnostics/logger');
+var Logger = require('../../diagnostics/logger');
 
 // Expose 'StorageServiceClient'.
 exports = module.exports = StorageServiceClient;

lib/services/queue/queueservice.js

@@ -18,8 +18,8 @@ var util = require('util');
 
 var azureutil = require('../../util/util');
 
-var StorageServiceClient = require('../storageserviceclient');
-var ServiceClient = require('../serviceclient');
+var StorageServiceClient = require('../core/storageserviceclient');
+var ServiceClient = require('../core/serviceclient');
 var SharedKey = require('../blob/sharedkey');
 var WebResource = require('../../http/webresource');
 var Constants = require('../../util/constants');

lib/services/serviceBus/models/acstokenresult.js

@@ -18,6 +18,7 @@ var queryString = require('querystring');
 // Module dependencies.
 var Constants = require('../../../util/constants');
 var HeaderConstants = Constants.HeaderConstants;
+var ServiceBusConstants = Constants.ServiceBusConstants;
 
 // Expose 'AcsTokenResult'.
 exports = module.exports = AcsTokenResult;
@@ -29,8 +30,8 @@ AcsTokenResult.parse = function (acsTokenQueryString) {
   var acsTokenResult = new AcsTokenResult();
 
   var parsedQueryString = queryString.parse(acsTokenQueryString);
-  acsTokenResult['wrap_access_token'] = parsedQueryString['wrap_access_token'];
-  acsTokenResult['wrap_access_token_expires_in'] = parsedQueryString['wrap_access_token_expires_in'];
+  acsTokenResult[ServiceBusConstants.WRAP_ACCESS_TOKEN] = parsedQueryString[ServiceBusConstants.WRAP_ACCESS_TOKEN];
+  acsTokenResult[ServiceBusConstants.WRAP_ACCESS_TOKEN_EXPIRES_IN] = parsedQueryString[ServiceBusConstants.WRAP_ACCESS_TOKEN_EXPIRES_IN];
 
   return acsTokenResult;
 };

lib/services/serviceBus/models/queuemessageresult.js

@@ -94,7 +94,7 @@ QueueMessageResult._propertyFromString = function (value) {
   } else if (value === 'false') {
     return false;
   } else if (azureutil.stringIsInt(value)) {
-    return parseInt(value);
+    return parseInt(value, 10);
   } else {
     return parseFloat(value);
   }

lib/services/serviceBus/servicebusservice.js

@@ -19,8 +19,8 @@ var util = require('util');
 var azureutil = require('../../util/util');
 var RFC1123 = require('../../util/rfc1123date');
 
-var ServiceClient = require('../serviceclient');
-var ServiceBusServiceClient = require('../servicebusserviceclient');
+var ServiceClient = require('../core/serviceclient');
+var ServiceBusServiceClient = require('../core/servicebusserviceclient');
 
 var WebResource = require('../../http/webresource');
 var Constants = require('../../util/constants');
@@ -1253,8 +1253,8 @@ function setRequestHeaders(webResource, message) {
         break;
       case 'customProperties':
         // Custom properties
-        for (var customProperty in message['customProperties']) {
-          var value = message['customProperties'][customProperty];
+        for (var customProperty in message.customProperties) {
+          var value = message.customProperties[customProperty];
           if (azureutil.objectIsString(value)) {
             value = "\"" + value.toString() + "\"";
           } else if (azureutil.stringIsDate(value)) {

lib/services/serviceBus/wrap.js

@@ -19,8 +19,8 @@ var url = require('url');
 
 var azureutil = require('../../util/util');
 
-var ServiceClient = require('../serviceclient');
-var ServiceBusServiceClient = require('../servicebusserviceclient');
+var ServiceClient = require('../core/serviceclient');
+var ServiceBusServiceClient = require('../core/servicebusserviceclient');
 var WrapTokenManager = require('./wraptokenmanager');
 
 var WebResource = require('../../http/webresource');

lib/services/serviceBus/wrapservice.js

@@ -18,7 +18,7 @@ var util = require('util');
 
 var azureutil = require('../../util/util');
 
-var ServiceClient = require('../serviceclient');
+var ServiceClient = require('../core/serviceclient');
 
 var WebResource = require('../../http/webresource');
 var Constants = require('../../util/constants');

lib/services/serviceBus/wraptokenmanager.js

@@ -18,7 +18,7 @@ var util = require('util');
 
 var azureutil = require('../../util/util');
 
-var ServiceClient = require('../serviceclient');
+var ServiceClient = require('../core/serviceclient');
 var WrapService = require('./wrapservice');
 var WebResource = require('../../http/webresource');
 var Constants = require('../../util/constants');
@@ -51,7 +51,7 @@ WrapTokenManager.prototype.getAccessToken = function(scopeUri, callback) {
   var now = new Date();
 
   var cachedToken = self.activeTokens[scopeUri];
-  if (cachedToken && now < cachedToken['wrap_access_token_expires_utc']) {
+  if (cachedToken && now < cachedToken[ServiceBusConstants.WRAP_ACCESS_TOKEN_EXPIRES_UTC]) {
     callback(null, cachedToken);
     return;
   }

lib/services/table/batchserviceclient.js

@@ -18,8 +18,8 @@ var util = require('util');
 var crypto = require('crypto');
 
 var azureutil = require('../../util/util');
-var ServiceClient = require('../serviceclient');
-var StorageServiceClient = require('../storageserviceclient');
+var ServiceClient = require('../core/serviceclient');
+var StorageServiceClient = require('../core/storageserviceclient');
 var WebResource = require('../../http/webresource');
 var Constants = require('../../util/constants');
 var HttpConstants = Constants.HttpConstants;

lib/services/table/models/entityresult.js

@@ -42,12 +42,12 @@ EntityResult.serialize = function (entity) {
 
         properties[AtomHandler.NSDATA + ':' + name] = newValue;
       } else if (entity[name][Constants.ATOM_METADATA_MARKER] &&
-                 entity[name][Constants.ATOM_METADATA_MARKER]['type']) {
+                 entity[name][Constants.ATOM_METADATA_MARKER].type) {
 
         properties[AtomHandler.NSDATA + ':' + name] = entity[name];
-        properties[AtomHandler.NSDATA + ':' + name][Constants.ATOM_METADATA_MARKER][AtomHandler.NSMETA + ':type'] = properties[AtomHandler.NSDATA + ':' + name][Constants.ATOM_METADATA_MARKER]['type'];
+        properties[AtomHandler.NSDATA + ':' + name][Constants.ATOM_METADATA_MARKER][AtomHandler.NSMETA + ':type'] = properties[AtomHandler.NSDATA + ':' + name][Constants.ATOM_METADATA_MARKER].type;
 
-        delete properties[AtomHandler.NSDATA + ':' + name][Constants.ATOM_METADATA_MARKER]['type'];
+        delete properties[AtomHandler.NSDATA + ':' + name][Constants.ATOM_METADATA_MARKER].type;
       }
       else {
         properties[AtomHandler.NSDATA + ':' + name] = entity[name];
@@ -61,13 +61,13 @@ EntityResult.serialize = function (entity) {
     'author': {
       name: ''
     },
-    'id': entity['id'] ? entity['id'] : '',
+    'id': entity.id ? entity.id : '',
     'content': {
       '@': { type: 'application/xml' }
     }
   };
 
-  atomEntity['content'][AtomHandler.NSMETA + ':properties'] = properties;
+  atomEntity.content[AtomHandler.NSMETA + ':properties'] = properties;
 
   var atomHandler = new AtomHandler();
   var xml = atomHandler.serialize(atomEntity);

lib/services/table/tableservice.js

@@ -23,7 +23,7 @@ var BatchServiceClient = require("./batchserviceclient");
 var SharedKeyTable = require('./sharedkeytable');
 var TableQuery = require('./tablequery');
 var AtomHandler = require('../../util/atomhandler');
-var ServiceClient = require('../serviceclient');
+var ServiceClient = require('../core/serviceclient');
 var WebResource = require('../../http/webresource');
 var Constants = require('../../util/constants');
 var QueryStringConstants = Constants.QueryStringConstants;

lib/util/atomhandler.js

@@ -297,7 +297,7 @@ AtomHandler.prototype._isDate = function(value) {
 */
 function formatToString(value) {
   return value.toString();
-};
+}
 
 // Property type formatters are serializers that convert typed values into strings.
 var propertyTypeFormatters = {
@@ -329,7 +329,7 @@ AtomHandler.prototype._propertyFromString = function (value) {
     return false;
   } else if (azureutil.stringIsNumber(value)) {
     if (azureutil.stringIsInt(value)) {
-      return parseInt(value);
+      return parseInt(value, 10);
     } else {
       return parseFloat(value);
     }

lib/util/util.js

@@ -121,7 +121,7 @@ exports.stringIsInt = function (value) {
     return false;
   }
 
-  var intValue = parseInt(value);
+  var intValue = parseInt(value, 10);
   return intValue.toString().length === value.length &&
          intValue === parseFloat(value);
 };
@@ -139,7 +139,7 @@ exports.stringIsFloat = function(value) {
 
   var floatValue = parseFloat(value);
   return floatValue.toString().length === value.length &&
-         parseInt(value) !== floatValue;
+         parseInt(value, 10) !== floatValue;
 };
 
 /**

package.json

@@ -20,7 +20,8 @@
         "underscore.string": ">= 2.0.0"
     },
     "devDependencies": {
-        "mocha": "*"
+        "mocha": "*",
+        "jshint": "*"
     },
     "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node",
     "repository": {

test/azure-tests.js

@@ -17,7 +17,7 @@ var assert = require('assert');
 
 var azure = require('../lib/azure');
 
-var ServiceBusServiceClient = require('../lib/services/servicebusserviceclient');
+var ServiceBusServiceClient = require('../lib/services/core/servicebusserviceclient');
 var ServiceClient = azure.ServiceClient;
 
 var environmentAzureStorageAccount = 'myaccount';

test/common/exponentialretrypolicyfilter-tests.js

@@ -20,7 +20,7 @@ var azure = require("../../lib/azure");
 var testutil = require('../util/util');
 var tabletestutil = require('../util/table-test-utils');
 
-var ServiceClient = require('../../lib/services/serviceclient');
+var ServiceClient = require('../../lib/services/core/serviceclient');
 var ExponentialRetryPolicyFilter = require('../../lib/common/exponentialretrypolicyfilter');
 var Constants = require('../../lib/util/constants');
 

test/common/linearretrypolicyfilter-tests.js

@@ -20,7 +20,7 @@ var azure = require("../../lib/azure");
 var testutil = require('../util/util');
 var tabletestutil = require('../util/table-test-utils');
 
-var ServiceClient = require('../../lib/services/serviceclient');
+var ServiceClient = require('../../lib/services/core/serviceclient');
 var LinearRetryPolicyFilter = require('../../lib/common/linearretrypolicyfilter');
 var Constants = require('../../lib/util/constants');
 

test/mockserver/mockserverclient.js

@@ -17,7 +17,7 @@ var http = require('http');
 
 var mockServer = require('../mockserver/mockserver');
 
-var ServiceClient = require("../../lib/services/serviceclient");
+var ServiceClient = require("../../lib/services/core/serviceclient");
 
 var recordingsPath = '/session';
 

test/services/blob/blobservice-longrunning-tests.js

@@ -23,10 +23,10 @@ var azureutil = require('../../../lib/util/util');
 var azure = require('../../../lib/azure');
 var testutil = require('../../util/util');
 
-var SharedAccessSignature = require('../../../lib/services/blob/sharedaccesssignature');
-var BlobService = require("../../../lib/services/blob/blobservice");
-var ServiceClient = require("../../../lib/services/serviceclient");
-var Constants = require('../../../lib/util/constants');
+var SharedAccessSignature = azure.SharedAccessSignature;
+var BlobService = azure.BlobService;
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 var BlobConstants = Constants.BlobConstants;
 

test/services/blob/blobservice-tests.js

@@ -25,10 +25,10 @@ var azure = require('../../../lib/azure');
 var testutil = require('../../util/util');
 var blobtestutil = require('../../util/blob-test-utils');
 
-var SharedAccessSignature = require('../../../lib/services/blob/sharedaccesssignature');
-var BlobService = require("../../../lib/services/blob/blobservice");
-var ServiceClient = require("../../../lib/services/serviceclient");
-var Constants = require('../../../lib/util/constants');
+var SharedAccessSignature = azure.SharedAccessSignature;
+var BlobService = azure.BlobService;
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var BlobConstants = Constants.BlobConstants;
 var HttpConstants = Constants.HttpConstants;
 var WebResource = require('../../../lib/http/webresource');

test/services/blob/sharedaccesssignature-tests.js

@@ -17,10 +17,12 @@ var assert = require('assert');
 
 var qs = require('qs');
 
-var ServiceClient = require('../../../lib/services/serviceclient');
-var SharedAccessSignature = require('../../../lib/services/blob/sharedaccesssignature');
+var azure = require('../../../lib/azure');
+
 var WebResource = require('../../../lib/http/webresource');
-var Constants = require('../../../lib/util/constants');
+var SharedAccessSignature = azure.SharedAccessSignature;
+var Constants = azure.Constants;
+var ServiceClient = azure.ServiceClient;
 var BlobConstants = Constants.BlobConstants;
 var HeaderConstants = Constants.HeaderConstants;
 var QueryStringConstants = Constants.QueryStringConstants;

test/services/blob/sharedkey-tests.js

@@ -15,10 +15,12 @@
 
 var assert = require('assert');
 
-var SharedKey = require('../../../lib/services/blob/sharedkey');
-var ServiceClient = require('../../../lib/services/serviceclient');
+var azure = require('../../../lib/azure');
+
 var WebResource = require('../../../lib/http/webresource');
-var Constants = require('../../../lib/util/constants');
+var SharedKey = azure.SharedKey;
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var QueryStringConstants = Constants.QueryStringConstants;
 var HeaderConstants = Constants.HeaderConstants;
 

test/services/blob/sharedkeylite-tests.js

@@ -25,11 +25,11 @@ var azure = require('../../../lib/azure');
 var testutil = require('../../util/util');
 var blobtestutil = require('../../util/blob-test-utils');
 
-var SharedAccessSignature = require('../../../lib/services/blob/sharedaccesssignature');
-var BlobService = require("../../../lib/services/blob/blobservice");
-var SharedKeyLite = require("../../../lib/services/blob/sharedkeylite");
-var ServiceClient = require("../../../lib/services/serviceclient");
-var Constants = require('../../../lib/util/constants');
+var SharedAccessSignature = azure.SharedAccessSignature;
+var BlobService = azure.BlobService;
+var SharedKeyLite = azure.SharedKeyLite;
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var BlobConstants = Constants.BlobConstants;
 var HttpConstants = Constants.HttpConstants;
 var WebResource = require('../../../lib/http/webresource');

test/services/queue/listqueuesresultcontinuation-tests.js

@@ -18,8 +18,8 @@ var assert = require('assert');
 var azure = require('../../../lib/azure');
 var azureutil = require('../../../lib/util/util');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 var StorageErrorCodeStrings = Constants.StorageErrorCodeStrings;
 

test/services/queue/queueservice-tests.js

@@ -21,8 +21,8 @@ var azureutil = require('../../../lib/util/util');
 var testutil = require('../../util/util');
 var queuetestutil = require('../../util/queue-test-utils');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 
 var queueService;

test/services/serviceBus/servicebusservice-tests.js

@@ -23,8 +23,8 @@ var ISO8061Date = require('../../../lib/util/iso8061date');
 var testutil = require('../../util/util');
 var servicebustestutil = require('../../util/servicebus-test-utils');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 var StorageErrorCodeStrings = Constants.StorageErrorCodeStrings;
 var ServiceBusConstants = Constants.ServiceBusConstants;

test/services/serviceBus/wrapservice-tests.js

@@ -23,8 +23,8 @@ var ISO8061Date = require('../../../lib/util/iso8061date');
 var testutil = require('../../util/util');
 var wrapservicetestutil = require('../../util/wrapservice-test-utils');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 var StorageErrorCodeStrings = Constants.StorageErrorCodeStrings;
 

test/services/serviceBus/wraptokenmanager-tests.js

@@ -26,8 +26,8 @@ var wrapservicetestutil = require('../../util/wrapservice-test-utils');
 var WrapService = require('../../../lib/services/serviceBus/wrapservice');
 var WrapTokenManager = require('../../../lib/services/serviceBus/wraptokenmanager');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 var StorageErrorCodeStrings = Constants.StorageErrorCodeStrings;
 

test/services/table/queryentitiesresultcontinuation-tests.js

@@ -20,9 +20,9 @@ var azureutil = require('../../../lib/util/util');
 
 var testutil = require('../../util/util');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var TableQuery = require('../../../lib/services/table/tablequery');
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var TableQuery = azure.TableQuery;
+var Constants = azure.Constants;
 var QueryEntitiesResultContinuation = require('../../../lib/services/table/models/queryentitiesresultcontinuation');
 var HttpConstants = Constants.HttpConstants;
 var StorageErrorCodeStrings = Constants.StorageErrorCodeStrings;

test/services/table/querytablesresultcontinuation-tests.js

@@ -19,9 +19,9 @@ var azure = require('../../../lib/azure');
 var azureutil = require('../../../lib/util/util');
 var testutil = require('../../util/util');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var TableQuery = require('../../../lib/services/table/tablequery');
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var TableQuery = azure.TableQuery;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 var StorageErrorCodeStrings = Constants.StorageErrorCodeStrings;
 

test/services/table/sharedkeylitetable-tests.js

@@ -15,10 +15,12 @@
 
 var assert = require('assert');
 
+var azure = require('../../../lib/azure');
+
 var SharedKeyLiteTable = require('../../../lib/services/table/sharedkeylitetable');
-var ServiceClient = require('../../../lib/services/serviceclient');
 var WebResource = require('../../../lib/http/webresource');
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
 var HeaderConstants = Constants.HeaderConstants;
 var QueryStringConstants = Constants.QueryStringConstants;
 

test/services/table/sharedkeytable-tests.js

@@ -22,10 +22,10 @@ var ISO8061Date = require('../../../lib/util/iso8061date');
 var testutil = require('../../util/util');
 var tabletestutil = require('../../util/table-test-utils');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var TableQuery = require('../../../lib/services/table/tablequery');
+var ServiceClient = azure.ServiceClient;
+var Constants = azure.Constants;
+var TableQuery = azure.TableQuery;
 var SharedKeyLiteTable = require('../../../lib/services/table/sharedkeylitetable');
-var Constants = require('../../../lib/util/constants');
 var HttpConstants = Constants.HttpConstants;
 var StorageErrorCodeStrings = Constants.StorageErrorCodeStrings;
 

test/services/table/tableservice-batch-tests.js

@@ -21,9 +21,9 @@ var azureutil = require('../../../lib/util/util');
 var testutil = require('../../util/util');
 var tabletestutil = require('../../util/table-test-utils');
 
-var ServiceClient = require('../../../lib/services/serviceclient');
-var TableQuery = require('../../../lib/services/table/tablequery');
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var TableQuery = azure.TableQuery;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 
 var tableService;

test/services/table/tableservice-tablequery-tests.js

@@ -21,9 +21,9 @@ var azureutil = require('../../../lib/util/util');
 var testutil = require('../../util/util');
 var tabletestutil = require('../../util/table-test-utils');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var TableQuery = require('../../../lib/services/table/tablequery');
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var TableQuery = azure.TableQuery;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 var StorageErrorCodeStrings = Constants.StorageErrorCodeStrings;
 

test/services/table/tableservice-tests.js

@@ -23,9 +23,9 @@ var ISO8061Date = require('../../../lib/util/iso8061date');
 var testutil = require('../../util/util');
 var tabletestutil = require('../../util/table-test-utils');
 
-var ServiceClient = require("../../../lib/services/serviceclient");
-var TableQuery = require('../../../lib/services/table/tablequery');
-var Constants = require('../../../lib/util/constants');
+var ServiceClient = azure.ServiceClient;
+var TableQuery = azure.TableQuery;
+var Constants = azure.Constants;
 var HttpConstants = Constants.HttpConstants;
 var StorageErrorCodeStrings = Constants.StorageErrorCodeStrings;