Add expectAsyncX and expectAsyncUntilX methods, and deprecate the old methods.

test/util/stream_queue_test.dart

Index: test/util/stream_queue_test.dart
diff --git a/test/util/stream_queue_test.dart b/test/util/stream_queue_test.dart
index 7cc1557cafcbe0c047a687c46ac885b9b080d5d5..7b5872de93e0f90523a25868f73263eb5198f06f 100644
--- a/test/util/stream_queue_test.dart
+++ b/test/util/stream_queue_test.dart
@@ -743,7 +743,7 @@ main() {
         var queue4Fired = false;
         var queue5Fired = false;
 
-        queue5.next.then(expectAsync((_) {
+        queue5.next.then(expectAsync1((_) {
           queue5Fired = true;
           expect(queue1Fired, isTrue);
           expect(queue2Fired, isTrue);
@@ -751,7 +751,7 @@ main() {
           expect(queue4Fired, isTrue);
         }));
 
-        queue1.next.then(expectAsync((_) {
+        queue1.next.then(expectAsync1((_) {
           queue1Fired = true;
           expect(queue2Fired, isFalse);
           expect(queue3Fired, isFalse);
@@ -759,7 +759,7 @@ main() {
           expect(queue5Fired, isFalse);
         }));
 
-        queue4.next.then(expectAsync((_) {
+        queue4.next.then(expectAsync1((_) {
           queue4Fired = true;
           expect(queue1Fired, isTrue);
           expect(queue2Fired, isTrue);
@@ -767,7 +767,7 @@ main() {
           expect(queue5Fired, isFalse);
         }));
 
-        queue2.next.then(expectAsync((_) {
+        queue2.next.then(expectAsync1((_) {
           queue2Fired = true;
           expect(queue1Fired, isTrue);
           expect(queue3Fired, isFalse);
@@ -775,7 +775,7 @@ main() {
           expect(queue5Fired, isFalse);
         }));
 
-        queue3.next.then(expectAsync((_) {
+        queue3.next.then(expectAsync1((_) {
           queue3Fired = true;
           expect(queue1Fired, isTrue);
           expect(queue2Fired, isTrue);
@@ -995,7 +995,7 @@ main() {
         var queue1 = new StreamQueue<int>(createStream());
         var queue2 = queue1.fork();
 
-        queue2.rest.listen(expectAsync((_) {}, count: 0)).pause();
+        queue2.rest.listen(expectAsync1((_) {}, count: 0)).pause();
 
         expect(await queue1.next, 1);
         expect(await queue1.next, 2);
@@ -1008,7 +1008,7 @@ main() {
         var queue1 = new StreamQueue<int>(createStream());
         var queue2 = queue1.fork();
 
-        queue1.rest.listen(expectAsync((_) {}, count: 0)).pause();
+        queue1.rest.listen(expectAsync1((_) {}, count: 0)).pause();
 
         expect(await queue2.next, 1);
         expect(await queue2.next, 2);