Rename unsubscribeOnError to cancelOnError.

tests/lib/async/stream_controller_test.dart

 // Copyright (c) 2011, 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 the basic StreamController and StreamController.singleSubscription.
 library stream_controller_test;
 
 import "package:expect/expect.dart";
 import 'dart:async';
 import 'event_helper.dart';
 
 testMultiController() {
   // Test normal flow.
   var c = new StreamController.broadcast();
   Events expectedEvents = new Events()
       ..add(42)
       ..add("dibs")
       ..error("error!")
       ..error("error too!")
       ..close();
   Events actualEvents = new Events.capture(c.stream);
   expectedEvents.replay(c);
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // Test automatic unsubscription on error.
   c = new StreamController.broadcast();
   expectedEvents = new Events()..add(42)..error("error");
-  actualEvents = new Events.capture(c.stream, unsubscribeOnError: true);
+  actualEvents = new Events.capture(c.stream, cancelOnError: true);
   Events sentEvents =
       new Events()..add(42)..error("error")..add("Are you there?");
   sentEvents.replay(c);
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // Test manual unsubscription.
   c = new StreamController.broadcast();
   expectedEvents = new Events()..add(42)..error("error")..add(37);
-  actualEvents = new Events.capture(c.stream, unsubscribeOnError: false);
+  actualEvents = new Events.capture(c.stream, cancelOnError: false);
   expectedEvents.replay(c);
   actualEvents.subscription.cancel();
   c.add("Are you there");  // Not sent to actualEvents.
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // Test filter.
   c = new StreamController.broadcast();
   expectedEvents = new Events()
     ..add("a string")..add("another string")..close();
   sentEvents = new Events()
@@ skipping 12 matching lines @@
 
   // Test handleError.
   c = new StreamController.broadcast();
   expectedEvents = new Events()..add("ab")..error("[foo]");
   sentEvents = new Events()..add("ab")..error("foo")..add("ab")..close();
   actualEvents = new Events.capture(c.stream.handleError((v) {
         if (v.error is String) {
           throw new AsyncError("[${v.error}]",
                                 "other stack");
         }
-      }), unsubscribeOnError: true);
+      }), cancelOnError: true);
   sentEvents.replay(c);
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // reduce is tested asynchronously and therefore not in this file.
 
   // Test expand
   c = new StreamController.broadcast();
   sentEvents = new Events()..add(3)..add(2)..add(4)..close();
   expectedEvents = new Events()..add(1)..add(2)..add(3)
                                ..add(1)..add(2)
@@ skipping 35 matching lines @@
                            ..error("not FormatException")  // Unsubscribes.
                            ..close();
   expectedEvents = new Events()..add(42)..error("not FormatException");
   actualEvents = new Events.capture(
       c.stream.where((v) => v is String)
        .map((v) => int.parse(v))
        .handleError((v) {
           if (v.error is! FormatException) throw v;
         })
        .where((v) => v > 10),
-      unsubscribeOnError: true);
+      cancelOnError: true);
   sentEvents.replay(c);
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // Test subscription changes while firing.
   c = new StreamController.broadcast();
   var sink = c.sink;
   var stream = c.stream;
   var counter = 0;
   var subscription = stream.listen(null);
   subscription.onData((data) {
@@ skipping 25 matching lines @@
       ..error("error!")
       ..error("error too!")
       ..close();
   Events actualEvents = new Events.capture(c.stream);
   expectedEvents.replay(c);
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // Test automatic unsubscription on error.
   c = new StreamController();
   expectedEvents = new Events()..add(42)..error("error");
-  actualEvents = new Events.capture(c.stream, unsubscribeOnError: true);
+  actualEvents = new Events.capture(c.stream, cancelOnError: true);
   Events sentEvents =
       new Events()..add(42)..error("error")..add("Are you there?");
   sentEvents.replay(c);
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // Test manual unsubscription.
   c = new StreamController();
   expectedEvents = new Events()..add(42)..error("error")..add(37);
-  actualEvents = new Events.capture(c.stream, unsubscribeOnError: false);
+  actualEvents = new Events.capture(c.stream, cancelOnError: false);
   expectedEvents.replay(c);
   actualEvents.subscription.cancel();
   c.add("Are you there");  // Not sent to actualEvents.
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // Test filter.
   c = new StreamController();
   expectedEvents = new Events()
     ..add("a string")..add("another string")..close();
   sentEvents = new Events()
@@ skipping 12 matching lines @@
 
   // Test handleError.
   c = new StreamController();
   expectedEvents = new Events()..add("ab")..error("[foo]");
   sentEvents = new Events()..add("ab")..error("foo")..add("ab")..close();
   actualEvents = new Events.capture(c.stream.handleError((v) {
         if (v.error is String) {
           throw new AsyncError("[${v.error}]",
                                 "other stack");
         }
-      }), unsubscribeOnError: true);
+      }), cancelOnError: true);
   sentEvents.replay(c);
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // reduce is tested asynchronously and therefore not in this file.
 
   // Test expand
   c = new StreamController();
   sentEvents = new Events()..add(3)..add(2)..add(4)..close();
   expectedEvents = new Events()..add(1)..add(2)..add(3)
                                ..add(1)..add(2)
@@ skipping 68 matching lines @@
                            ..error("not FormatException")  // Unsubscribes.
                            ..close();
   expectedEvents = new Events()..add(42)..error("not FormatException");
   actualEvents = new Events.capture(
       c.stream.where((v) => v is String)
        .map((v) => int.parse(v))
        .handleError((v) {
           if (v.error is! FormatException) throw v;
         })
        .where((v) => v > 10),
-      unsubscribeOnError: true);
+      cancelOnError: true);
   sentEvents.replay(c);
   Expect.listEquals(expectedEvents.events, actualEvents.events);
 
   // Test that only one subscription is allowed.
   c = new StreamController();
   var sink = c.sink;
   var stream = c.stream;
   var counter = 0;
   var subscription = stream.listen((data) { counter += data; });
   Expect.throws(() => stream.listen(null), (e) => e is StateError);
@@ skipping 84 matching lines @@
     Expect.isTrue(c.isClosed);
   }
 }
 
 main() {
   testMultiController();
   testSingleController();
   testExtraMethods();
   testClosed();
 }