Change ScheduledProcess's output streams over to be ScheduledStreams.

sdk/lib/_internal/pub/test/pub_uploader_test.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.
 
 library pub_uploader_test;
 
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:scheduled_test/scheduled_process.dart';
@@ skipping 55 matching lines @@
 
         request.response.headers.contentType =
             new ContentType("application", "json");
         request.response.write(JSON.encode({
           'success': {'message': 'Good job!'}
         }));
         request.response.close();
       }), completes);
     });
 
-    expect(pub.nextLine(), completion(equals('Good job!')));
+    pub.stdout.expect('Good job!');
     pub.shouldExit(exit_codes.SUCCESS);
   });
 
   integration('removes an uploader', () {
     var server = new ScheduledServer();
     d.credentialsFile(server, 'access token').create();
     var pub = startPubUploader(server, ['--package', 'pkg', 'remove', 'email']);
 
     server.handle('DELETE', '/api/packages/pkg/uploaders/email', (request) {
       request.response.headers.contentType =
           new ContentType("application", "json");
       request.response.write(JSON.encode({
         'success': {'message': 'Good job!'}
       }));
       request.response.close();
     });
 
-    expect(pub.nextLine(), completion(equals('Good job!')));
+    pub.stdout.expect('Good job!');
     pub.shouldExit(exit_codes.SUCCESS);
   });
 
   integration('defaults to the current package', () {
     d.validPackage.create();
 
     var server = new ScheduledServer();
     d.credentialsFile(server, 'access token').create();
     var pub = startPubUploader(server, ['add', 'email']);
 
     server.handle('POST', '/api/packages/test_pkg/uploaders', (request) {
       request.response.headers.contentType =
           new ContentType("application", "json");
       request.response.write(JSON.encode({
         'success': {'message': 'Good job!'}
       }));
       request.response.close();
     });
 
-    expect(pub.nextLine(), completion(equals('Good job!')));
+    pub.stdout.expect('Good job!');
     pub.shouldExit(exit_codes.SUCCESS);
   });
 
   integration('add provides an error', () {
     var server = new ScheduledServer();
     d.credentialsFile(server, 'access token').create();
     var pub = startPubUploader(server, ['--package', 'pkg', 'add', 'email']);
 
     server.handle('POST', '/api/packages/pkg/uploaders', (request) {
       request.response.statusCode = 400;
       request.response.headers.contentType =
           new ContentType("application", "json");
       request.response.write(JSON.encode({
         'error': {'message': 'Bad job!'}
       }));
       request.response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Bad job!')));
+    pub.stderr.expect('Bad job!');
     pub.shouldExit(1);
   });
 
   integration('remove provides an error', () {
     var server = new ScheduledServer();
     d.credentialsFile(server, 'access token').create();
     var pub = startPubUploader(server,
         ['--package', 'pkg', 'remove', 'e/mail']);
 
     server.handle('DELETE', '/api/packages/pkg/uploaders/e%2Fmail', (request) {
       request.response.statusCode = 400;
       request.response.headers.contentType =
           new ContentType("application", "json");
       request.response.write(JSON.encode({
         'error': {'message': 'Bad job!'}
       }));
       request.response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Bad job!')));
+    pub.stderr.expect('Bad job!');
     pub.shouldExit(1);
   });
 
   integration('add provides invalid JSON', () {
     var server = new ScheduledServer();
     d.credentialsFile(server, 'access token').create();
     var pub = startPubUploader(server, ['--package', 'pkg', 'add', 'email']);
 
     server.handle('POST', '/api/packages/pkg/uploaders', (request) {
       request.response.write("{not json");
       request.response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Invalid server response:')));
-    expect(pub.nextErrLine(), completion(equals('{not json')));
+    pub.stderr.expect(emitsString(
+        'Invalid server response:\n'
+        '{not json'));

[Bob Nystrom, 2014/02/14 17:55:02]

Be consistent about using emitsString() or multiple calls to .stderr.expect.
(I'd just use multiple calls.)

[nweiz, 2014/02/18 22:01:10]

I chose [emitsString] for consistency with longer multiline expectations, where
multiple calls to [expect] get very cumbersome. Previously we had been using
multiple calls by necessity, since there was no facility for matching multiple
lines in a single call, but now we do so I thought it would be cleaner to use
it.

I can switch to multiple calls if you don't mind the inconsistency between
two-line expectations and many-line expectations.

[Bob Nystrom, 2014/02/18 22:12:59]

That makes sense to me too, but in that case I'd probably use emitsString() for
even the two line cases. I thought I saw a bunch that still used separate expect
calls for that.

But, again, I don't have a strong preference here, so don't spend too much time
on it.

     pub.shouldExit(1);
   });
 
   integration('remove provides invalid JSON', () {
     var server = new ScheduledServer();
     d.credentialsFile(server, 'access token').create();
     var pub = startPubUploader(server, ['--package', 'pkg', 'remove', 'email']);
 
     server.handle('DELETE', '/api/packages/pkg/uploaders/email', (request) {
       request.response.write("{not json");
       request.response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Invalid server response:')));
-    expect(pub.nextErrLine(), completion(equals('{not json')));
+    pub.stderr.expect(emitsString(
+        'Invalid server response:\n'
+        '{not json'));
     pub.shouldExit(1);
   });
 }