Index: lib/src/runner/loader.dart |
diff --git a/lib/src/runner/loader.dart b/lib/src/runner/loader.dart |
index 18e1a9199a4b121a51c58c221f21dc659f998855..67c2835f282aaeff308c15ca7f06c96cc87415bb 100644 |
--- a/lib/src/runner/loader.dart |
+++ b/lib/src/runner/loader.dart |
@@ -76,7 +76,7 @@ class Loader { |
/// |
/// This overwrites previous plugins for those platforms. |
void registerPlatformPlugin(Iterable<TestPlatform> platforms, getPlugin()) { |
- var memoizer = new AsyncMemoizer(); |
+ var memoizer = new AsyncMemoizer<PlatformPlugin>(); |
for (var platform in platforms) { |
_platformPlugins[platform] = memoizer; |
_platformCallbacks[platform] = getPlugin; |
@@ -91,7 +91,7 @@ class Loader { |
/// This emits [LoadSuite]s that must then be run to emit the actual |
/// [RunnerSuite]s defined in the file. |
Stream<LoadSuite> loadDir(String dir) { |
- return mergeStreams(new Directory(dir).listSync(recursive: true) |
+ return StreamGroup.merge(new Directory(dir).listSync(recursive: true) |
.map((entry) { |
if (entry is! File) return new Stream.fromIterable([]); |