[Groonga-commit] droonga/express-droonga at 613b1ee [master] Don't create fake backend if not needed

Back to archive index

YUKI Hiroshi null+****@clear*****
Fri Oct 17 19:35:47 JST 2014


YUKI Hiroshi	2014-10-17 19:35:47 +0900 (Fri, 17 Oct 2014)

  New Revision: 613b1ee50e57d28feb576e6b00d6b195d3745d4e
  https://github.com/droonga/express-droonga/commit/613b1ee50e57d28feb576e6b00d6b195d3745d4e

  Message:
    Don't create fake backend if not needed

  Modified files:
    test/express-adapter.test.js
    test/test-utils.js

  Modified: test/express-adapter.test.js (+2 -16)
===================================================================
--- test/express-adapter.test.js    2014-10-17 19:32:31 +0900 (6f90bac)
+++ test/express-adapter.test.js    2014-10-17 19:35:47 +0900 (a112b6d)
@@ -31,7 +31,6 @@ suite('Adaption for express application', function() {
   };
 
   suite('REST API registeration', function() {
-    var backend;
     var connectionPool;
     var application;
     var server;
@@ -40,7 +39,6 @@ suite('Adaption for express application', function() {
       connectionPool = utils.createStubbedBackendConnectionPool();
       utils.setupApplication({ connectionPool: connectionPool })
         .then(function(result) {
-          backend = result.backend;
           server = result.server;
           application = result.application;
           done();
@@ -49,8 +47,7 @@ suite('Adaption for express application', function() {
     });
 
     teardown(function() {
-      utils.teardownApplication({ backend:    backend,
-                                  server:     server,
+      utils.teardownApplication({ server:     server,
                                   connectionPool: connectionPool });
     });
 
@@ -61,14 +58,6 @@ suite('Adaption for express application', function() {
         plugins:    [testRestPlugin, testSocketPlugin]
       });
 
-      backend.reserveResponse(function(request) {
-        return utils.createReplyPacket(request,
-                                       {
-                                         statusCode: 200,
-                                         body:       'API response',
-                                       });
-      });
-
       utils.get('/path/to/api')
         .then(function(response) {
           assert.deepEqual(response,
@@ -113,13 +102,11 @@ suite('Adaption for express application', function() {
     var connectionPool;
     var server;
     var clientSocket;
-    var backend;
 
     setup(function(done) {
       connectionPool = utils.createStubbedBackendConnectionPool();
       utils.setupApplication({ connectionPool: connectionPool })
         .then(function(result) {
-          backend = result.backend;
           server = result.server;
           application = result.application;
           done();
@@ -132,8 +119,7 @@ suite('Adaption for express application', function() {
         clientSocket.disconnect();
         clientSocket = undefined;
       }
-      utils.teardownApplication({ backend:    backend,
-                                  server:     server,
+      utils.teardownApplication({ server:     server,
                                   connectionPool: connectionPool });
     });
 

  Modified: test/test-utils.js (+2 -1)
===================================================================
--- test/test-utils.js    2014-10-17 19:32:31 +0900 (d55dc9b)
+++ test/test-utils.js    2014-10-17 19:35:47 +0900 (40f5010)
@@ -285,8 +285,9 @@ function setupApplication(params) {
   return setupServer(application)
     .then(function(newServer) {
       server = newServer;
+      if (!params.connectionPool)
+        return exports.createBackend();
     })
-    .then(exports.createBackendCb())
     .then(function(newBackend) {
       backend = newBackend;
       var connectionPool = params.connectionPool || new ConnectionPool({
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index