YUKI Hiroshi
null+****@clear*****
Wed Feb 13 11:41:41 JST 2013
YUKI Hiroshi 2013-02-13 11:41:41 +0900 (Wed, 13 Feb 2013) New Revision: cc0189b5beb1aff6b3a2b339492fc892f924dc91 https://github.com/groonga/express-kotoumi/commit/cc0189b5beb1aff6b3a2b339492fc892f924dc91 Log: test: No need to run assertReady() Modified files: test/backend-connection.test.js Modified: test/backend-connection.test.js (+53 -102) =================================================================== --- test/backend-connection.test.js 2013-02-12 18:00:21 +0900 (200815e) +++ test/backend-connection.test.js 2013-02-13 11:41:41 +0900 (a4a22e0) @@ -70,10 +70,6 @@ suite('Connection, initialization', function() { suite('Connection, basic features', function() { var connection; var backend; - var setupDone; - function assertReady() { - assert.equal(setupDone, true, 'setup process is not finished yet!'); - } setup(function(done) { createBackend() @@ -87,7 +83,6 @@ suite('Connection, basic features', function() { maxRetyrCount: 3, retryDelay: 1 }); - setupDone = true; done(); }); }); @@ -101,7 +96,6 @@ suite('Connection, basic features', function() { connection.close(); connection = undefined; } - setupDone = false; }); function createExpectedEnvelope(type, body) { @@ -130,17 +124,13 @@ suite('Connection, basic features', function() { test('sending message without response (volatile message)', function(done) { var message; + message = connection.emitMessage('testRequest', { command: 'foobar' }); + assert.envelopeEqual(message, + createExpectedEnvelope('testRequest', + { command: 'foobar' })); Deferred .wait(0.01) .next(function() { - assertReady(); - message = connection.emitMessage('testRequest', { command: 'foobar' }); - assert.envelopeEqual(message, - createExpectedEnvelope('testRequest', - { command: 'foobar' })); - }) - .wait(0.01) - .next(function() { assert.equal(backend.received.length, 1, 'message should be sent'); assert.deepEqual(backend.received[0][2], message); done(); @@ -170,24 +160,19 @@ suite('Connection, basic features', function() { var callback = createMockedMessageCallback(); var message; var packet; - Deferred - .wait(0.01) - .next(function() { - assertReady(); - connection.on('message', callback); - - var now = new Date(); - message = { - id: now.getTime(), - date: now.toISOString(), - statusCode: 200, - type: 'testResponse', - body: 'first call' - }; - callback.takes(message); - packet = ['test.message', Date.now(), message]; - return utils.sendPacketTo(packet, utils.testReceivePort); - }) + connection.on('message', callback); + + var now = new Date(); + message = { + id: now.getTime(), + date: now.toISOString(), + statusCode: 200, + type: 'testResponse', + body: 'first call' + }; + callback.takes(message); + packet = ['test.message', Date.now(), message]; + utils.sendPacketTo(packet, utils.testReceivePort) .next(function() { callback.assert(); @@ -216,19 +201,15 @@ suite('Connection, basic features', function() { var message; var response; var packet; + message = connection.emitMessage('testRequest', + { command: 'foobar' }, + callback); + assert.envelopeEqual(message, + createExpectedEnvelope('testRequest', + { command: 'foobar' })); Deferred .wait(0.01) .next(function() { - assertReady(); - message = connection.emitMessage('testRequest', - { command: 'foobar' }, - callback); - assert.envelopeEqual(message, - createExpectedEnvelope('testRequest', - { command: 'foobar' })); - }) - .wait(0.01) - .next(function() { assert.equal(backend.received.length, 1, 'message should be sent'); assert.deepEqual(backend.received[0][2], message); @@ -262,19 +243,15 @@ suite('Connection, basic features', function() { var message; var response; var packet; + message = connection.emitMessage('testRequest', + { command: 'foobar' }, + callback); + assert.envelopeEqual(message, + createExpectedEnvelope('testRequest', + { command: 'foobar' })); Deferred .wait(0.01) .next(function() { - assertReady(); - message = connection.emitMessage('testRequest', - { command: 'foobar' }, - callback); - assert.envelopeEqual(message, - createExpectedEnvelope('testRequest', - { command: 'foobar' })); - }) - .wait(0.01) - .next(function() { assert.equal(backend.received.length, 1, 'message should be sent'); assert.deepEqual(backend.received[0][2], message); @@ -301,20 +278,16 @@ suite('Connection, basic features', function() { var message; var response; var packet; + message = connection.emitMessage('testRequest', + { command: 'foobar' }, + callback, + { timeout: 1000 }); + assert.envelopeEqual(message, + createExpectedEnvelope('testRequest', + { command: 'foobar' })); Deferred .wait(0.01) .next(function() { - assertReady(); - message = connection.emitMessage('testRequest', - { command: 'foobar' }, - callback, - { timeout: 1000 }); - assert.envelopeEqual(message, - createExpectedEnvelope('testRequest', - { command: 'foobar' })); - }) - .wait(0.01) - .next(function() { assert.equal(backend.received.length, 1, 'message should be sent'); assert.deepEqual(backend.received[0][2], message); assert.equal(connection.listeners('reply:' + message.id).length, @@ -345,21 +318,17 @@ suite('Connection, basic features', function() { var callback = createMockedMessageCallback(); var message; var response; + callback.takes(Connection.ERROR_GATEWAY_TIMEOUT, null); + message = connection.emitMessage('testRequest', + { command: 'foobar' }, + callback, + { timeout: 20 }); + assert.envelopeEqual(message, + createExpectedEnvelope('testRequest', + { command: 'foobar' })); Deferred .wait(0.01) .next(function() { - assertReady(); - callback.takes(Connection.ERROR_GATEWAY_TIMEOUT, null); - message = connection.emitMessage('testRequest', - { command: 'foobar' }, - callback, - { timeout: 20 }); - assert.envelopeEqual(message, - createExpectedEnvelope('testRequest', - { command: 'foobar' })); - }) - .wait(0.01) - .next(function() { assert.equal(backend.received.length, 1, 'message should be sent'); assert.deepEqual(backend.received[0][2], message); assert.equal(connection.listeners('reply:' + message.id).length, @@ -384,20 +353,16 @@ suite('Connection, basic features', function() { var message; var response; var packet; + message = connection.emitMessage('testRequest', + { command: 'foobar' }, + callback, + { timeout: -1 }); + assert.envelopeEqual(message, + createExpectedEnvelope('testRequest', + { command: 'foobar' })); Deferred .wait(0.01) .next(function() { - assertReady(); - message = connection.emitMessage('testRequest', - { command: 'foobar' }, - callback, - { timeout: -1 }); - assert.envelopeEqual(message, - createExpectedEnvelope('testRequest', - { command: 'foobar' })); - }) - .wait(0.01) - .next(function() { assert.equal(backend.received.length, 1, 'message should be sent'); assert.deepEqual(backend.received[0][2], message); assert.equal(connection.listeners('reply:' + message.id).length, @@ -426,10 +391,6 @@ suite('Connection, basic features', function() { suite('Connection, to backend', function() { var connection; var backend; - var setupDone; - function assertReady() { - assert.equal(setupDone, true, 'setup process is not finished yet!'); - } setup(function(done) { createBackend() @@ -442,7 +403,6 @@ suite('Connection, to backend', function() { maxRetyrCount: 3, retryDelay: 1 }); - setupDone = true; done(); }); }); @@ -456,18 +416,13 @@ suite('Connection, to backend', function() { connection.close(); connection = undefined; } - setupDone = false; }); test('normal messaging', function(done) { + connection.emitMessage({ message: true }); Deferred .wait(0.01) .next(function() { - assertReady(); - connection.emitMessage({ message: true }); - }) - .wait(0.01) - .next(function() { assert.equal(backend.received.length, 1, 'message should be sent: ' + JSON.stringify(backend.received)); @@ -482,14 +437,10 @@ suite('Connection, to backend', function() { test('disconnected suddenly', function(done) { var errorHandler; var restartedBackend; + connection.emitMessage('test', { message: true }); Deferred .wait(0.01) .next(function() { - assertReady(); - connection.emitMessage('test', { message: true }); - }) - .wait(0.01) - .next(function() { assert.equal(backend.received.length, 1, 'message should be sent: ' + JSON.stringify(backend.received)); -------------- next part -------------- HTML����������������������������...Download