Change ScheduledProcess's output streams over to be ScheduledStreams.

pkg/scheduled_test/test/scheduled_process_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 scheduled_process_test;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
 import 'package:scheduled_test/scheduled_process.dart';
+import 'package:scheduled_test/scheduled_stream.dart';
 import 'package:scheduled_test/scheduled_test.dart';
 
 import 'metatest.dart';
 import 'utils.dart';
 
 void main(_, message) {
   initMetatest(message);
 
   setUpTimeout();
 
@@ skipping 99 matching lines @@
 
   expectTestsPass("a process that ends while waiting for stdout shouldn't "
       "block the test", () {
     var errors;
     test('test 1', () {
       currentSchedule.onException.schedule(() {
         errors = currentSchedule.errors;
       });
 
       var process = startDartProcess('');
-      expect(process.nextLine(), completion(equals('hello')));
-      expect(process.nextLine(), completion(equals('world')));
+      process.stdout.expect('hello');
+      process.stdout.expect('world');

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

So much better!

       process.shouldExit(0);
     });
 
     test('test 2', () {
       expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
       expect(errors.length, anyOf(1, 2));
-      expect(errors[0].error, isStateError);
-      expect(errors[0].error.message, equals("No elements"));
+      expect(errors[0].error, new isInstanceOf<TestFailure>());
+      expect(errors[0].error.message, equals(
+          "Expected: 'hello'\n"
+          " Emitted: \n"
+          "   Which: unexpected end of stream"));
 
       // Whether or not this error appears depends on how quickly the "no
       // elements" error is handled.
       if (errors.length == 2) {
         expect(errors[1].error.toString(), matches(r"^Process "
             r"'[^']+[\\/]dart(\.exe)? [^']+' ended earlier than scheduled with "
             r"exit code 0\."));
       }
     });
   }, passing: ['test 2']);
 
   expectTestsPass("a process that ends during the task immediately before it's "
       "scheduled to end shouldn't cause an error", () {
     test('test', () {
       var process = startDartProcess('stdin.toList();');
       process.closeStdin();
       // Unfortunately, sleeping for a second seems like the best way of
       // guaranteeing that the process ends during this task.
       schedule(() => new Future.delayed(new Duration(seconds: 1)));
       process.shouldExit(0);
     });
   });
 
-  expectTestsPass("nextLine returns the next line of stdout from the process",
-      () {
+  expectTestsPass("stdout exposes the stdandard output from the process", () {

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

"stdandard" -> "standard"

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

Done.

     test('test', () {
       var process = startDartProcess(r'print("hello\n\nworld"); print("hi");');
-      expect(process.nextLine(), completion(equals('hello')));
-      expect(process.nextLine(), completion(equals('')));
-      expect(process.nextLine(), completion(equals('world')));
-      expect(process.nextLine(), completion(equals('hi')));
+      process.stdout.expect('hello');
+      process.stdout.expect('');
+      process.stdout.expect('world');
+      process.stdout.expect('hi');
+      process.stdout.expect(isDone);
       process.shouldExit(0);
     });
   });
 
-  expectTestsPass("nextLine throws an error if there's no more stdout", () {
-    var errors;
-    test('test 1', () {
-      currentSchedule.onException.schedule(() {
-        errors = currentSchedule.errors;
-      });
-
-      var process = startDartProcess('print("hello");');
-      expect(process.nextLine(), completion(equals('hello')));
-      expect(process.nextLine(), completion(equals('world')));
-      process.shouldExit(0);
-    });
-
-    test('test 2', () {
-      expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
-      expect(errors.length, anyOf(1, 2));
-      expect(errors[0].error, isStateError);
-      expect(errors[0].error.message, equals("No elements"));
-
-      // Whether or not this error appears depends on how quickly the "no
-      // elements" error is handled.
-      if (errors.length == 2) {
-        expect(errors[1].error.toString(), matches(r"^Process "
-            r"'[^']+[\\/]dart(\.exe)? [^']+' ended earlier than scheduled with "
-            r"exit code 0\."));
-      }
-    });
-  }, passing: ['test 2']);
-
-  expectTestsPass("nextErrLine returns the next line of stderr from the "
-      "process", () {
+  expectTestsPass("stderr exposes the stderr from the process", () {
     test('test', () {
       var process = startDartProcess(r'''
           stderr.write("hello\n\nworld\n");
           stderr.write("hi");
           ''');
-      expect(process.nextErrLine(), completion(equals('hello')));
-      expect(process.nextErrLine(), completion(equals('')));
-      expect(process.nextErrLine(), completion(equals('world')));
-      expect(process.nextErrLine(), completion(equals('hi')));
+      process.stderr.expect('hello');
+      process.stderr.expect('');
+      process.stderr.expect('world');
+      process.stderr.expect('hi');
+      process.stderr.expect(isDone);
       process.shouldExit(0);
     });
   });
-
-  expectTestsPass("nextErrLine throws an error if there's no more stderr", () {
-    var errors;
-    test('test 1', () {
-      currentSchedule.onException.schedule(() {
-        errors = currentSchedule.errors;
-      });
-
-      var process = startDartProcess(r'stderr.write("hello\n");');
-      expect(process.nextErrLine(), completion(equals('hello')));
-      expect(process.nextErrLine(), completion(equals('world')));
-      process.shouldExit(0);
-    });
-
-    test('test 2', () {
-      expect(errors, everyElement(new isInstanceOf<ScheduleError>()));
-      expect(errors.length, anyOf(1, 2));
-      expect(errors[0].error, isStateError);
-      expect(errors[0].error.message, equals("No elements"));
-
-      // Whether or not this error appears depends on how quickly the "no
-      // elements" error is handled.
-      if (errors.length == 2) {
-        expect(errors[1].error.toString(), matches(r"^Process "
-            r"'[^']+[\\/]dart(\.exe)? [^']+' ended earlier than scheduled with "
-            r"exit code 0\."));
-      }
-    });
-  }, passing: ['test 2']);
-
-  expectTestsPass("remainingStdout returns all the stdout if it's not consumed "
-      "any other way", () {
-    test('test', () {
-      var process = startDartProcess(r'print("hello\n\nworld"); print("hi");');
-      process.shouldExit(0);
-      expect(process.remainingStdout(),
-          completion(equals("hello\n\nworld\nhi")));
-    });
-  });
-
-  expectTestsPass("remainingStdout returns the empty string if there's no "
-      "stdout", () {
-    test('test', () {
-      var process = startDartProcess(r'');
-      process.shouldExit(0);
-      expect(process.remainingStdout(), completion(isEmpty));
-    });
-  });
-
-  expectTestsPass("remainingStdout returns the remaining stdout after the "
-      "lines consumed by nextLine", () {
-    test('test', () {
-      var process = startDartProcess(r'print("hello\n\nworld"); print("hi");');
-      expect(process.nextLine(), completion(equals("hello")));
-      expect(process.nextLine(), completion(equals("")));
-      process.shouldExit(0);
-      expect(process.remainingStdout(), completion(equals("world\nhi")));
-    });
-  });
-
-  expectTestsPass("remainingStdout can't be called before the process is "
-      "scheduled to end", () {
-    test('test', () {
-      var process = startDartProcess(r'');
-      expect(process.remainingStdout, throwsA(isStateError));
-      process.shouldExit(0);
-    });
-  });
-
-  expectTestsPass("remainingStderr returns all the stderr if it's not consumed "
-      "any other way", () {
-    test('test', () {
-      var process = startDartProcess(r'''
-          stderr.write("hello\n\nworld\n");
-          stderr.write("hi\n");
-          ''');
-      process.shouldExit(0);
-      expect(process.remainingStderr(),
-          completion(equals("hello\n\nworld\nhi")));
-    });
-  });
-
-  expectTestsPass("remainingStderr returns the empty string if there's no "
-      "stderr", () {
-    test('test', () {
-      var process = startDartProcess(r'');
-      process.shouldExit(0);
-      expect(process.remainingStderr(), completion(isEmpty));
-    });
-  });
-
-  expectTestsPass("remainingStderr returns the remaining stderr after the "
-      "lines consumed by nextLine", () {
-    test('test', () {
-      var process = startDartProcess(r'''
-          stderr.write("hello\n\nworld\n");
-          stderr.write("hi\n");
-          ''');
-      expect(process.nextErrLine(), completion(equals("hello")));
-      expect(process.nextErrLine(), completion(equals("")));
-      process.shouldExit(0);
-      expect(process.remainingStderr(), completion(equals("world\nhi")));
-    });
-  });
-
-  expectTestsPass("remainingStderr can't be called before the process is "
-      "scheduled to end", () {
-    test('test', () {
-      var process = startDartProcess(r'');
-      expect(process.remainingStderr, throwsA(isStateError));
-      process.shouldExit(0);
-    });
-  });
 
   expectTestsPass("writeLine schedules a line to be written to the process",
       () {
     test('test', () {
       var process = startDartProcess(r'''
           stdinLines.listen((line) => print("> $line"));
           ''');
       process.writeLine("hello");
-      expect(process.nextLine(), completion(equals("> hello")));
+      process.stdout.expect("> hello");
       process.writeLine("world");
-      expect(process.nextLine(), completion(equals("> world")));
+      process.stdout.expect("> world");
       process.kill();
     });
   });
 
   expectTestsPass("closeStdin closes the process's stdin stream", () {
     test('test', () {
       var process = startDartProcess(r'''
           stdin.listen((line) => print("> $line"),
               onDone: () => print("stdin closed"));
           ''');
       process.closeStdin();
       process.shouldExit(0);
-      expect(process.nextLine(), completion(equals('stdin closed')));
+      process.stdout.expect('stdin closed');
     });
   });
 }
 
 ScheduledProcess startDartProcess(String script) {
   var tempDir = schedule(() => Directory.systemTemp
                                         .createTemp('scheduled_process_test_')
                                         .then((dir) => dir.path),
                          'create temp dir');
   var dartPath = schedule(() {
@@ skipping 17 matching lines @@
   currentSchedule.onComplete.schedule(() {
     return tempDir.catchError((_) => null).then((dir) {
       if (dir == null) return null;
       return new Directory(dir).delete(recursive: true);
     });
   }, 'clean up temp dir');
 
   return new ScheduledProcess.start(Platform.executable,
       ['--checked', dartPath]);
 }