Change ScheduledProcess's output streams over to be ScheduledStreams.

sdk/lib/_internal/pub/test/test_pub.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Test infrastructure for testing pub. Unlike typical unit tests, most pub
 /// tests are integration tests that stage some stuff on the file system, run
 /// pub, and then validate the results. This library provides an API to build
 /// tests like that.
 library test_pub;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
 import 'package:http/testing.dart';
 import 'package:path/path.dart' as path;
 import 'package:scheduled_test/scheduled_process.dart';
 import 'package:scheduled_test/scheduled_server.dart';
+import 'package:scheduled_test/scheduled_stream.dart';
 import 'package:scheduled_test/scheduled_test.dart';
 import 'package:unittest/compact_vm_config.dart';
 import 'package:yaml/yaml.dart';
 
 import '../lib/src/entrypoint.dart';
 import '../lib/src/exit_codes.dart' as exit_codes;
 // TODO(rnystrom): Using "gitlib" as the prefix here is ugly, but "git" collides
 // with the git descriptor method. Maybe we should try to clean up the top level
 // scope a bit?
 import '../lib/src/git.dart' as gitlib;
@@ skipping 357 matching lines @@
   // Cannot pass both output and outputJson.
   assert(output == null || outputJson == null);
 
   var pub = startPub(args: args, tokenEndpoint: tokenEndpoint);
   pub.shouldExit(exitCode);
 
   var failures = [];
   var stderr;
 
   expect(Future.wait([
-    pub.remainingStdout(),
-    pub.remainingStderr()
+    pub.stdoutStream().toList(),
+    pub.stderrStream().toList()
   ]).then((results) {
-    stderr = results[1];
+    var stdout = results[0].join("\n");
+    stderr = results[1].join("\n");
 
     if (outputJson == null) {
-      _validateOutput(failures, 'stdout', output, results[0]);
+      _validateOutput(failures, 'stdout', output, stdout);
       return null;
     }
 
     // Allow the expected JSON to contain futures.
     return awaitObject(outputJson).then((resolved) {
-      _validateOutputJson(failures, 'stdout', resolved, results[0]);
+      _validateOutputJson(failures, 'stdout', resolved, stdout);
     });
   }).then((_) {
     _validateOutput(failures, 'stderr', error, stderr);
 
     if (!failures.isEmpty) throw new TestFailure(failures.join('\n'));
   }), completes);
 }
 
 /// Like [startPub], but runs `pub lish` in particular with [server] used both
 /// as the OAuth2 server (with "/token" as the token endpoint) and as the
 /// package server.
 ///
 /// Any futures in [args] will be resolved before the process is started.
 ScheduledProcess startPublish(ScheduledServer server, {List args}) {
   var tokenEndpoint = server.url.then((url) =>
       url.resolve('/token').toString());
   if (args == null) args = [];
   args = flatten(['lish', '--server', tokenEndpoint, args]);
   return startPub(args: args, tokenEndpoint: tokenEndpoint);
 }
 
 /// Handles the beginning confirmation process for uploading a packages.
 /// Ensures that the right output is shown and then enters "y" to confirm the
 /// upload.
 void confirmPublish(ScheduledProcess pub) {
   // TODO(rnystrom): This is overly specific and inflexible regarding different
   // test packages. Should validate this a little more loosely.
-  expect(pub.nextLine(), completion(startsWith(
-      'Publishing test_pkg 1.0.0 to ')));
-  expect(pub.nextLine(), completion(equals("|-- LICENSE")));
-  expect(pub.nextLine(), completion(equals("|-- lib")));
-  expect(pub.nextLine(), completion(equals("|   '-- test_pkg.dart")));
-  expect(pub.nextLine(), completion(equals("'-- pubspec.yaml")));
-  expect(pub.nextLine(), completion(equals("")));
-  expect(pub.nextLine(), completion(equals('Looks great! Are you ready to '
-      'upload your package (y/n)?')));
-
+  pub.stdout.expect(startsWith('Publishing test_pkg 1.0.0 to '));
+  pub.stdout.expect(emitsLines(
+      "|-- LICENSE\n"
+      "|-- lib\n"
+      "|   '-- test_pkg.dart\n"
+      "'-- pubspec.yaml\n"
+      "\n"
+      "Looks great! Are you ready to upload your package (y/n)?"));
   pub.writeLine("y");
 }
 
 /// Starts a Pub process and returns a [ScheduledProcess] that supports
 /// interaction with that process.
 ///
 /// Any futures in [args] will be resolved before the process is started.
 ScheduledProcess startPub({List args, Future<Uri> tokenEndpoint}) {
   String pathInSandbox(String relPath) {
     return path.join(path.absolute(sandboxDir), relPath);
@@ skipping 43 matching lines @@
 
     return environment;
   });
 
   return new PubProcess.start(dartBin, dartArgs, environment: environmentFuture,
       workingDirectory: pathInSandbox(appPath),
       description: args.isEmpty ? 'pub' : 'pub ${args.first}');
 }
 
 /// A subclass of [ScheduledProcess] that parses pub's verbose logging output
-/// and makes [nextLine], [nextErrLine], [remainingStdout], and
-/// [remainingStderr] work as though pub weren't running in verbose mode.
+/// and makes [stdout] and [stderr] work as though pub weren't running in
+/// verbose mode.
 class PubProcess extends ScheduledProcess {
   Stream<Pair<log.Level, String>> _log;
   Stream<String> _stdout;
   Stream<String> _stderr;
 
   PubProcess.start(executable, arguments,
       {workingDirectory, environment, String description,
        Encoding encoding: UTF8})
     : super.start(executable, arguments,
         workingDirectory: workingDirectory,
@@ skipping 45 matching lines @@
     }
 
     var pair = tee(_stdout);
     _stdout = pair.first;
     return pair.last;
   }
 
   Stream<String> stderrStream() {
     if (_stderr == null) {
       _stderr = _logStream().expand((entry) {
-        if (entry.first != log.Level.ERROR && entry.first != log.Level.WARNING) {
+        if (entry.first != log.Level.ERROR &&
+            entry.first != log.Level.WARNING) {
           return [];
         }
         return [entry.last];
       });
     }
 
     var pair = tee(_stderr);
     _stderr = pair.first;
     return pair.last;
   }
@@ skipping 271 matching lines @@
   bool matches(item, Map matchState) {
     if (item is! Pair) return false;
     return _firstMatcher.matches(item.first, matchState) &&
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }
+
+/// A [StreamMatcher] that matches multiple lines of output.
+StreamMatcher emitsLines(String output) => inOrder(output.split("\n"));