groonga/gcs [master] Stop using suiteSestup and suiteTeardown (Groonga-commit) - Groonga - fulltext search engine.

Yoji SHIDARA	2012-07-17 10:59:28 +0900 (Tue, 17 Jul 2012)

  New Revision: 3990672077e06a6dd0de8c6608ea5d096d0e3f9d
  https://github.com/groonga/gcs/commit/3990672077e06a6dd0de8c6608ea5d096d0e3f9d

  Log:
    Stop using suiteSestup and suiteTeardown

  Modified files:
    test/api-batch.test.js
    test/batch-processor.test.js

  Modified: test/api-batch.test.js (+4 -11)
===================================================================

--- test/api-batch.test.js    2012-07-17 10:29:27 +0900 (d262f7a)
+++ test/api-batch.test.js    2012-07-17 10:59:28 +0900 (959bfff)
@@ -9,22 +9,13 @@ var deletedLoadDump = fs.readFileSync(__dirname + '/fixture/companies/data-delet
 var addBatch = fs.readFileSync(__dirname + '/fixture/companies/add.sdf.json', 'UTF-8');
 var deleteBatch = fs.readFileSync(__dirname + '/fixture/companies/delete.sdf.json', 'UTF-8');
 
-var temporaryDatabase;
-
-suiteSetup(function() {
-  temporaryDatabase = utils.createTemporaryDatabase();
-});
-
-suiteTeardown(function() {
-  temporaryDatabase.teardown();
-  temporaryDatabase = undefined;
-});
-
 suite('documents/batch API', function() {
   var context;
   var server;
+  var temporaryDatabase;
 
   setup(function() {
+    temporaryDatabase = utils.createTemporaryDatabase();
     context = temporaryDatabase.get();
     utils.loadDumpFile(context, __dirname + '/fixture/companies/ddl.grn');
     server = utils.setupServer(context);
@@ -33,6 +24,8 @@ suite('documents/batch API', function() {
   teardown(function() {
     server.close();
     temporaryDatabase.clear();
+    temporaryDatabase.teardown();
+    temporaryDatabase = undefined;
   });
 
   test('add', function(done) {

  Modified: test/batch-processor.test.js (+4 -10)
===================================================================
--- test/batch-processor.test.js    2012-07-17 10:29:27 +0900 (fadcf29)
+++ test/batch-processor.test.js    2012-07-17 10:59:28 +0900 (e4f236b)
@@ -11,22 +11,14 @@ var loadDump = fs.readFileSync(__dirname + '/fixture/companies/data.grn', 'UTF-8
 var deletedLoadDump = fs.readFileSync(__dirname + '/fixture/companies/data-deleted.grn', 'UTF-8').replace(/\s+$/, '');
 var deleteDump = fs.readFileSync(__dirname + '/fixture/companies/delete.grn', 'UTF-8').replace(/\s+$/, '');
 
-var temporaryDatabase;
-
-suiteSetup(function() {
-  temporaryDatabase = utils.createTemporaryDatabase();
-});
-
-suiteTeardown(function() {
-  temporaryDatabase.teardown();
-  temporaryDatabase = undefined;
-});
 
 suite('batch/processor/Processor (instance methods)', function() {
   var processor;
   var context;
+  var temporaryDatabase;
 
   setup(function() {
+    temporaryDatabase = utils.createTemporaryDatabase();
     context = temporaryDatabase.get();
     utils.loadDumpFile(context, __dirname + '/fixture/companies/ddl.grn');
 
@@ -40,6 +32,8 @@ suite('batch/processor/Processor (instance methods)', function() {
   teardown(function() {
     processor = undefined;
     temporaryDatabase.clear();
+    temporaryDatabase.teardown();
+    temporaryDatabase = undefined;
   });
 
   test('initialize', function() {
-------------- next part --------------
HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...
Download 


Groonga - fulltext search engine.

[Groonga-commit] groonga/gcs [master] Stop using suiteSestup and suiteTeardown