| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import 'package:expect/expect.dart'; | 5 import 'package:expect/expect.dart'; |
| 6 import 'package:async_helper/async_helper.dart'; | 6 import 'package:async_helper/async_helper.dart'; |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'dart:collection'; | 9 import 'dart:collection'; |
| 10 | 10 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 List savedTrace = [stackTrace]..addAll(restoredStackTrace); | 21 List savedTrace = [stackTrace]..addAll(restoredStackTrace); |
| 22 return parent.registerCallback(origin, () { | 22 return parent.registerCallback(origin, () { |
| 23 restoredStackTrace = savedTrace; | 23 restoredStackTrace = savedTrace; |
| 24 return f(); | 24 return f(); |
| 25 }); | 25 }); |
| 26 } | 26 } |
| 27 | 27 |
| 28 debugZoneRegisterUnaryCallback(Zone self, ZoneDelegate parent, Zone origin, | 28 debugZoneRegisterUnaryCallback(Zone self, ZoneDelegate parent, Zone origin, |
| 29 f(arg)) { | 29 f(arg)) { |
| 30 List savedTrace = [stackTrace]..addAll(restoredStackTrace); | 30 List savedTrace = [stackTrace]..addAll(restoredStackTrace); |
| 31 return parent.registerCallback(origin, (arg) { | 31 return parent.registerUnaryCallback(origin, (arg) { |
| 32 restoredStackTrace = savedTrace; | 32 restoredStackTrace = savedTrace; |
| 33 return f(arg); | 33 return f(arg); |
| 34 }); | 34 }); |
| 35 } | 35 } |
| 36 | 36 |
| 37 debugZoneRun(Zone self, ZoneDelegate parent, Zone origin, f()) { | 37 debugZoneRun(Zone self, ZoneDelegate parent, Zone origin, f()) { |
| 38 stackTrace++; | 38 stackTrace++; |
| 39 restoredStackTrace = []; | 39 restoredStackTrace = []; |
| 40 return parent.run(origin, f); | 40 return parent.run(origin, f); |
| 41 } | 41 } |
| 42 | 42 |
| 43 debugZoneRunUnary(Zone self, ZoneDelegate parent, Zone origin, f(arg), arg) { | 43 debugZoneRunUnary(Zone self, ZoneDelegate parent, Zone origin, f(arg), arg) { |
| 44 stackTrace++; | 44 stackTrace++; |
| 45 restoredStackTrace = []; | 45 restoredStackTrace = []; |
| 46 return parent.run1(origin, f, arg); | 46 return parent.runUnary(origin, f, arg); |
| 47 } | 47 } |
| 48 | 48 |
| 49 List expectedDebugTrace; | 49 List expectedDebugTrace; |
| 50 | 50 |
| 51 debugUncaughtHandler( | 51 debugUncaughtHandler( |
| 52 Zone self, ZoneDelegate parent, Zone origin, error, StackTrace stackTrace) { | 52 Zone self, ZoneDelegate parent, Zone origin, error, StackTrace stackTrace) { |
| 53 events.add("handling uncaught error $error"); | 53 events.add("handling uncaught error $error"); |
| 54 Expect.listEquals(expectedDebugTrace, restoredStackTrace); | 54 Expect.listEquals(expectedDebugTrace, restoredStackTrace); |
| 55 // Suppress the error and don't propagate to parent. | 55 // Suppress the error and don't propagate to parent. |
| 56 } | 56 } |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 done.future.whenComplete(() { | 125 done.future.whenComplete(() { |
| 126 // We don't really care for the order. | 126 // We don't really care for the order. |
| 127 events.sort(); | 127 events.sort(); |
| 128 Expect.listEquals([ "handling uncaught error bar", | 128 Expect.listEquals([ "handling uncaught error bar", |
| 129 "handling uncaught error foo", | 129 "handling uncaught error foo", |
| 130 "handling uncaught error gee"], | 130 "handling uncaught error gee"], |
| 131 events); | 131 events); |
| 132 asyncEnd(); | 132 asyncEnd(); |
| 133 }); | 133 }); |
| 134 } | 134 } |
| OLD | NEW |