YUKI Hiroshi
null+****@clear*****
Thu Feb 14 12:09:54 JST 2013
YUKI Hiroshi 2013-02-14 12:09:54 +0900 (Thu, 14 Feb 2013) New Revision: 742cb6649465534cc2e345c6706f4901d567ee5f https://github.com/groonga/express-kotoumi/commit/742cb6649465534cc2e345c6706f4901d567ee5f Log: test: Utilize assertion for backend received messages 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 (+4 -12) =================================================================== --- test/express-adaptor.test.js 2013-02-14 12:05:43 +0900 (cd861be) +++ test/express-adaptor.test.js 2013-02-14 12:09:54 +0900 (1847321) @@ -62,12 +62,8 @@ suite('Adaption for express application', function() { Deferred .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' }]); var request = backend.getMessages()[0]; var response = utils.createReplyEnvelope(request, @@ -102,12 +98,8 @@ suite('Adaption for express application', function() { Deferred .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' }]); var request = backend.getMessages()[0]; var response = utils.createReplyEnvelope(request, Modified: test/frontend-rest-adaptor.test.js (+4 -12) =================================================================== --- test/frontend-rest-adaptor.test.js 2013-02-14 12:05:43 +0900 (2f6c7a3) +++ test/frontend-rest-adaptor.test.js 2013-02-14 12:09:54 +0900 (031c36c) @@ -116,12 +116,8 @@ suite('REST API', function() { Deferred .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' }]); var request = backend.getMessages()[0]; var response = utils.createReplyEnvelope(request, @@ -156,12 +152,8 @@ suite('REST API', function() { Deferred .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' }]); var request = backend.getMessages()[0]; var response = utils.createReplyEnvelope(request, Modified: test/frontend-socket.io-adaptor.test.js (+4 -12) =================================================================== --- test/frontend-socket.io-adaptor.test.js 2013-02-14 12:05:43 +0900 (a80e133) +++ test/frontend-socket.io-adaptor.test.js 2013-02-14 12:09:54 +0900 (bb15356) @@ -155,12 +155,8 @@ suite('Socket.IO API', function() { }) .wait(0.01) .next(function() { - assert.deepEqual(backend.getMessages().map(function(message) { - return { type: message.type, - body: message.body }; - }), - [{ type: params.expectedClientCommand, - body: params.expectedClientBody }]); + backend.assertReceived([{ type: params.expectedClientCommand, + body: params.expectedClientBody }]); mockedReceiver = nodemock .mock('receive') @@ -325,12 +321,8 @@ suite('Socket.IO API', function() { }) .wait(0.01) .next(function() { - assert.deepEqual(backend.getMessages().map(function(message) { - return { type: message.type, - body: message.body }; - }), - [{ type: params.expectedClientCommand, - body: params.expectedClientBody }]); + backend.assertReceived([{ type: params.expectedClientCommand, + body: params.expectedClientBody }]); mockedReceiver = nodemock .mock('receive') Modified: test/test-utils.js (+7 -0) =================================================================== --- test/test-utils.js 2013-02-14 12:05:43 +0900 (4bb3e20) +++ test/test-utils.js 2013-02-14 12:09:54 +0900 (e0a6ce4) @@ -263,6 +263,13 @@ function createBackend() { return envelope.body; }); }; + backend.assertReceived = function(expectedMessages) { + assert.deepEqual(this.getMessages().map(function(message) { + return { type: message.type, + body: message.body }; + }), + expectedMessages); + }; return deferred; } exports.createBackend = createBackend; -------------- next part -------------- HTML����������������������������...ダウンロード
