Bug 1230549 - Make Storage pass basic eslint. r=yoric

--HG--
rename : browser/.eslintrc => storage/.eslintrc
extra : commitid : 5RiWGmPFkg2
extra : rebase_source : 54b8a2e9680c37d88c0a501d85422163f4e04fea

storage/.eslintrc

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "../toolkit/.eslintrc"
+  ]
+}

storage/test/unit/test_chunk_growth.js

@@ -1,7 +1,3 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
 // This file tests SQLITE_FCNTL_CHUNK_SIZE behaves as expected
 
 function run_sql(d, sql) {
@@ -10,8 +6,7 @@ function run_sql(d, sql) {
   stmt.finalize();
 }
 
-function new_file(name)
-{
+function new_file(name) {
   var file = dirSvc.get("ProfD", Ci.nsIFile);
   file.append(name);
   return file;
@@ -21,14 +16,16 @@ function get_size(name) {
   return new_file(name).fileSize
 }
 
-function run_test()
-{
+function run_test() {
   const filename = "chunked.sqlite";
   const CHUNK_SIZE = 512 * 1024;
   var d = getDatabase(new_file(filename));
   try {
     d.setGrowthIncrement(CHUNK_SIZE, "");
-  } catch (e if e.result == Cr.NS_ERROR_FILE_TOO_BIG) {
+  } catch (e) {
+    if (e.result != Cr.NS_ERROR_FILE_TOO_BIG) {
+      throw e;
+    }
     print("Too little free space to set CHUNK_SIZE!");
     return;
   }

storage/test/unit/test_connection_executeAsync.js

@@ -12,8 +12,7 @@ const TEXT = "this is test text";
 const REAL = 3.23;
 const BLOB = [1, 2];
 
-function test_create_and_add()
-{
+add_test(function test_create_and_add() {
   getOpenedDatabase().executeSimpleSQL(
     "CREATE TABLE test (" +
       "id INTEGER, " +
@@ -96,10 +95,9 @@ function test_create_and_add()
   });
   stmts[0].finalize();
   stmts[1].finalize();
-}
+});
 
-function test_multiple_bindings_on_statements()
-{
+add_test(function test_multiple_bindings_on_statements() {
   // This tests to make sure that we pass all the statements multiply bound
   // parameters when we call executeAsync.
   const AMOUNT_TO_ADD = 5;
@@ -176,10 +174,9 @@ function test_multiple_bindings_on_statements()
     }
   });
   stmts.forEach(stmt => stmt.finalize());
-}
+});
 
-function test_asyncClose_does_not_complete_before_statements()
-{
+add_test(function test_asyncClose_does_not_complete_before_statements() {
   let stmt = createStatement("SELECT * FROM sqlite_master");
   let executed = false;
   stmt.executeAsync({
@@ -210,48 +207,36 @@ function test_asyncClose_does_not_complete_before_statements()
     gDBConn = null;
     run_next_test();
   });
-}
+});
 
-function test_asyncClose_does_not_throw_no_callback()
-{
+add_test(function test_asyncClose_does_not_throw_no_callback() {
   getOpenedDatabase().asyncClose();
 
   // Reset gDBConn so that later tests will get a new connection object.
   gDBConn = null;
   run_next_test();
-}
+});
 
-function test_double_asyncClose_throws()
-{
+add_test(function test_double_asyncClose_throws() {
   let conn = getOpenedDatabase();
   conn.asyncClose();
   try {
     conn.asyncClose();
     do_throw("should have thrown");
     // There is a small race condition here, which can cause either of
     // Cr.NS_ERROR_NOT_INITIALIZED or Cr.NS_ERROR_UNEXPECTED to be thrown.
-  } catch (e if "result" in e && e.result == Cr.NS_ERROR_NOT_INITIALIZED) {
-    do_print("NS_ERROR_NOT_INITIALIZED");
-  } catch (e if "result" in e && e.result == Cr.NS_ERROR_UNEXPECTED) {
-    do_print("NS_ERROR_UNEXPECTED");
   } catch (e) {
+    if ("result" in e && e.result == Cr.NS_ERROR_NOT_INITIALIZED) {
+      do_print("NS_ERROR_NOT_INITIALIZED");
+    } else if ("result" in e && e.result == Cr.NS_ERROR_UNEXPECTED) {
+      do_print("NS_ERROR_UNEXPECTED");
+    }
   }
 
   // Reset gDBConn so that later tests will get a new connection object.
   gDBConn = null;
   run_next_test();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// Test Runner
-
-[
-  test_create_and_add,
-  test_multiple_bindings_on_statements,
-  test_asyncClose_does_not_complete_before_statements,
-  test_asyncClose_does_not_throw_no_callback,
-  test_double_asyncClose_throws,
-].forEach(add_test);
+});
 
 function run_test()
 {

storage/test/unit/test_connection_executeSimpleSQLAsync.js

@@ -55,7 +55,7 @@ function executeSimpleSQLAsync(db, query, onResult) {
   return deferred.promise;
 }
 
-add_task(function test_create_and_add() {
+add_task(function* test_create_and_add() {
   let adb = yield openAsyncDatabase(getTestDB());
 
   let completion = yield executeSimpleSQLAsync(adb,
@@ -97,7 +97,7 @@ add_task(function test_create_and_add() {
 });
 
 
-add_task(function test_asyncClose_does_not_complete_before_statement() {
+add_task(function* test_asyncClose_does_not_complete_before_statement() {
   let adb = yield openAsyncDatabase(getTestDB());
   let executed = false;
 
@@ -121,11 +121,3 @@ add_task(function test_asyncClose_does_not_complete_before_statement() {
 
   yield asyncClose(adb);
 });
-
-////////////////////////////////////////////////////////////////////////////////
-//// Test Runner
-
-function run_test()
-{
-  run_next_test();
-}