YUKI Hiroshi
null+****@clear*****
Thu Feb 14 12:14:54 JST 2013
YUKI Hiroshi 2013-02-14 12:14:54 +0900 (Thu, 14 Feb 2013) New Revision: fc2dec18b04d3c70a491341bb788976428d3fa0b https://github.com/groonga/express-kotoumi/commit/fc2dec18b04d3c70a491341bb788976428d3fa0b Log: test: Utlize operations to send messages from the backend Modified files: test/express-adaptor.test.js test/frontend-rest-adaptor.test.js test/frontend-socket.io-adaptor.test.js test/test-utils.js Modified: test/express-adaptor.test.js (+11 -24) =================================================================== --- test/express-adaptor.test.js 2013-02-14 12:09:54 +0900 (1847321) +++ test/express-adaptor.test.js 2013-02-14 12:14:54 +0900 (e56dd42) @@ -65,12 +65,9 @@ suite('Adaption for express application', function() { backend.assertReceived([{ type: 'api', body: 'api requested' }]); - var request = backend.getMessages()[0]; - var response = utils.createReplyEnvelope(request, - 'api.result', - 'api OK?'); - return utils.sendPacketTo(utils.createPacket(response), - utils.testReceivePort) + return backend.sendResponse(backend.getMessages()[0], + 'api.result', + 'api OK?'); }) .wait(0.01) .next(function() { @@ -101,12 +98,9 @@ suite('Adaption for express application', function() { backend.assertReceived([{ type: 'api', body: 'api requested' }]); - var request = backend.getMessages()[0]; - var response = utils.createReplyEnvelope(request, - 'api.result', - 'api OK?'); - return utils.sendPacketTo(utils.createPacket(response), - utils.testReceivePort) + return backend.sendResponse(backend.getMessages()[0], + 'api.result', + 'api OK?'); }) .wait(0.01) .next(function() { @@ -162,12 +156,8 @@ suite('Adaption for express application', function() { }) .wait(0.01) .next(function() { - assert.deepEqual(backend.getMessages().map(function(message) { - return { type: message.type, - body: message.body }; - }), - [{ type: 'api', - body: 'api requested' }]); + backend.assertReceived([{ type: 'api', + body: 'api requested' }]); mockedReceiver = nodemock .mock('receive') @@ -176,12 +166,9 @@ suite('Adaption for express application', function() { mockedReceiver.receive(data); }); - var request = backend.getMessages()[0]; - var response = utils.createReplyEnvelope(request, - 'api.result', - 'api OK?'); - return utils.sendPacketTo(utils.createPacket(response), - utils.testReceivePort) + return backend.sendResponse(backend.getMessages()[0], + 'api.result', + 'api OK?'); }) .wait(0.01) .next(function() { Modified: test/frontend-rest-adaptor.test.js (+6 -12) =================================================================== --- test/frontend-rest-adaptor.test.js 2013-02-14 12:09:54 +0900 (031c36c) +++ test/frontend-rest-adaptor.test.js 2013-02-14 12:14:54 +0900 (979bef7) @@ -119,12 +119,9 @@ suite('REST API', function() { backend.assertReceived([{ type: 'api', body: 'api requested' }]); - var request = backend.getMessages()[0]; - var response = utils.createReplyEnvelope(request, - 'api.result', - 'api OK?'); - return utils.sendPacketTo(utils.createPacket(response), - utils.testReceivePort) + return backend.sendResponse(backend.getMessages()[0], + 'api.result', + 'api OK?'); }) .wait(0.01) .next(function() { @@ -155,12 +152,9 @@ suite('REST API', function() { backend.assertReceived([{ type: 'api', body: 'api requested' }]); - var request = backend.getMessages()[0]; - var response = utils.createReplyEnvelope(request, - 'api.result', - 'api OK?'); - return utils.sendPacketTo(utils.createPacket(response), - utils.testReceivePort) + return backend.sendResponse(backend.getMessages()[0], + 'api.result', + 'api OK?'); }) .wait(0.01) .next(function() { Modified: test/frontend-socket.io-adaptor.test.js (+5 -10) =================================================================== --- test/frontend-socket.io-adaptor.test.js 2013-02-14 12:09:54 +0900 (bb15356) +++ test/frontend-socket.io-adaptor.test.js 2013-02-14 12:14:54 +0900 (f1c4957) @@ -165,12 +165,9 @@ suite('Socket.IO API', function() { mockedReceiver.receive(data); }); - var request = backend.getMessages()[0]; - var response = utils.createReplyEnvelope(request, - params.backendCommand, - params.backendBody); - return utils.sendPacketTo(utils.createPacket(response), - utils.testReceivePort) + return backend.sendResponse(backend.getMessages()[0], + params.backendCommand, + params.backendBody); }) .wait(0.01) .next(function() { @@ -331,10 +328,8 @@ suite('Socket.IO API', function() { mockedReceiver.receive(data); }); - var published = utils.createEnvelope(params.backendCommand, - params.backendBody); - return utils.sendPacketTo(utils.createPacket(published), - utils.testReceivePort) + return backend.sendMessage(params.backendCommand, + params.backendBody); }) .wait(0.01) .next(function() { Modified: test/test-utils.js (+8 -0) =================================================================== --- test/test-utils.js 2013-02-14 12:09:54 +0900 (e0a6ce4) +++ test/test-utils.js 2013-02-14 12:14:54 +0900 (5485332) @@ -270,6 +270,14 @@ function createBackend() { }), expectedMessages); }; + backend.sendMessage = function(type, body) { + var response = createEnvelope(type, body); + return sendPacketTo(createPacket(response), testReceivePort) + }; + backend.sendResponse = function(request, type, body) { + var response = createReplyEnvelope(request, type, body); + return sendPacketTo(createPacket(response), testReceivePort) + }; return deferred; } exports.createBackend = createBackend; -------------- next part -------------- HTML����������������������������...Download
