Groonga - fulltext search engine.

[Groonga-commit] droonga/express-droonga at 3ff7792 [master] test: Use error handling of Deferred chain

YUKI Hiroshi null+****@clear*****
Mon Apr 28 12:12:23 JST 2014

• Previous message: [Groonga-commit] droonga/express-droonga at c023fd8 [master] test: Add tests for ".json" suffix
• Next message: [Groonga-commit] droonga/express-droonga at 166d401 [master] test: Add tests for URL suffix of other Groonga commands
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

YUKI Hiroshi	2014-04-28 12:12:23 +0900 (Mon, 28 Apr 2014)

  New Revision: 3ff7792377303a33a95ac1a885884f2695adcd9b
  https://github.com/droonga/express-droonga/commit/3ff7792377303a33a95ac1a885884f2695adcd9b

  Message:
    test: Use error handling of Deferred chain

  Modified files:
    test/adapter/api/groonga/load.test.js

  Modified: test/adapter/api/groonga/load.test.js (+112 -124)
===================================================================
--- test/adapter/api/groonga/load.test.js    2014-04-28 12:08:54 +0900 (263591c)
+++ test/adapter/api/groonga/load.test.js    2014-04-28 12:12:23 +0900 (8663559)
@@ -69,12 +69,11 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load?table=Users', JSON.stringify(body))
           .next(function(response) {
-            try {
-              assert.deepEqual(response.statusCode, 200);
-              done();
-            } catch (error) {
-              done(error);
-            }
+            assert.deepEqual(response.statusCode, 200);
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
 
@@ -84,12 +83,11 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load.json?table=Users', JSON.stringify(body))
           .next(function(response) {
-            try {
-              assert.deepEqual(response.statusCode, 200);
-              done();
-            } catch (error) {
-              done(error);
-            }
+            assert.deepEqual(response.statusCode, 200);
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
     });
@@ -101,12 +99,11 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load?table=Users', JSON.stringify(body))
           .next(function(response) {
-            try {
-              assert.deepEqual(response.statusCode, 200);
-              done();
-            } catch (error) {
-              done(error);
-            }
+            assert.deepEqual(response.statusCode, 200);
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
     });
@@ -118,13 +115,12 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load?table=Users', JSON.stringify(body))
           .next(function(response) {
-            try {
-              var responseBody = groongaResponseBody(response);
-              assert.deepEqual(responseBody, [0]);
-              done();
-            } catch (error) {
-              done(error);
-            }
+            var responseBody = groongaResponseBody(response);
+            assert.deepEqual(responseBody, [0]);
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
 
@@ -137,13 +133,12 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load?table=Users', JSON.stringify(body))
           .next(function(response) {
-            try {
-              var responseBody = groongaResponseBody(response);
-              assert.deepEqual(responseBody, [1]);
-              done();
-            } catch (error) {
-              done(error);
-            }
+            var responseBody = groongaResponseBody(response);
+            assert.deepEqual(responseBody, [1]);
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
 
@@ -160,13 +155,12 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load?table=Users', JSON.stringify(body))
           .next(function(response) {
-            try {
-              var responseBody = groongaResponseBody(response);
-              assert.deepEqual(responseBody, [2]);
-              done();
-            } catch (error) {
-              done(error);
-            }
+            var responseBody = groongaResponseBody(response);
+            assert.deepEqual(responseBody, [2]);
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
     });
@@ -186,19 +180,18 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load?table=Memos', JSON.stringify(body))
           .next(function(response) {
-            try {
-              assert.deepEqual(requestBody,
-                               {
-                                 table: 'Memos',
-                                 values: {
-                                   title: 'Droonga',
-                                   content: 'Droonga is fun!'
-                                 }
-                               });
-              done();
-            } catch (error) {
-              done(error);
-            }
+            assert.deepEqual(requestBody,
+                             {
+                               table: 'Memos',
+                               values: {
+                                 title: 'Droonga',
+                                 content: 'Droonga is fun!'
+                               }
+                             });
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
 
@@ -217,20 +210,19 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load?table=Users', JSON.stringify(body))
           .next(function(response) {
-            try {
-              assert.deepEqual(requestBody,
-                               {
-                                 table: 'Users',
-                                 key: 'alice',
-                                 values: {
-                                   name: 'Alice',
-                                   age: 20
-                                 }
-                               });
-              done();
-            } catch (error) {
-              done(error);
-            }
+            assert.deepEqual(requestBody,
+                             {
+                               table: 'Users',
+                               key: 'alice',
+                               values: {
+                                 name: 'Alice',
+                                 age: 20
+                               }
+                             });
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
     });
@@ -254,19 +246,18 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load?table=Memos', JSON.stringify(body))
           .next(function(response) {
-            try {
-              assert.deepEqual(requestBody,
-                               {
-                                 table: 'Memos',
-                                 values: {
-                                   title: 'Droonga',
-                                   content: 'Droonga is fun!'
-                                 }
-                               });
-              done();
-            } catch (error) {
-              done(error);
-            }
+            assert.deepEqual(requestBody,
+                             {
+                               table: 'Memos',
+                               values: {
+                                 title: 'Droonga',
+                                 content: 'Droonga is fun!'
+                               }
+                             });
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
 
@@ -290,20 +281,19 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post('/d/load?table=Users', JSON.stringify(body))
           .next(function(response) {
-            try {
-              assert.deepEqual(requestBody,
-                               {
-                                 table: 'Users',
-                                 key: 'alice',
-                                 values: {
-                                   name: 'Alice',
-                                   age: 20
-                                 }
-                               });
-              done();
-            } catch (error) {
-              done(error);
-            }
+            assert.deepEqual(requestBody,
+                             {
+                               table: 'Users',
+                               key: 'alice',
+                               values: {
+                                 name: 'Alice',
+                                 age: 20
+                               }
+                             });
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
 
@@ -323,20 +313,19 @@ suite('adapter/api/groonga: load', function() {
         ]
         utils.post(path, JSON.stringify(body))
           .next(function(response) {
-            try {
-              assert.deepEqual(requestBody,
-                               {
-                                 table: 'Users',
-                                 key: 'alice',
-                                 values: {
-                                   name: 'Alice',
-                                   age: 20
-                                 }
-                               });
-              done();
-            } catch (error) {
-              done(error);
-            }
+            assert.deepEqual(requestBody,
+                             {
+                               table: 'Users',
+                               key: 'alice',
+                               values: {
+                                 name: 'Alice',
+                                 age: 20
+                               }
+                             });
+            done();
+          })
+          .error(function(error) {
+            done(error);
           });
       });
     });
@@ -351,24 +340,23 @@ suite('adapter/api/groonga: load', function() {
       ];
       utils.post('/d/load', JSON.stringify(body))
         .next(function(responseMessage) {
-          try {
-            var actual = {
-              httpStatusCode: responseMessage.statusCode,
-              groongaStatusCode: groongaResponseHeader(responseMessage)[0],
-              errorMessage: groongaResponseHeader(responseMessage)[3],
-              body: groongaResponseBody(responseMessage)
-            }
-            assert.deepEqual(actual,
-                             {
-                               httpStatusCode: 400,
-                               groongaStatusCode: -22,
-                               errorMessage: 'required parameter is missing: <table>',
-                               body: [0]
-                             });
-            done();
-          } catch (error) {
-            done(error);
+          var actual = {
+            httpStatusCode: responseMessage.statusCode,
+            groongaStatusCode: groongaResponseHeader(responseMessage)[0],
+            errorMessage: groongaResponseHeader(responseMessage)[3],
+            body: groongaResponseBody(responseMessage)
           }
+          assert.deepEqual(actual,
+                           {
+                             httpStatusCode: 400,
+                             groongaStatusCode: -22,
+                             errorMessage: 'required parameter is missing: <table>',
+                             body: [0]
+                           });
+          done();
+        })
+        .error(function(error) {
+          done(error);
         });
     });
   });
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] droonga/express-droonga at c023fd8 [master] test: Add tests for ".json" suffix
• Next message: [Groonga-commit] droonga/express-droonga at 166d401 [master] test: Add tests for URL suffix of other Groonga commands
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]