Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: pkg/scheduled_test/lib/src/utils.dart

Issue 15989006: Revert until Windows crash is debugged. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/scheduled_test/lib/src/mock_clock.dart ('k') | runtime/bin/socket_patch.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/scheduled_test/lib/src/utils.dart
diff --git a/pkg/scheduled_test/lib/src/utils.dart b/pkg/scheduled_test/lib/src/utils.dart
index 62461a6f02422bd7cf40f371548fbacb0aa42a0c..d686ef99022b511ccc980c5c9ff718e63471b8d7 100644
--- a/pkg/scheduled_test/lib/src/utils.dart
+++ b/pkg/scheduled_test/lib/src/utils.dart
@@ -94,38 +94,27 @@ Stream futureStream(Future<Stream> future) {
return controller.stream;
}
-/// Returns the first element of a [StreamIterator].
-///
-/// If the [StreamIterator] has no elements, the result is a state error.
-Future<String> streamIteratorFirst(StreamIterator<String> streamIterator) {
- StackTrace stackTrace = new Trace.current();
- return streamIterator.moveNext().then((hasNext) {
- if (hasNext) {
- return streamIterator.current;
- } else {
- return new Future.error(new StateError("No elements"), stackTrace);
- }
- });
-}
-
-/// Collects all remaining lines from a [StreamIterator] of lines.
-///
-/// Returns the concatenation of the collected lines joined by newlines.
-Future<String> concatRest(StreamIterator<String> streamIterator) {
- var completer = new Completer<String>();
- var buffer = new StringBuffer();
- void collectAll() {
- streamIterator.moveNext().then((hasNext) {
- if (hasNext) {
- if (!buffer.isEmpty) buffer.write('\n');
- buffer.write(streamIterator.current);
- collectAll();
- } else {
- completer.complete(buffer.toString());
- }
- }, onError: completer.completeError);
+// TODO(nweiz): remove this when issue 7964 is fixed.
+/// Returns a [Future] that will complete to the first element of [stream].
+/// Unlike [Stream.first], this is safe to use with single-subscription streams.
+Future streamFirst(Stream stream) {
+ var stackTrace;
+ try {
+ throw '';
+ } catch (_, thrownStackTrace) {
+ stackTrace = thrownStackTrace;
}
- collectAll();
+
+ var completer = new Completer();
+ var subscription;
+ subscription = stream.listen((value) {
+ subscription.cancel();
+ completer.complete(value);
+ }, onError: (e) {
+ completer.completeError(e);
+ }, onDone: () {
+ completer.completeError(new StateError("No elements"), stackTrace);
+ }, cancelOnError: true);
return completer.future;
}
« no previous file with comments | « pkg/scheduled_test/lib/src/mock_clock.dart ('k') | runtime/bin/socket_patch.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698