More async/await

Author: jamesots

test/integration/errors.dart

@@ -3,25 +3,19 @@ part of integrationtests;
 void runErrorTests(String user, String password, String db, int port, String host) {
   ConnectionPool pool;
   group('error tests:', () {
-    test('setup', () {
+    test('setup', () async {
       pool = new ConnectionPool(user:user, password:password, db:db, port:port, host:host, max:1,
 //          useCompression: false, 
           useSSL: true);
-      pool.getConnection().then((cnx) {
-        print("Connection secure: ${cnx.usingSSL}");
-        cnx.release();
-      });
+      var cnx = await pool.getConnection();
+      print("Connection secure: ${cnx.usingSSL}");
+      cnx.release();
       return setup(pool, "stream", "create table stream (id integer, name text)");
     });
 
-    test('store data', () {
-      var c = new Completer();
-      pool.prepare('insert into stream (id, name) values (?, ?)').then((query) {
-        query.execute([0, 'Bob']).then((Results results) {
-          c.complete();
-        });
-      });
-      return c.future;
+    test('store data', () async {
+      var query = await pool.prepare('insert into stream (id, name) values (?, ?)');
+      await query.execute([0, 'Bob']);
     });
 
     test('select from stream using query and listen', () {

test/integration/execute_multi.dart

@@ -9,29 +9,22 @@ void runExecuteMultiTests(String user, String password, String db, int port, Str
       "insert into stream (id, name) values (1, 'A'), (2, 'B'), (3, 'C')");
     });
 
-    test('store data', () {
-      var c = new Completer();
-      var theValues;
-      pool.prepare('select * from stream where id = ?').then((query) {
-        return query.executeMulti([[1], [2], [3]]);
-      }).then((values) {
-        theValues = values;
-        expect(values, hasLength(3));
-        return theValues[0].toList();
-      }).then((resultList) {
-        expect(resultList[0][0], equals(1));
-        expect(resultList[0][1].toString(), equals('A'));
-        return theValues[1].toList();
-      }).then((resultList) {
-        expect(resultList[0][0], equals(2));
-        expect(resultList[0][1].toString(), equals('B'));
-        return theValues[2].toList();
-      }).then((resultList) {
-        expect(resultList[0][0], equals(3));
-        expect(resultList[0][1].toString(), equals('C'));
-        c.complete(null);
-      });
-      return c.future;
+    test('store data', () async {
+      var query = await pool.prepare('select * from stream where id = ?');
+      var values = await query.executeMulti([[1], [2], [3]]);
+      expect(values, hasLength(3));
+
+      var resultList = await values[0].toList();
+      expect(resultList[0][0], equals(1));
+      expect(resultList[0][1].toString(), equals('A'));
+
+      resultList = await values[1].toList();
+      expect(resultList[0][0], equals(2));
+      expect(resultList[0][1].toString(), equals('B'));
+
+      resultList = await values[2].toList();
+      expect(resultList[0][0], equals(3));
+      expect(resultList[0][1].toString(), equals('C'));
     });
 
     test('close connection', () {

test/integration/nullmap.dart

@@ -8,14 +8,9 @@ void runNullMapTests(String user, String password, String db, int port, String h
       return setup(pool, "nullmap", "create table nullmap (a text, b text, c text, d text)");
     });
 
-    test('store data', () {
-      var c = new Completer();
-      pool.prepare('insert into nullmap (a, b, c, d) values (?, ?, ?, ?)').then((query) {
-        query.execute([null, 'b', 'c', 'd']).then((Results results) {
-          c.complete();
-        });
-      });
-      return c.future;
+    test('store data', () async {
+      var query = await pool.prepare('insert into nullmap (a, b, c, d) values (?, ?, ?, ?)');
+      await query.execute([null, 'b', 'c', 'd']);
     });
 
     test('read data', () {

test/integration/numbers.dart

@@ -1,11 +1,9 @@
 part of integrationtests;
 
-Future deleteInsertSelect(ConnectionPool pool, table, insert, select) {
-  return pool.query('delete from $table').then((_) {
-    return pool.query(insert);
-  }).then((_) {
-    return pool.query(select);
-  });
+Future deleteInsertSelect(ConnectionPool pool, table, insert, select) async {
+  await pool.query('delete from $table');
+  await pool.query(insert);
+  return pool.query(select);
 }
 
 void runNumberTests(String user, String password, String db, int port, String host) {