diff -r 000000000000 -r 6474c204b198 storage/test/unit/test_connection_executeSimpleSQLAsync.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/storage/test/unit/test_connection_executeSimpleSQLAsync.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,131 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * This file tests the functionality of
+ * mozIStorageAsyncConnection::executeSimpleSQLAsync.
+ */
+
+const INTEGER = 1;
+const TEXT = "this is test text";
+const REAL = 3.23;
+
+function asyncClose(db) {
+  let deferred = Promise.defer();
+  db.asyncClose(function(status) {
+    if (Components.isSuccessCode(status)) {
+      deferred.resolve();
+    } else {
+      deferred.reject(status);
+    }
+  });
+  return deferred.promise;
+}
+
+function openAsyncDatabase(file) {
+  let deferred = Promise.defer();
+  getService().openAsyncDatabase(file, null, function(status, db) {
+    if (Components.isSuccessCode(status)) {
+      deferred.resolve(db.QueryInterface(Ci.mozIStorageAsyncConnection));
+    } else {
+      deferred.reject(status);
+    }
+  });
+  return deferred.promise;
+}
+
+function executeSimpleSQLAsync(db, query, onResult) {
+  let deferred = Promise.defer();
+  db.executeSimpleSQLAsync(query, {
+    handleError: function(error) {
+      deferred.reject(error);
+    },
+    handleResult: function(result) {
+      if (onResult) {
+        onResult(result);
+      } else {
+        do_throw("No results were expected");
+      }
+    },
+    handleCompletion: function(result) {
+      deferred.resolve(result);
+    }
+  });
+  return deferred.promise;
+}
+
+add_task(function test_create_and_add() {
+  let adb = yield openAsyncDatabase(getTestDB());
+
+  let completion = yield executeSimpleSQLAsync(adb,
+    "CREATE TABLE test (id INTEGER, string TEXT, number REAL)");
+
+  do_check_eq(Ci.mozIStorageStatementCallback.REASON_FINISHED, completion);
+
+  completion = yield executeSimpleSQLAsync(adb,
+    "INSERT INTO test (id, string, number) " +
+    "VALUES (" + INTEGER + ", \"" + TEXT + "\", " + REAL + ")");
+
+  do_check_eq(Ci.mozIStorageStatementCallback.REASON_FINISHED, completion);
+
+  let result = null;
+
+  completion = yield executeSimpleSQLAsync(adb,
+    "SELECT string, number FROM test WHERE id = 1",
+    function(aResultSet) {
+      result = aResultSet.getNextRow();
+      do_check_eq(2, result.numEntries);
+      do_check_eq(TEXT, result.getString(0));
+      do_check_eq(REAL, result.getDouble(1));
+    }
+  );
+
+  do_check_eq(Ci.mozIStorageStatementCallback.REASON_FINISHED, completion);
+  do_check_neq(result, null);
+  result = null;
+
+  yield executeSimpleSQLAsync(adb, "SELECT COUNT(0) FROM test",
+    function(aResultSet) {
+      result = aResultSet.getNextRow();
+      do_check_eq(1, result.getInt32(0));
+    });
+
+  do_check_neq(result, null);
+
+  yield asyncClose(adb);
+});
+
+
+add_task(function test_asyncClose_does_not_complete_before_statement() {
+  let adb = yield openAsyncDatabase(getTestDB());
+  let executed = false;
+
+  let reason = yield executeSimpleSQLAsync(adb, "SELECT * FROM test",
+    function(aResultSet) {
+      let result = aResultSet.getNextRow();
+
+      do_check_neq(result, null);
+      do_check_eq(3, result.numEntries);
+      do_check_eq(INTEGER, result.getInt32(0));
+      do_check_eq(TEXT, result.getString(1));
+      do_check_eq(REAL, result.getDouble(2));
+      executed = true;
+    }
+  );
+
+  do_check_eq(Ci.mozIStorageStatementCallback.REASON_FINISHED, reason);
+
+  // Ensure that the statement executed to completion.
+  do_check_true(executed);
+
+  yield asyncClose(adb);
+});
+
+////////////////////////////////////////////////////////////////////////////////
+//// Test Runner
+
+function run_test()
+{
+  run_next_test();
+}