commit 3c78ad961425ce838ed06454cdcfe8b3fda8c5ae
author Nate Bosch <nbosch@google.com> Fri Oct 04 12:20:34 2019 -0700
committer GitHub <noreply@github.com> Fri Oct 04 12:20:34 2019 -0700
tree 4d94468d141336d67231fb4c90638dca8c5521b1
parent 7d35ce98a562a2c8754db3ffccc919646d86396d

Check ordering in StreamGroup.merege tests (#91)

See https://github.com/dart-lang/async/pull/90#discussion_r331247755

Merged streams forward events synchronously so we do know that
guarantees that events keep their order when forwarded. Since it's not
necessary to allow for ordering changes drop the `unorderedEquals`.

Also refactor to async/await from a `completion` matcher.

pubspec.yaml

diff --git a/pubspec.yaml b/pubspec.yaml
index aec53cf..f2439a8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: async
-version: 2.4.0
+version: 2.4.1-dev
 
 description: Utility functions and classes related to the 'dart:async' library.
 author: Dart Team <misc@dartlang.org>

test/stream_group_test.dart

diff --git a/test/stream_group_test.dart b/test/stream_group_test.dart
index 96b19db..799d998 100644
--- a/test/stream_group_test.dart
+++ b/test/stream_group_test.dart
@@ -422,7 +422,7 @@
     });
   });
 
-  test("merge() emits events from all components streams", () {
+  test("merge() emits events from all components streams", () async {
     var controller1 = StreamController<String>();
     var controller2 = StreamController<String>();
 
@@ -433,10 +433,10 @@
     controller2.add("second");
     controller2.close();
 
-    expect(merged.toList(), completion(unorderedEquals(["first", "second"])));
+    expect(await merged.toList(), ["first", "second"]);
   });
 
-  test("mergeBroadcast() emits events from all components streams", () {
+  test("mergeBroadcast() emits events from all components streams", () async {
     var controller1 = StreamController<String>();
     var controller2 = StreamController<String>();
 
@@ -450,7 +450,7 @@
 
     expect(merged.isBroadcast, isTrue);
 
-    expect(merged.toList(), completion(unorderedEquals(["first", "second"])));
+    expect(await merged.toList(), ["first", "second"]);
   });
 }