diff --git a/.jshintrc b/.jshintrc index c891ef6..3d1ae0b 100644 --- a/.jshintrc +++ b/.jshintrc @@ -17,6 +17,7 @@ "strict": true, "trailing":true, "undef":true, + "unused":"vars", "esnext":true, "globals": { "Promise": true diff --git a/examples/eventhub_management_request.js b/examples/eventhub_management_request.js index 1fc322f..930e55a 100644 --- a/examples/eventhub_management_request.js +++ b/examples/eventhub_management_request.js @@ -44,7 +44,6 @@ if (settings.serviceBusHost.indexOf(".") !== -1) { var sasName = settings.SASKeyName; var sasKey = settings.SASKey; var eventHubName = settings.eventHubName; -var numPartitions = settings.partitions; var uri = protocol + '://' + encodeURIComponent(sasName) + ':' + encodeURIComponent(sasKey) + '@' + serviceBusHost; var managementEndpoint = '$management'; diff --git a/lib/adapters/translate_encoder.js b/lib/adapters/translate_encoder.js index e2f578c..509815f 100644 --- a/lib/adapters/translate_encoder.js +++ b/lib/adapters/translate_encoder.js @@ -11,7 +11,6 @@ var processor = require('node-amqp-encoder').Processor, var encoder = processor({ number: function(type, val) { - var absval; switch (type) { case 'ulong': case 'long': diff --git a/lib/amqp_client.js b/lib/amqp_client.js index bab3019..3a26137 100644 --- a/lib/amqp_client.js +++ b/lib/amqp_client.js @@ -6,26 +6,15 @@ var EventEmitter = require('events').EventEmitter, util = require('util'), Connection = require('./connection'), - M = require('./types/message'), Sasl = require('./sasl'), Session = require('./session'), - Link = require('./link'), - constants = require('./constants'), errors = require('./errors'), - DescribedType = require('./types/described_type'), - Fields = require('./types/amqp_composites').Fields, - ForcedType = require('./types/forced_type'), - ST = require('./types/source_target'), - DeliveryStates = require('./types/delivery_state'), - Source = ST.Source, - Target = ST.Target, translator = require('./adapters/translate_encoder'), DefaultPolicy = require('./policies/default_policy'), - u = require('./utilities'), - putils = require('./policies/policy_utilities'); + u = require('./utilities'); diff --git a/lib/codec.js b/lib/codec.js index 7bc37d2..2db57bf 100644 --- a/lib/codec.js +++ b/lib/codec.js @@ -1,11 +1,6 @@ 'use strict'; -var debug = require('debug')('amqp10:codec'), - util = require('util'), - builder = require('buffer-builder'), - Int64 = require('node-int64'), - - constants = require('./constants'), +var Int64 = require('node-int64'), AMQPArray = require('./types/amqp_composites').Array, DescribedType = require('./types/described_type'), @@ -16,8 +11,6 @@ var debug = require('debug')('amqp10:codec'), errors = require('./errors'), types = require('./types'); - - /** * Build a codec. * diff --git a/lib/connection.js b/lib/connection.js index d78b823..d445cd2 100644 --- a/lib/connection.js +++ b/lib/connection.js @@ -11,12 +11,10 @@ var EventEmitter = require('events').EventEmitter, StateMachine = require('stately.js'), constants = require('./constants'), - codec = require('./codec'), errors = require('./errors'), u = require('./utilities'), AMQPError = require('./types/amqp_error'), - DescribedType = require('./types/described_type'), FrameReader = require('./frames/frame_reader'), CloseFrame = require('./frames/close_frame'), diff --git a/lib/constants.js b/lib/constants.js index e75b2da..b859a22 100644 --- a/lib/constants.js +++ b/lib/constants.js @@ -1,7 +1,6 @@ 'use strict'; -var Int64 = require('node-int64'), - Builder = require('buffer-builder'); +var Builder = require('buffer-builder'); function amqpify(arr) { var b = new Builder(); diff --git a/lib/frames/attach_frame.js b/lib/frames/attach_frame.js index 98230dd..f35303c 100644 --- a/lib/frames/attach_frame.js +++ b/lib/frames/attach_frame.js @@ -1,14 +1,12 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:attach'), - util = require('util'), +var util = require('util'), Int64 = require('node-int64'), _ = require('lodash'), constants = require('../constants'), errors = require('../errors'), u = require('../utilities'), - up = u.payload, DescribedType = require('../types/described_type'), ForcedType = require('../types/forced_type'), @@ -18,8 +16,6 @@ var debug = require('debug')('amqp10:framing:attach'), FrameBase = require('./frame'); - - /** *

attach performative

* attach a Link to a Session diff --git a/lib/frames/begin_frame.js b/lib/frames/begin_frame.js index 0dedc88..6a8291c 100644 --- a/lib/frames/begin_frame.js +++ b/lib/frames/begin_frame.js @@ -1,13 +1,11 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:begin'), - util = require('util'), +var util = require('util'), Int64 = require('node-int64'), _ = require('lodash'), constants = require('../constants'), u = require('../utilities'), - up = u.payload, DescribedType = require('../types/described_type'), ForcedType = require('../types/forced_type'), @@ -15,8 +13,6 @@ var debug = require('debug')('amqp10:framing:begin'), FrameBase = require('./frame'); - - /** *

begin performative

* begin a Session on a channel diff --git a/lib/frames/close_frame.js b/lib/frames/close_frame.js index e05d525..b7a2564 100644 --- a/lib/frames/close_frame.js +++ b/lib/frames/close_frame.js @@ -1,21 +1,14 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:close'), - util = require('util'), +var util = require('util'), Int64 = require('node-int64'), - constants = require('../constants'), - u = require('../utilities'), - up = u.payload, - AMQPError = require('../types/amqp_error'), DescribedType = require('../types/described_type'), AMQPSymbol = require('../types/amqp_symbol'), FrameBase = require('./frame'); - - /** *

close performative

* signal a Connection close diff --git a/lib/frames/detach_frame.js b/lib/frames/detach_frame.js index 4351544..a1dd39d 100644 --- a/lib/frames/detach_frame.js +++ b/lib/frames/detach_frame.js @@ -1,11 +1,9 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:detach'), - util = require('util'), +var util = require('util'), Int64 = require('node-int64'), _ = require('lodash'), - constants = require('../constants'), u = require('../utilities'), up = u.payload, @@ -15,8 +13,6 @@ var debug = require('debug')('amqp10:framing:detach'), FrameBase = require('./frame'); - - /** *

detach performative

* detach the Link Endpoint from the Session diff --git a/lib/frames/disposition_frame.js b/lib/frames/disposition_frame.js index 6a8991b..beab5bb 100644 --- a/lib/frames/disposition_frame.js +++ b/lib/frames/disposition_frame.js @@ -1,11 +1,9 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:disposition'), - util = require('util'), +var util = require('util'), Int64 = require('node-int64'), _ = require('lodash'), - constants = require('../constants'), u = require('../utilities'), up = u.payload, @@ -15,8 +13,6 @@ var debug = require('debug')('amqp10:framing:disposition'), FrameBase = require('./frame'); - - /** *

disposition performative

* inform remote peer of delivery state changes diff --git a/lib/frames/end_frame.js b/lib/frames/end_frame.js index f03bcae..b8d9698 100644 --- a/lib/frames/end_frame.js +++ b/lib/frames/end_frame.js @@ -1,22 +1,14 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:end'), - util = require('util'), +var util = require('util'), Int64 = require('node-int64'), - constants = require('./../constants'), - u = require('../utilities'), - up = u.payload, - AMQPError = require('../types/amqp_error'), DescribedType = require('../types/described_type'), - ForcedType = require('../types/forced_type'), AMQPSymbol = require('../types/amqp_symbol'), FrameBase = require('./frame'); - - /** *

end performative

* end the Session diff --git a/lib/frames/flow_frame.js b/lib/frames/flow_frame.js index 6327301..a2b6011 100644 --- a/lib/frames/flow_frame.js +++ b/lib/frames/flow_frame.js @@ -1,11 +1,9 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:flow'), - util = require('util'), +var util = require('util'), Int64 = require('node-int64'), _ = require('lodash'), - constants = require('../constants'), u = require('../utilities'), up = u.payload, @@ -15,8 +13,6 @@ var debug = require('debug')('amqp10:framing:flow'), FrameBase = require('./frame'); - - /** *

flow performative

* update link state diff --git a/lib/frames/frame.js b/lib/frames/frame.js index 8ec85e1..399d2e2 100644 --- a/lib/frames/frame.js +++ b/lib/frames/frame.js @@ -64,7 +64,6 @@ Frame.prototype._writePayload = function(bufBuilder, options) { }; Frame.prototype.write = function(outStream, options) { - var isAMQP = this.frameType === constants.frameType.amqp; var bufBuilder = new Builder(); bufBuilder.appendUInt32BE(0); // Size placeholder diff --git a/lib/frames/open_frame.js b/lib/frames/open_frame.js index b0611a6..ee9129c 100644 --- a/lib/frames/open_frame.js +++ b/lib/frames/open_frame.js @@ -1,13 +1,11 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:open'), - Int64 = require('node-int64'), +var Int64 = require('node-int64'), util = require('util'), _ = require('lodash'), constants = require('../constants'), u = require('../utilities'), - up = u.payload, DescribedType = require('../types/described_type'), ForcedType = require('../types/forced_type'), @@ -15,8 +13,6 @@ var debug = require('debug')('amqp10:framing:open'), FrameBase = require('./frame'); - - /** *

open performative

* negotiate Connection parameters diff --git a/lib/frames/sasl_frame.js b/lib/frames/sasl_frame.js index 817d46c..48f3746 100644 --- a/lib/frames/sasl_frame.js +++ b/lib/frames/sasl_frame.js @@ -1,7 +1,6 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:sasl'), - util = require('util'), +var util = require('util'), Int64 = require('node-int64'), codec = require('./../codec'), @@ -17,8 +16,6 @@ var debug = require('debug')('amqp10:framing:sasl'), FrameBase = require('./frame'); - - /** * Base Frame for SASL authentication. * diff --git a/lib/frames/transfer_frame.js b/lib/frames/transfer_frame.js index 10ba3c8..a5fc4d2 100644 --- a/lib/frames/transfer_frame.js +++ b/lib/frames/transfer_frame.js @@ -1,12 +1,9 @@ 'use strict'; -var debug = require('debug')('amqp10:framing:transfer'), - util = require('util'), +var util = require('util'), Int64 = require('node-int64'), - Builder = require('node-amqp-encoder').Builder, _ = require('lodash'), - constants = require('../constants'), u = require('../utilities'), up = u.payload, @@ -16,8 +13,6 @@ var debug = require('debug')('amqp10:framing:transfer'), FrameBase = require('./frame'); - - /** *

transfer performative

* transfer a Message diff --git a/lib/link.js b/lib/link.js index 55e8ba6..eb3acfd 100644 --- a/lib/link.js +++ b/lib/link.js @@ -1,20 +1,16 @@ 'use strict'; -var _ = require('lodash'), - EventEmitter = require('events').EventEmitter, +var EventEmitter = require('events').EventEmitter, Promise = require('bluebird'), util = require('util'), StateMachine = require('stately.js'), debug = require('debug')('amqp10:link'), - constants = require('./constants'), u = require('./utilities'), AttachFrame = require('./frames/attach_frame'), - DetachFrame = require('./frames/detach_frame'), - - Session = require('./session'); + DetachFrame = require('./frames/detach_frame'); function Link(session, handle, linkPolicy) { this.policy = linkPolicy; diff --git a/lib/receiver_link.js b/lib/receiver_link.js index ec675ec..35b330d 100644 --- a/lib/receiver_link.js +++ b/lib/receiver_link.js @@ -1,11 +1,9 @@ 'use strict'; var _ = require('lodash'), - Promise = require('bluebird'), util = require('util'), debug = require('debug')('amqp10:link:receiver'), - errors = require('./errors'), constants = require('./constants'), u = require('./utilities'), diff --git a/lib/sasl.js b/lib/sasl.js index bdc2304..4836f3f 100644 --- a/lib/sasl.js +++ b/lib/sasl.js @@ -5,21 +5,13 @@ var debug = require('debug')('amqp10:sasl'), _ = require('lodash'), constants = require('./constants'), - codec = require('./codec'), errors = require('./errors'), u = require('./utilities'), - AMQPError = require('./types/amqp_error'), - DescribedType = require('./types/described_type'), AMQPSymbol = require('./types/amqp_symbol'), - - FrameReader = require('./frames/frame_reader'), SaslFrames = require('./frames/sasl_frame'), - Connection = require('./connection'); - - /** * Currently, only supports SASL-PLAIN * diff --git a/lib/session.js b/lib/session.js index 0005a2e..b277e72 100644 --- a/lib/session.js +++ b/lib/session.js @@ -124,8 +124,6 @@ function Session(conn) { this._linksByRemoteHandle = {}; - - var self = this; var stateMachine = { 'UNMAPPED': { sendBegin: function() { diff --git a/lib/types.js b/lib/types.js index e31e3f9..7fca7f2 100644 --- a/lib/types.js +++ b/lib/types.js @@ -1,15 +1,12 @@ 'use strict'; -var debug = require('debug')('amqp10:types'), - Builder = require('buffer-builder'), +var Builder = require('buffer-builder'), Int64 = require('node-int64'), uuid = require('uuid'), _ = require('lodash'), errors = require('./errors'), AMQPArray = require('./types/amqp_composites').Array, - DescribedType = require('./types/described_type'), - ForcedType = require('./types/forced_type'), AMQPSymbol = require('./types/amqp_symbol'); /** diff --git a/lib/types/delivery_state.js b/lib/types/delivery_state.js index f34c4a8..e297fb4 100644 --- a/lib/types/delivery_state.js +++ b/lib/types/delivery_state.js @@ -3,8 +3,6 @@ var Int64 = require('node-int64'), util = require('util'), - constants = require('../constants'), - errors = require('../errors'), u = require('../utilities'), AMQPError = require('./amqp_error'), diff --git a/lib/types/described_type.js b/lib/types/described_type.js index 9ee83a3..531c76a 100644 --- a/lib/types/described_type.js +++ b/lib/types/described_type.js @@ -1,7 +1,5 @@ 'use strict'; -var debug = require('debug')('amqp10:types:described'); - /** * Described type, as described in the AMQP 1.0 spec as follows: * diff --git a/lib/types/known_type_converter.js b/lib/types/known_type_converter.js index c35d2b0..fe6d0f4 100644 --- a/lib/types/known_type_converter.js +++ b/lib/types/known_type_converter.js @@ -1,10 +1,6 @@ 'use strict'; -var debug = require('debug')('amqp10:types:known'), - - DescribedType = require('./described_type'), - - AMQPError = require('./amqp_error'), +var AMQPError = require('./amqp_error'), DeliveryStates = require('./delivery_state'), Source = require('./source_target').Source, Target = require('./source_target').Target, diff --git a/lib/types/message.js b/lib/types/message.js index b66c911..3933551 100644 --- a/lib/types/message.js +++ b/lib/types/message.js @@ -1,13 +1,9 @@ 'use strict'; -var _ = require('lodash'), - Int64 = require('node-int64'), +var Int64 = require('node-int64'), util = require('util'), - constants = require('../constants'), - AMQPFields = require('./amqp_composites').Fields, - AMQPError = require('./amqp_error'), DescribedType = require('./described_type'), ForcedType = require('./forced_type'), AMQPSymbol = require('./amqp_symbol'), diff --git a/lib/types/source_target.js b/lib/types/source_target.js index 0370535..40b928b 100644 --- a/lib/types/source_target.js +++ b/lib/types/source_target.js @@ -7,7 +7,6 @@ var Int64 = require('node-int64'), u = require('../utilities'), AMQPFields = require('./amqp_composites').Fields, - AMQPError = require('./amqp_error'), DescribedType = require('./described_type'), ForcedType = require('./forced_type'), AMQPSymbol = require('./amqp_symbol'); diff --git a/lib/utilities.js b/lib/utilities.js index 2dee055..e66ad48 100644 --- a/lib/utilities.js +++ b/lib/utilities.js @@ -1,7 +1,6 @@ 'use strict'; var _ = require('lodash'), - debug = require('debug')('amqp10:utilities'), constants = require('./constants'), errors = require('./errors'), diff --git a/test/integration/qpid/client.test.js b/test/integration/qpid/client.test.js index 831e09a..9063af9 100644 --- a/test/integration/qpid/client.test.js +++ b/test/integration/qpid/client.test.js @@ -3,9 +3,7 @@ var AMQPClient = require('../../..').Client, Message = require('../../../lib/types/message'), Promise = require('bluebird'), config = require('./config'), - expect = require('chai').expect, - - M = require('../../../lib/types/message'); + expect = require('chai').expect; var test = {}; describe('QPID', function() { diff --git a/test/integration/qpid/receiver_link.test.js b/test/integration/qpid/receiver_link.test.js index 9cd75be..725f237 100644 --- a/test/integration/qpid/receiver_link.test.js +++ b/test/integration/qpid/receiver_link.test.js @@ -1,6 +1,5 @@ 'use strict'; var AMQPClient = require('../../..').Client, - c = require('../../../').Constants, Promise = require('bluebird'), config = require('./config'), expect = require('chai').expect; diff --git a/test/integration/qpid/sender_link.test.js b/test/integration/qpid/sender_link.test.js index e86e554..5965c7f 100644 --- a/test/integration/qpid/sender_link.test.js +++ b/test/integration/qpid/sender_link.test.js @@ -1,6 +1,5 @@ 'use strict'; var AMQPClient = require('../../..').Client, - c = require('../../../').Constants, Promise = require('bluebird'), config = require('./config'), expect = require('chai').expect; @@ -80,7 +79,6 @@ describe('SenderLink', function() { ]); }) .spread(function(receiver, sender) { - var receivedCount = 0; receiver.on('message', function(message) { expect(message.body).to.eql({ event: 'finished' }); done(); diff --git a/test/integration/servicebus/eventhubs/client.test.js b/test/integration/servicebus/eventhubs/client.test.js index 6f09c51..2ebbf47 100644 --- a/test/integration/servicebus/eventhubs/client.test.js +++ b/test/integration/servicebus/eventhubs/client.test.js @@ -2,15 +2,11 @@ var AMQPClient = require('../../../../lib/index.js').Client, Policy = require('../../../../lib/index').Policy, translator = require('../../../../lib/index').translator, - Message = require('../../../../lib/types/message'), Promise = require('bluebird'), config = require('./config'), expect = require('chai').expect, uuid = require('uuid'), - debug = require('debug')('amqp10:test:servicebus:queues'), - _ = require('lodash'), - - M = require('../../../../lib/types/message'); + _ = require('lodash'); var test = {}; describe('ServiceBus', function() { diff --git a/test/integration/servicebus/queues/client.test.js b/test/integration/servicebus/queues/client.test.js index 434739e..a26d61f 100644 --- a/test/integration/servicebus/queues/client.test.js +++ b/test/integration/servicebus/queues/client.test.js @@ -1,14 +1,10 @@ 'use strict'; var AMQPClient = require('../../../../lib/index.js').Client, Policy = require('../../../../lib/index').Policy, - Message = require('../../../../lib/types/message'), Promise = require('bluebird'), config = require('./config'), expect = require('chai').expect, - uuid = require('uuid'), - debug = require('debug')('amqp10:test:servicebus:queues'), - - M = require('../../../../lib/types/message'); + uuid = require('uuid'); var test = {}; describe('ServiceBus', function() { diff --git a/test/unit/client.test.js b/test/unit/client.test.js index 8adc12f..d01d4ae 100644 --- a/test/unit/client.test.js +++ b/test/unit/client.test.js @@ -12,7 +12,6 @@ var AMQPClient = require('../../lib').Client, DefaultPolicy = require('../../lib/policies/default_policy'), AMQPError = require('../../lib/types/amqp_error'), - expect = require('chai').expect, test = require('./test-fixture'); DefaultPolicy.connect.options.containerId = 'test'; diff --git a/test/unit/mock_amqp.js b/test/unit/mock_amqp.js index 6bac80d..ffc232d 100644 --- a/test/unit/mock_amqp.js +++ b/test/unit/mock_amqp.js @@ -3,15 +3,12 @@ var BufferList = require('bl'), debug = require('debug')('amqp10-MockServer'), net = require('net'), - StateMachine = require('stately.js'), expect = require('chai').expect, FrameBase = require('../../lib/frames/frame'), SaslFrame = require('../../lib/frames/sasl_frame').SaslFrame, - tu = require('./testing_utils'), - constants = require('../../lib/constants'), - utils = require('../../lib/utilities'); + tu = require('./testing_utils'); var MockServer = function(port) { this.server = null; diff --git a/test/unit/mocks/client.js b/test/unit/mocks/client.js index c02ce74..85f23ae 100644 --- a/test/unit/mocks/client.js +++ b/test/unit/mocks/client.js @@ -1,7 +1,6 @@ 'use strict'; var EventEmitter = require('events').EventEmitter, AMQPClient = require('../../../lib/amqp_client'), - constants = require('../../../lib/constants'), Connection = require('../../../lib/connection'), Session = require('../../../lib/session'), Link = require('../../../lib/link'), diff --git a/test/unit/mocks/server.js b/test/unit/mocks/server.js index a8b5aef..fa01be4 100644 --- a/test/unit/mocks/server.js +++ b/test/unit/mocks/server.js @@ -1,7 +1,6 @@ 'use strict'; var _ = require('lodash'), Promise = require('bluebird'), - BufferList = require('bl'), net = require('net'), debug = require('debug')('amqp10:mock:server'), diff --git a/test/unit/test_amqpclient.js b/test/unit/test_amqpclient.js index fcdbb28..a987525 100644 --- a/test/unit/test_amqpclient.js +++ b/test/unit/test_amqpclient.js @@ -1,20 +1,15 @@ 'use strict'; -var debug = require('debug')('amqp10-test_amqpclient'), - expect = require('chai').expect, - util = require('util'), - EventEmitter = require('events').EventEmitter, +var expect = require('chai').expect, Promise = require('bluebird'), - AMQPClient = require('../../lib/amqp_client'), constants = require('../../lib/constants'), Connection = require('../../lib/connection'), Session = require('../../lib/session'), Link = require('../../lib/link'), Mock = require('./mocks'), - u = require('../../lib/utilities'), - tu = require('./testing_utils'); + u = require('../../lib/utilities'); var chai = require('chai'); chai.config.includeStack = true; // turn on stack trace diff --git a/test/unit/test_codec.js b/test/unit/test_codec.js index c61d4f5..20576ce 100644 --- a/test/unit/test_codec.js +++ b/test/unit/test_codec.js @@ -2,7 +2,6 @@ var Int64 = require('node-int64'), expect = require('chai').expect, - debug = require('debug')('amqp10-test-codec'), Builder = require('buffer-builder'), codec = require('../../lib/codec'), diff --git a/test/unit/test_connection.js b/test/unit/test_connection.js index 335ba3c..dd4de91 100644 --- a/test/unit/test_connection.js +++ b/test/unit/test_connection.js @@ -1,7 +1,6 @@ 'use strict'; -var debug = require('debug')('amqp10-test_connection'), - expect = require('chai').expect, +var expect = require('chai').expect, constants = require('../../lib/constants'), @@ -9,30 +8,19 @@ var debug = require('debug')('amqp10-test_connection'), MockServer = require('./mock_amqp'), AMQPError = require('../../lib/types/amqp_error'), - Source = require('../../lib/types/source_target').Source, - Target = require('../../lib/types/source_target').Target, - M = require('../../lib/types/message'), CloseFrame = require('../../lib/frames/close_frame'), - FlowFrame = require('../../lib/frames/flow_frame'), OpenFrame = require('../../lib/frames/open_frame'), Connection = require('../../lib/connection'), - Session = require('../../lib/session'), - Link = require('../../lib/link'), - _ = require('lodash'), tu = require('./testing_utils'); DefaultPolicy.connect.options.containerId = 'test'; describe('Connection', function() { describe('#_open()', function() { - var linkName = 'test4'; - var addr = 'testtgt4'; - var server = null; - afterEach(function(done) { if (server) { server.teardown(); @@ -174,7 +162,7 @@ describe('Connection', function() { connection.open({ protocol: 'amqp', host: 'localhost', port: server.port }); }); - + it('should error when header received is invalid', function(done) { server = new MockServer(); server.setSequence([ @@ -203,7 +191,7 @@ describe('Connection', function() { connection.connSM.bind(tu.assertTransitions(expected, function(actual) { // NOTE: need to wait a tick for the event emitter, consider reordering // event emission in Connection.prototype._processCloseFrame - + process.nextTick(function() { expect(events).to.have.length(3); expect(events[0][0]).to.eql(Connection.ErrorReceived); @@ -216,7 +204,7 @@ describe('Connection', function() { connection.open({ protocol: 'amqp', host: 'localhost', port: server.port }); }); - + it('should inform when credentials are expected', function(done) { server = new MockServer(); server.setSequence([ @@ -245,7 +233,7 @@ describe('Connection', function() { connection.connSM.bind(tu.assertTransitions(expected, function(actual) { // NOTE: need to wait a tick for the event emitter, consider reordering // event emission in Connection.prototype._processCloseFrame - + process.nextTick(function() { expect(events).to.have.length(3); expect(events[0][0]).to.eql(Connection.ErrorReceived); @@ -258,6 +246,6 @@ describe('Connection', function() { connection.open({ protocol: 'amqp', host: 'localhost', port: server.port }); }); - + }); }); diff --git a/test/unit/test_frame_encodings.js b/test/unit/test_frame_encodings.js index fb11137..5fd4949 100644 --- a/test/unit/test_frame_encodings.js +++ b/test/unit/test_frame_encodings.js @@ -1,18 +1,12 @@ 'use strict'; -var Int64 = require('node-int64'), - debug = require('debug')('amqp10-test_frame_encodings'), - builder = require('buffer-builder'), +var builder = require('buffer-builder'), - codec = require('../../lib/codec'), constants = require('../../lib/constants'), - AMQPError = require('../../lib/types/amqp_error'), - DescribedType = require('../../lib/types/described_type'), ForcedType = require('../../lib/types/forced_type'), Source = require('../../lib/types/source_target').Source, Target = require('../../lib/types/source_target').Target, - Delivery = require('../../lib/types/delivery_state'), M = require('../../lib/types/message'), AttachFrame = require('../../lib/frames/attach_frame'), diff --git a/test/unit/test_frame_reader.js b/test/unit/test_frame_reader.js index 99a6dc0..74a33ef 100644 --- a/test/unit/test_frame_reader.js +++ b/test/unit/test_frame_reader.js @@ -1,19 +1,12 @@ 'use strict'; -var Int64 = require('node-int64'), - expect = require('chai').expect, - - debug = require('debug')('amqp10-test-FrameReader'), +var expect = require('chai').expect, builder = require('buffer-builder'), constants = require('../../lib/constants'), - codec = require('../../lib/codec'), errors = require('../../lib/errors'), AMQPError = require('../../lib/types/amqp_error'), - Delivery = require('../../lib/types/delivery_state'), - DescribedType = require('../../lib/types/described_type'), - ForcedType = require('../../lib/types/forced_type'), reader = require('../../lib/frames/frame_reader'), AttachFrame = require('../../lib/frames/attach_frame'), diff --git a/test/unit/test_message_types.js b/test/unit/test_message_types.js index 0bd156a..d907b54 100644 --- a/test/unit/test_message_types.js +++ b/test/unit/test_message_types.js @@ -1,13 +1,8 @@ 'use strict'; -var debug = require('debug')('amqp10-test-message-types'), - expect = require('chai').expect, - Int64 = require('node-int64'), - - M = require('../../lib/types/message'), - tu = require('./testing_utils'); - -var buf = tu.buildBuffer; +var expect = require('chai').expect, + Int64 = require('node-int64'), + M = require('../../lib/types/message'); describe('MessageTypes', function() { describe('Properties', function() { diff --git a/test/unit/test_sasl.js b/test/unit/test_sasl.js index 1d5bb0e..3ead996 100644 --- a/test/unit/test_sasl.js +++ b/test/unit/test_sasl.js @@ -1,7 +1,6 @@ 'use strict'; -var debug = require('debug')('amqp10-test_sasl'), - builder = require('buffer-builder'), +var builder = require('buffer-builder'), constants = require('../../lib/constants'), @@ -10,18 +9,12 @@ var debug = require('debug')('amqp10-test_sasl'), MockServer = require('./mock_amqp'), AMQPError = require('../../lib/types/amqp_error'), AMQPSymbol = require('../../lib/types/amqp_symbol'), - Source = require('../../lib/types/source_target').Source, - Target = require('../../lib/types/source_target').Target, - M = require('../../lib/types/message'), CloseFrame = require('../../lib/frames/close_frame'), - FlowFrame = require('../../lib/frames/flow_frame'), OpenFrame = require('../../lib/frames/open_frame'), SaslFrames = require('../../lib/frames/sasl_frame'), Connection = require('../../lib/connection'), - Session = require('../../lib/session').Session, - Link = require('../../lib/session').Link, Sasl = require('../../lib/sasl'), tu = require('./testing_utils'); diff --git a/test/unit/test_session.js b/test/unit/test_session.js index ec7580b..6c23332 100644 --- a/test/unit/test_session.js +++ b/test/unit/test_session.js @@ -1,7 +1,6 @@ 'use strict'; -var debug = require('debug')('amqp10-test_connection'), - expect = require('chai').expect, +var expect = require('chai').expect, constants = require('../../lib/constants'), u = require('../../lib/utilities'), diff --git a/test/unit/test_types.js b/test/unit/test_types.js index fdea360..3abdfb2 100644 --- a/test/unit/test_types.js +++ b/test/unit/test_types.js @@ -1,12 +1,10 @@ 'use strict'; -var debug = require('debug')('amqp10-test-types'), - expect = require('chai').expect, +var expect = require('chai').expect, builder = require('buffer-builder'), BufferBuilder = require('buffer-builder'), Int64 = require('node-int64'), - types = require('../../lib/types'), codec = require('../../lib/codec'), ForcedType = require('../../lib/types/forced_type'), diff --git a/test/unit/test_utilities.js b/test/unit/test_utilities.js index 7a53cea..cff379e 100644 --- a/test/unit/test_utilities.js +++ b/test/unit/test_utilities.js @@ -1,7 +1,6 @@ 'use strict'; -var debug = require('debug')('amqp10-test_utilities'), - expect = require('chai').expect, +var expect = require('chai').expect, constants = require('../../lib/constants'), u = require('../../lib/utilities'), diff --git a/tools/formatDebugLog.js b/tools/formatDebugLog.js index 7cf66d4..5d1dbda 100644 --- a/tools/formatDebugLog.js +++ b/tools/formatDebugLog.js @@ -1,9 +1,8 @@ 'use strict'; var fs = require('fs'), - util = require('util'), - Int64 = require('node-int64'), - constants = require('../lib/constants'); + Int64 = require('node-int64'), + constants = require('../lib/constants'); if (process.argv.length < 3) { console.warn('Usage: node ' + process.argv[1] + ' ');