Implement measurement using futures

client/tests/client/samples/dartcombat/dartcombat_tests.dart

Index: client/tests/client/samples/dartcombat/dartcombat_tests.dart
diff --git a/client/tests/client/samples/dartcombat/dartcombat_tests.dart b/client/tests/client/samples/dartcombat/dartcombat_tests.dart
index 7638ff464e0dbf89fb56dac0bb846e94589d7871..3367576e0be331ad1c922b92576e7047b91bcad0 100644
--- a/client/tests/client/samples/dartcombat/dartcombat_tests.dart
+++ b/client/tests/client/samples/dartcombat/dartcombat_tests.dart
@@ -45,31 +45,33 @@ main() {
     // add a boat of length 4 using mousedown/mousemove/mouseup
     var startCell = p1OwnBoard.nodes[0].nodes[4].nodes[2];
     var endCell = p1OwnBoard.nodes[0].nodes[4].nodes[5];
-    doMouseEvent('mousedown', startCell);
-    doMouseEvent('mousemove', endCell);
-    doMouseEvent('mouseup', endCell);
-
-    // check that the boat was added:
-    var boat = p1OwnBoard.nodes[1];
-    expect(boat.classes).equalsSet(['icons', 'boat4', 'boatdir-left']);
-
-    // check that the boat shows as sunk in player 1's board:
-    // Note that the shoot order is respected: center, left, right, up, down,
-    // left, right again, as if they progress in parallel.
-    List<int> expectedShots = const [
-        Constants.HIT,  3, 4,  // initial shot (center)
-        Constants.HIT,  2, 4,  // left
-        Constants.HIT,  4, 4,  // right
-        Constants.MISS, 3, 3,  // up
-        Constants.MISS, 3, 5,  // down
-        Constants.MISS, 1, 4,  // left
-        Constants.SUNK, 5, 4]; // right
-    _expectShotSequence(expectedShots, p1OwnBoard, 1);
-
-    // hit the boat from the enemy side.
-    var p2EnemyBoard = document.query('#p2enemy');
-    var hitCell = p2EnemyBoard.nodes[0].nodes[4].nodes[3];
-    doMouseEvent('click', hitCell);
+    serialInvokeAsync([
+      () => doMouseEvent("mousedown", startCell),
+      () => doMouseEvent("mousemove", endCell),
+      () => doMouseEvent("mouseup", endCell),
+      () {
+      // check that the boat was added:
+      var boat = p1OwnBoard.nodes[1];
+      expect(boat.classes).equalsSet(['icons', 'boat4', 'boatdir-left']);
+
+      // check that the boat shows as sunk in player 1's board:
+      // Note that the shoot order is respected: center, left, right, up, down,
+      // left, right again, as if they progress in parallel.
+      List<int> expectedShots = const [
+          Constants.HIT,  3, 4,  // initial shot (center)
+          Constants.HIT,  2, 4,  // left
+          Constants.HIT,  4, 4,  // right
+          Constants.MISS, 3, 3,  // up
+          Constants.MISS, 3, 5,  // down
+          Constants.MISS, 1, 4,  // left
+          Constants.SUNK, 5, 4]; // right
+      _expectShotSequence(expectedShots, p1OwnBoard, 1);
+
+      // hit the boat from the enemy side.
+      var p2EnemyBoard = document.query("#p2enemy");
+      var hitCell = p2EnemyBoard.nodes[0].nodes[4].nodes[3];
+      doMouseEvent("click", hitCell);
+    }]);
   });
 
   asyncTest('serial shoot', 1, () {
@@ -79,32 +81,34 @@ main() {
     // add a boat of length 4 using mousedown/mousemove/mouseup
     var startCell = p2OwnBoard.nodes[0].nodes[3].nodes[8];
     var endCell = p2OwnBoard.nodes[0].nodes[7].nodes[8];
-    doMouseEvent('mousedown', startCell);
-    doMouseEvent('mousemove', endCell);
-    doMouseEvent('mouseup', endCell);
-
-    // check that the boat was added:
-    var boat = p2OwnBoard.nodes[1];
-    expect(boat.classes).equalsSet(['icons', 'boat5', 'boatdir-down']);
-
-    // check that the boat shows as sunk in player 2's board:
-    // Note that the shoot order is respected: center, left, right, up, down
-    // sequentially.
-    List<int> expectedShots = const [
-      Constants.HIT,  8, 4,  // initial shot (center)
-      Constants.MISS, 7, 4,  // left  (miss - stop this direction)
-      Constants.MISS, 9, 4,  // right (miss - stop this direction)
-      Constants.HIT,  8, 3,  // up
-      Constants.MISS, 8, 2,  // up    (miss - stop this direction)
-      Constants.HIT,  8, 5,  // down
-      Constants.HIT,  8, 6,  // down
-      Constants.SUNK, 8, 7]; // down  (sunk - done)
-    _expectShotSequence(expectedShots, p2OwnBoard, 2);
-
-    // hit the boat from the enemy side.
-    var p1EnemyBoard = document.query('#p1enemy');
-    var hitCell = p1EnemyBoard.nodes[0].nodes[4].nodes[8];
-    doMouseEvent('click', hitCell);
+    serialInvokeAsync([
+      () => doMouseEvent("mousedown", startCell),
+      () => doMouseEvent("mousemove", endCell),
+      () => doMouseEvent("mouseup", endCell),
+      () {
+      // check that the boat was added:
+      var boat = p2OwnBoard.nodes[1];
+      expect(boat.classes).equalsSet(['icons', 'boat5', 'boatdir-down']);
+
+      // check that the boat shows as sunk in player 2's board:
+      // Note that the shoot order is respected: center, left, right, up, down
+      // sequentially.
+      List<int> expectedShots = const [
+        Constants.HIT,  8, 4,  // initial shot (center)
+        Constants.MISS, 7, 4,  // left  (miss - stop this direction)
+        Constants.MISS, 9, 4,  // right (miss - stop this direction)
+        Constants.HIT,  8, 3,  // up
+        Constants.MISS, 8, 2,  // up    (miss - stop this direction)
+        Constants.HIT,  8, 5,  // down
+        Constants.HIT,  8, 6,  // down
+        Constants.SUNK, 8, 7]; // down  (sunk - done)
+      _expectShotSequence(expectedShots, p2OwnBoard, 2);
+
+      // hit the boat from the enemy side.
+      var p1EnemyBoard = document.query("#p1enemy");
+      var hitCell = p1EnemyBoard.nodes[0].nodes[4].nodes[8];
+      doMouseEvent("click", hitCell);
+    }]);
   });
 }