Fix deprecated domain references (dart-lang/stack_trace#67)
diff --git a/pkgs/stack_trace/.gitignore b/pkgs/stack_trace/.gitignore index 34595d7..f023015 100644 --- a/pkgs/stack_trace/.gitignore +++ b/pkgs/stack_trace/.gitignore
@@ -1,4 +1,4 @@ -# See https://www.dartlang.org/guides/libraries/private-files +# See https://dart.dev/guides/libraries/private-files # Don’t commit the following directories created by pub. .dart_tool/ .packages
diff --git a/pkgs/stack_trace/README.md b/pkgs/stack_trace/README.md index 3f08374..19c6daa 100644 --- a/pkgs/stack_trace/README.md +++ b/pkgs/stack_trace/README.md
@@ -7,7 +7,7 @@ using `Trace.current`. Native [StackTrace]s can also be directly converted to human-readable strings using `Trace.format`. -[StackTrace]: https://api.dartlang.org/stable/dart-core/StackTrace-class.html +[StackTrace]: https://api.dart.dev/stable/dart-core/StackTrace-class.html Here's an example native stack trace from debugging this library: @@ -202,4 +202,4 @@ That's a lot easier to understand! -[Zone]: https://api.dartlang.org/stable/dart-async/Zone-class.html +[Zone]: https://api.dart.dev/stable/dart-async/Zone-class.html
diff --git a/pkgs/stack_trace/lib/src/chain.dart b/pkgs/stack_trace/lib/src/chain.dart index 602b90c..6b2eec5 100644 --- a/pkgs/stack_trace/lib/src/chain.dart +++ b/pkgs/stack_trace/lib/src/chain.dart
@@ -195,7 +195,7 @@ /// [`source_map_stack_trace`][source_map_stack_trace] package can be used to /// convert JavaScript traces into Dart-style traces. /// - /// [source_map_stack_trace]: https://pub.dartlang.org/packages/source_map_stack_trace + /// [source_map_stack_trace]: https://pub.dev/packages/source_map_stack_trace Chain get terse => foldFrames((_) => false, terse: true); /// Returns a new [Chain] based on [this] where multiple stack frames matching
diff --git a/pkgs/stack_trace/lib/src/frame.dart b/pkgs/stack_trace/lib/src/frame.dart index 34108f3..1f5533d 100644 --- a/pkgs/stack_trace/lib/src/frame.dart +++ b/pkgs/stack_trace/lib/src/frame.dart
@@ -13,33 +13,33 @@ final _vmFrame = RegExp(r'^#\d+\s+(\S.*) \((.+?)((?::\d+){0,2})\)$'); // at Object.stringify (native) -// at VW.call$0 (http://pub.dartlang.org/stuff.dart.js:560:28) +// at VW.call$0 (https://example.com/stuff.dart.js:560:28) // at VW.call$0 (eval as fn -// (http://pub.dartlang.org/stuff.dart.js:560:28), efn:3:28) -// at http://pub.dartlang.org/stuff.dart.js:560:28 +// (https://example.com/stuff.dart.js:560:28), efn:3:28) +// at https://example.com/stuff.dart.js:560:28 final _v8Frame = RegExp(r'^\s*at (?:(\S.*?)(?: \[as [^\]]+\])? \((.*)\)|(.*))$'); -// http://pub.dartlang.org/stuff.dart.js:560:28 +// https://example.com/stuff.dart.js:560:28 final _v8UrlLocation = RegExp(r'^(.*):(\d+):(\d+)|native$'); -// eval as function (http://pub.dartlang.org/stuff.dart.js:560:28), efn:3:28 -// eval as function (http://pub.dartlang.org/stuff.dart.js:560:28) +// eval as function (https://example.com/stuff.dart.js:560:28), efn:3:28 +// eval as function (https://example.com/stuff.dart.js:560:28) // eval as function (eval as otherFunction -// (http://pub.dartlang.org/stuff.dart.js:560:28)) +// (https://example.com/stuff.dart.js:560:28)) final _v8EvalLocation = RegExp(r'^eval at (?:\S.*?) \((.*)\)(?:, .*?:\d+:\d+)?$'); -// anonymous/<@http://pub.dartlang.org/stuff.js line 693 > Function:3:40 -// anonymous/<@http://pub.dartlang.org/stuff.js line 693 > eval:3:40 +// anonymous/<@https://example.com/stuff.js line 693 > Function:3:40 +// anonymous/<@https://example.com/stuff.js line 693 > eval:3:40 final _firefoxEvalLocation = RegExp(r'(\S+)@(\S+) line (\d+) >.* (Function|eval):\d+:\d+'); -// .VW.call$0@http://pub.dartlang.org/stuff.dart.js:560 -// .VW.call$0("arg")@http://pub.dartlang.org/stuff.dart.js:560 -// .VW.call$0/name<@http://pub.dartlang.org/stuff.dart.js:560 -// .VW.call$0@http://pub.dartlang.org/stuff.dart.js:560:36 -// http://pub.dartlang.org/stuff.dart.js:560 +// .VW.call$0@https://example.com/stuff.dart.js:560 +// .VW.call$0("arg")@https://example.com/stuff.dart.js:560 +// .VW.call$0/name<@https://example.com/stuff.dart.js:560 +// .VW.call$0@https://example.com/stuff.dart.js:560:36 +// https://example.com/stuff.dart.js:560 final _firefoxSafariFrame = RegExp(r'^' r'(?:' // Member description. Not present in some Safari frames. r'([^@(/]*)' // The actual name of the member. @@ -57,7 +57,7 @@ // foo/bar.dart 10:11 Foo._bar // foo/bar.dart 10:11 (anonymous function).dart.fn -// http://dartlang.org/foo/bar.dart Foo._bar +// https://dart.dev/foo/bar.dart Foo._bar // data:... 10:11 Foo._bar final _friendlyFrame = RegExp(r'^(\S+)(?: (\d+)(?::(\d+))?)?\s+([^\d].*)$'); @@ -213,8 +213,8 @@ /// Parses a Firefox 'eval' or 'function' stack frame. /// /// for example: - /// anonymous/<@http://pub.dartlang.org/stuff.js line 693 > Function:3:40 - /// anonymous/<@http://pub.dartlang.org/stuff.js line 693 > eval:3:40 + /// anonymous/<@https://example.com/stuff.js line 693 > Function:3:40 + /// anonymous/<@https://example.com/stuff.js line 693 > eval:3:40 factory Frame._parseFirefoxEval(String frame) => _catchFormatException(frame, () { final match = _firefoxEvalLocation.firstMatch(frame);
diff --git a/pkgs/stack_trace/lib/src/trace.dart b/pkgs/stack_trace/lib/src/trace.dart index df5d455..96902a1 100644 --- a/pkgs/stack_trace/lib/src/trace.dart +++ b/pkgs/stack_trace/lib/src/trace.dart
@@ -32,8 +32,8 @@ /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/stack /// /// These stack traces looks like: -/// anonymous/<@http://pub.dartlang.org/stuff.js line 693 > Function:3:40 -/// anonymous/<@http://pub.dartlang.org/stuff.js line 693 > eval:3:40 +/// anonymous/<@https://example.com/stuff.js line 693 > Function:3:40 +/// anonymous/<@https://example.com/stuff.js line 693 > eval:3:40 final _firefoxEvalTrace = RegExp(r'@\S+ line \d+ >.* (Function|eval):\d+:\d+'); /// A RegExp to match Firefox and Safari's stack traces. @@ -43,7 +43,7 @@ /// /// Firefox's trace frames start with the name of the function in which the /// error occurred, possibly including its parameters inside `()`. For example, -/// `.VW.call$0("arg")@http://pub.dartlang.org/stuff.dart.js:560`. +/// `.VW.call$0("arg")@https://example.com/stuff.dart.js:560`. /// /// Safari traces occasionally don't include the initial method name followed by /// "@", and they always have both the line and column number (or just a @@ -264,7 +264,7 @@ /// [`source_map_stack_trace`][source_map_stack_trace] package can be used to /// convert JavaScript traces into Dart-style traces. /// - /// [source_map_stack_trace]: https://pub.dartlang.org/packages/source_map_stack_trace + /// [source_map_stack_trace]: https://pub.dev/packages/source_map_stack_trace /// /// For custom folding, see [foldFrames]. Trace get terse => foldFrames((_) => false, terse: true);
diff --git a/pkgs/stack_trace/lib/stack_trace.dart b/pkgs/stack_trace/lib/stack_trace.dart index 8a6ba9b..fad30ce 100644 --- a/pkgs/stack_trace/lib/stack_trace.dart +++ b/pkgs/stack_trace/lib/stack_trace.dart
@@ -2,23 +2,6 @@ // 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. -/// Stack trace generation and parsing. -/// -/// ## Installing ## -/// -/// Use [pub][] to install this package. Add the following to your `pubspec.yaml` -/// file. -/// -/// dependencies: -/// stack_trace: any -/// -/// Then run `pub install`. -/// -/// For more information, see the -/// [stack_trace package on pub.dartlang.org][pkg]. -/// -/// [pub]: http://pub.dartlang.org -/// [pkg]: http://pub.dartlang.org/packages/stack_trace export 'src/chain.dart'; export 'src/frame.dart'; export 'src/trace.dart';
diff --git a/pkgs/stack_trace/test/frame_test.dart b/pkgs/stack_trace/test/frame_test.dart index 25487c9..b8b6754 100644 --- a/pkgs/stack_trace/test/frame_test.dart +++ b/pkgs/stack_trace/test/frame_test.dart
@@ -82,9 +82,8 @@ test('parses a stack frame correctly', () { var frame = Frame.parseV8(' at VW.call\$0 ' - '(http://pub.dartlang.org/stuff.dart.js:560:28)'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '(https://example.com/stuff.dart.js:560:28)'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, equals(28)); expect(frame.member, equals('VW.call\$0')); @@ -138,9 +137,8 @@ test('parses an anonymous stack frame correctly', () { var frame = - Frame.parseV8(' at http://pub.dartlang.org/stuff.dart.js:560:28'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + Frame.parseV8(' at https://example.com/stuff.dart.js:560:28'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, equals(28)); expect(frame.member, equals('<fn>')); @@ -158,9 +156,8 @@ // Ignore "[as ...]", since other stack trace formats don't support a // similar construct. var frame = Frame.parseV8(' at VW.call\$0 [as call\$4] ' - '(http://pub.dartlang.org/stuff.dart.js:560:28)'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '(https://example.com/stuff.dart.js:560:28)'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, equals(28)); expect(frame.member, equals('VW.call\$0')); @@ -168,9 +165,8 @@ test('parses a basic eval stack frame correctly', () { var frame = Frame.parseV8(' at eval (eval at <anonymous> ' - '(http://pub.dartlang.org/stuff.dart.js:560:28))'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '(https://example.com/stuff.dart.js:560:28))'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, equals(28)); expect(frame.member, equals('eval')); @@ -178,9 +174,8 @@ test('parses an IE10 eval stack frame correctly', () { var frame = Frame.parseV8(' at eval (eval at Anonymous function ' - '(http://pub.dartlang.org/stuff.dart.js:560:28))'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '(https://example.com/stuff.dart.js:560:28))'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, equals(28)); expect(frame.member, equals('eval')); @@ -188,9 +183,8 @@ test('parses an eval stack frame with inner position info correctly', () { var frame = Frame.parseV8(' at eval (eval at <anonymous> ' - '(http://pub.dartlang.org/stuff.dart.js:560:28), <anonymous>:3:28)'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '(https://example.com/stuff.dart.js:560:28), <anonymous>:3:28)'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, equals(28)); expect(frame.member, equals('eval')); @@ -198,9 +192,8 @@ test('parses a nested eval stack frame correctly', () { var frame = Frame.parseV8(' at eval (eval at <anonymous> ' - '(eval at sub (http://pub.dartlang.org/stuff.dart.js:560:28)))'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '(eval at sub (https://example.com/stuff.dart.js:560:28)))'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, equals(28)); expect(frame.member, equals('eval')); @@ -237,22 +230,21 @@ group('.parseFirefox/.parseSafari', () { test('parses a Firefox stack trace with anonymous function', () { var trace = Trace.parse(''' -Foo._bar@http://pub.dartlang.org/stuff.js:18056:12 -anonymous/<@http://pub.dartlang.org/stuff.js line 693 > Function:3:40 -baz@http://pub.dartlang.org/buz.js:56355:55 +Foo._bar@https://example.com/stuff.js:18056:12 +anonymous/<@https://example.com/stuff.js line 693 > Function:3:40 +baz@https://pub.dev/buz.js:56355:55 '''); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[0].line, equals(18056)); expect(trace.frames[0].column, equals(12)); expect(trace.frames[0].member, equals('Foo._bar')); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].line, equals(693)); expect(trace.frames[1].column, isNull); expect(trace.frames[1].member, equals('<fn>')); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/buz.js'))); + expect(trace.frames[2].uri, equals(Uri.parse('https://pub.dev/buz.js'))); expect(trace.frames[2].line, equals(56355)); expect(trace.frames[2].column, equals(55)); expect(trace.frames[2].member, equals('baz')); @@ -261,12 +253,12 @@ test('parses a Firefox stack trace with nested evals in anonymous function', () { var trace = Trace.parse(''' - Foo._bar@http://pub.dartlang.org/stuff.js:18056:12 + Foo._bar@https://example.com/stuff.js:18056:12 anonymous@file:///C:/example.html line 7 > eval line 1 > eval:1:1 anonymous@file:///C:/example.html line 45 > Function:1:1 '''); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[0].line, equals(18056)); expect(trace.frames[0].column, equals(12)); expect(trace.frames[0].member, equals('Foo._bar')); @@ -282,9 +274,8 @@ test('parses a simple stack frame correctly', () { var frame = Frame.parseFirefox( - '.VW.call\$0@http://pub.dartlang.org/stuff.dart.js:560'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '.VW.call\$0@https://example.com/stuff.dart.js:560'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, isNull); expect(frame.member, equals('VW.call\$0')); @@ -334,28 +325,23 @@ }); test('parses a simple anonymous stack frame correctly', () { - var frame = - Frame.parseFirefox('@http://pub.dartlang.org/stuff.dart.js:560'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + var frame = Frame.parseFirefox('@https://example.com/stuff.dart.js:560'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, isNull); expect(frame.member, equals('<fn>')); }); test('parses a nested anonymous stack frame correctly', () { - var frame = Frame.parseFirefox( - '.foo/<@http://pub.dartlang.org/stuff.dart.js:560'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + var frame = + Frame.parseFirefox('.foo/<@https://example.com/stuff.dart.js:560'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, isNull); expect(frame.member, equals('foo.<fn>')); - frame = - Frame.parseFirefox('.foo/@http://pub.dartlang.org/stuff.dart.js:560'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + frame = Frame.parseFirefox('.foo/@https://example.com/stuff.dart.js:560'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, isNull); expect(frame.member, equals('foo.<fn>')); @@ -363,17 +349,15 @@ test('parses a named nested anonymous stack frame correctly', () { var frame = Frame.parseFirefox( - '.foo/.name<@http://pub.dartlang.org/stuff.dart.js:560'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '.foo/.name<@https://example.com/stuff.dart.js:560'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, isNull); expect(frame.member, equals('foo.<fn>')); frame = Frame.parseFirefox( - '.foo/.name@http://pub.dartlang.org/stuff.dart.js:560'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '.foo/.name@https://example.com/stuff.dart.js:560'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, isNull); expect(frame.member, equals('foo.<fn>')); @@ -381,9 +365,8 @@ test('parses a stack frame with parameters correctly', () { var frame = Frame.parseFirefox( - '.foo(12, "@)()/<")@http://pub.dartlang.org/stuff.dart.js:560'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + '.foo(12, "@)()/<")@https://example.com/stuff.dart.js:560'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, isNull); expect(frame.member, equals('foo')); @@ -391,9 +374,8 @@ test('parses a nested anonymous stack frame with parameters correctly', () { var frame = Frame.parseFirefox('.foo(12, "@)()/<")/.fn<@' - 'http://pub.dartlang.org/stuff.dart.js:560'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + 'https://example.com/stuff.dart.js:560'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, isNull); expect(frame.member, equals('foo.<fn>')); @@ -403,9 +385,8 @@ 'parses a deeply-nested anonymous stack frame with parameters ' 'correctly', () { var frame = Frame.parseFirefox('.convertDartClosureToJS/\$function</<@' - 'http://pub.dartlang.org/stuff.dart.js:560'); - expect(frame.uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.dart.js'))); + 'https://example.com/stuff.dart.js:560'); + expect(frame.uri, equals(Uri.parse('https://example.com/stuff.dart.js'))); expect(frame.line, equals(560)); expect(frame.column, isNull); expect(frame.member, equals('convertDartClosureToJS.<fn>.<fn>')); @@ -424,16 +405,16 @@ test('parses a simple stack frame correctly', () { var frame = - Frame.parseFirefox('foo\$bar@http://dartlang.org/foo/bar.dart:10:11'); - expect(frame.uri, equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + Frame.parseFirefox('foo\$bar@https://dart.dev/foo/bar.dart:10:11'); + expect(frame.uri, equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(frame.line, equals(10)); expect(frame.column, equals(11)); expect(frame.member, equals('foo\$bar')); }); test('parses an anonymous stack frame correctly', () { - var frame = Frame.parseFirefox('http://dartlang.org/foo/bar.dart:10:11'); - expect(frame.uri, equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + var frame = Frame.parseFirefox('https://dart.dev/foo/bar.dart:10:11'); + expect(frame.uri, equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(frame.line, equals(10)); expect(frame.column, equals(11)); expect(frame.member, equals('<fn>')); @@ -441,8 +422,8 @@ test('parses a stack frame with no line correctly', () { var frame = - Frame.parseFirefox('foo\$bar@http://dartlang.org/foo/bar.dart::11'); - expect(frame.uri, equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + Frame.parseFirefox('foo\$bar@https://dart.dev/foo/bar.dart::11'); + expect(frame.uri, equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(frame.line, isNull); expect(frame.column, equals(11)); expect(frame.member, equals('foo\$bar')); @@ -450,8 +431,8 @@ test('parses a stack frame with no column correctly', () { var frame = - Frame.parseFirefox('foo\$bar@http://dartlang.org/foo/bar.dart:10:'); - expect(frame.uri, equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + Frame.parseFirefox('foo\$bar@https://dart.dev/foo/bar.dart:10:'); + expect(frame.uri, equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(frame.line, equals(10)); expect(frame.column, isNull); expect(frame.member, equals('foo\$bar')); @@ -459,8 +440,8 @@ test('parses a stack frame with no line or column correctly', () { var frame = - Frame.parseFirefox('foo\$bar@http://dartlang.org/foo/bar.dart:10:11'); - expect(frame.uri, equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + Frame.parseFirefox('foo\$bar@https://dart.dev/foo/bar.dart:10:11'); + expect(frame.uri, equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(frame.line, equals(10)); expect(frame.column, equals(11)); expect(frame.member, equals('foo\$bar')); @@ -470,8 +451,8 @@ group('.parseFriendly', () { test('parses a simple stack frame correctly', () { var frame = Frame.parseFriendly( - 'http://dartlang.org/foo/bar.dart 10:11 Foo.<fn>.bar'); - expect(frame.uri, equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + 'https://dart.dev/foo/bar.dart 10:11 Foo.<fn>.bar'); + expect(frame.uri, equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(frame.line, equals(10)); expect(frame.column, equals(11)); expect(frame.member, equals('Foo.<fn>.bar')); @@ -479,17 +460,17 @@ test('parses a stack frame with no line or column correctly', () { var frame = - Frame.parseFriendly('http://dartlang.org/foo/bar.dart Foo.<fn>.bar'); - expect(frame.uri, equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + Frame.parseFriendly('https://dart.dev/foo/bar.dart Foo.<fn>.bar'); + expect(frame.uri, equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(frame.line, isNull); expect(frame.column, isNull); expect(frame.member, equals('Foo.<fn>.bar')); }); test('parses a stack frame with no column correctly', () { - var frame = Frame.parseFriendly( - 'http://dartlang.org/foo/bar.dart 10 Foo.<fn>.bar'); - expect(frame.uri, equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + var frame = + Frame.parseFriendly('https://dart.dev/foo/bar.dart 10 Foo.<fn>.bar'); + expect(frame.uri, equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(frame.line, equals(10)); expect(frame.column, isNull); expect(frame.member, equals('Foo.<fn>.bar')); @@ -541,8 +522,8 @@ 'parses a stack frame with spaces in the member name and no line or ' 'column correctly', () { var frame = Frame.parseFriendly( - 'http://dartlang.org/foo/bar.dart (anonymous function).dart.fn'); - expect(frame.uri, equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + 'https://dart.dev/foo/bar.dart (anonymous function).dart.fn'); + expect(frame.uri, equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(frame.line, isNull); expect(frame.column, isNull); expect(frame.member, equals('(anonymous function).dart.fn')); @@ -569,9 +550,9 @@ equals('dart:async/future.dart')); expect( Frame.parseVM('#0 Foo ' - '(http://dartlang.org/stuff/thing.dart:0:0)') + '(https://dart.dev/stuff/thing.dart:0:0)') .library, - equals('http://dartlang.org/stuff/thing.dart')); + equals('https://dart.dev/stuff/thing.dart')); }); test('returns the relative path for file URIs', () { @@ -592,9 +573,9 @@ 'libraries', () { expect( Frame.parseVM('#0 Foo ' - '(http://dartlang.org/thing.dart:5:10)') + '(https://dart.dev/thing.dart:5:10)') .location, - equals('http://dartlang.org/thing.dart 5:10')); + equals('https://dart.dev/thing.dart 5:10')); expect(Frame.parseVM('#0 Foo (foo/bar.dart:1:2)').location, equals('${path.join('foo', 'bar.dart')} 1:2')); }); @@ -606,7 +587,7 @@ Frame.parseVM('#0 Foo (dart:async/future.dart:0:0)').package, isNull); expect( Frame.parseVM('#0 Foo ' - '(http://dartlang.org/stuff/thing.dart:0:0)') + '(https://dart.dev/stuff/thing.dart:0:0)') .package, isNull); }); @@ -624,9 +605,8 @@ 'returns the library and line/column numbers for non-core ' 'libraries', () { expect( - Frame.parseVM('#0 Foo (http://dartlang.org/thing.dart:5:10)') - .toString(), - equals('http://dartlang.org/thing.dart 5:10 in Foo')); + Frame.parseVM('#0 Foo (https://dart.dev/thing.dart:5:10)').toString(), + equals('https://dart.dev/thing.dart 5:10 in Foo')); }); test('converts "<anonymous closure>" to "<fn>"', () {
diff --git a/pkgs/stack_trace/test/trace_test.dart b/pkgs/stack_trace/test/trace_test.dart index 33a077d..561dec7 100644 --- a/pkgs/stack_trace/test/trace_test.dart +++ b/pkgs/stack_trace/test/trace_test.dart
@@ -19,71 +19,71 @@ var trace = Trace.parse( '#0 Foo._bar (file:///home/nweiz/code/stuff.dart:42:21)\n' '#1 zip.<anonymous closure>.zap (dart:async/future.dart:0:2)\n' - '#2 zip.<anonymous closure>.zap (http://pub.dartlang.org/thing.' + '#2 zip.<anonymous closure>.zap (https://pub.dev/thing.' 'dart:1:100)'); expect(trace.frames[0].uri, equals(Uri.parse('file:///home/nweiz/code/stuff.dart'))); expect(trace.frames[1].uri, equals(Uri.parse('dart:async/future.dart'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.dart'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.dart'))); }); test('parses a V8 stack trace correctly', () { var trace = Trace.parse('Error\n' - ' at Foo._bar (http://pub.dartlang.org/stuff.js:42:21)\n' - ' at http://pub.dartlang.org/stuff.js:0:2\n' + ' at Foo._bar (https://example.com/stuff.js:42:21)\n' + ' at https://example.com/stuff.js:0:2\n' ' at zip.<anonymous>.zap ' - '(http://pub.dartlang.org/thing.js:1:100)'); + '(https://pub.dev/thing.js:1:100)'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); trace = Trace.parse('Exception: foo\n' - ' at Foo._bar (http://pub.dartlang.org/stuff.js:42:21)\n' - ' at http://pub.dartlang.org/stuff.js:0:2\n' + ' at Foo._bar (https://example.com/stuff.js:42:21)\n' + ' at https://example.com/stuff.js:0:2\n' ' at zip.<anonymous>.zap ' - '(http://pub.dartlang.org/thing.js:1:100)'); + '(https://pub.dev/thing.js:1:100)'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); trace = Trace.parse('Exception: foo\n' ' bar\n' - ' at Foo._bar (http://pub.dartlang.org/stuff.js:42:21)\n' - ' at http://pub.dartlang.org/stuff.js:0:2\n' + ' at Foo._bar (https://example.com/stuff.js:42:21)\n' + ' at https://example.com/stuff.js:0:2\n' ' at zip.<anonymous>.zap ' - '(http://pub.dartlang.org/thing.js:1:100)'); + '(https://pub.dev/thing.js:1:100)'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); trace = Trace.parse('Exception: foo\n' ' bar\n' - ' at Foo._bar (http://pub.dartlang.org/stuff.js:42:21)\n' - ' at http://pub.dartlang.org/stuff.js:0:2\n' + ' at Foo._bar (https://example.com/stuff.js:42:21)\n' + ' at https://example.com/stuff.js:0:2\n' ' at (anonymous function).zip.zap ' - '(http://pub.dartlang.org/thing.js:1:100)'); + '(https://pub.dev/thing.js:1:100)'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].member, equals('<fn>')); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); expect(trace.frames[2].member, equals('<fn>.zip.zap')); }); @@ -91,155 +91,153 @@ // header and it starts with a tab rather than spaces. test('parses a JavaScriptCore stack trace correctly', () { var trace = - Trace.parse('\tat Foo._bar (http://pub.dartlang.org/stuff.js:42:21)\n' - '\tat http://pub.dartlang.org/stuff.js:0:2\n' + Trace.parse('\tat Foo._bar (https://example.com/stuff.js:42:21)\n' + '\tat https://example.com/stuff.js:0:2\n' '\tat zip.<anonymous>.zap ' - '(http://pub.dartlang.org/thing.js:1:100)'); + '(https://pub.dev/thing.js:1:100)'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); - trace = - Trace.parse('\tat Foo._bar (http://pub.dartlang.org/stuff.js:42:21)\n' - '\tat \n' - '\tat zip.<anonymous>.zap ' - '(http://pub.dartlang.org/thing.js:1:100)'); + trace = Trace.parse('\tat Foo._bar (https://example.com/stuff.js:42:21)\n' + '\tat \n' + '\tat zip.<anonymous>.zap ' + '(https://pub.dev/thing.js:1:100)'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[1].uri, equals(Uri.parse('https://pub.dev/thing.js'))); }); test('parses a Firefox/Safari stack trace correctly', () { - var trace = Trace.parse('Foo._bar@http://pub.dartlang.org/stuff.js:42\n' - 'zip/<@http://pub.dartlang.org/stuff.js:0\n' - 'zip.zap(12, "@)()/<")@http://pub.dartlang.org/thing.js:1'); + var trace = Trace.parse('Foo._bar@https://example.com/stuff.js:42\n' + 'zip/<@https://example.com/stuff.js:0\n' + 'zip.zap(12, "@)()/<")@https://pub.dev/thing.js:1'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); - trace = Trace.parse('zip/<@http://pub.dartlang.org/stuff.js:0\n' - 'Foo._bar@http://pub.dartlang.org/stuff.js:42\n' - 'zip.zap(12, "@)()/<")@http://pub.dartlang.org/thing.js:1'); + trace = Trace.parse('zip/<@https://example.com/stuff.js:0\n' + 'Foo._bar@https://example.com/stuff.js:42\n' + 'zip.zap(12, "@)()/<")@https://pub.dev/thing.js:1'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); - trace = Trace.parse( - 'zip.zap(12, "@)()/<")@http://pub.dartlang.org/thing.js:1\n' - 'zip/<@http://pub.dartlang.org/stuff.js:0\n' - 'Foo._bar@http://pub.dartlang.org/stuff.js:42'); + trace = Trace.parse('zip.zap(12, "@)()/<")@https://pub.dev/thing.js:1\n' + 'zip/<@https://example.com/stuff.js:0\n' + 'Foo._bar@https://example.com/stuff.js:42'); - expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + expect( + trace.frames[0].uri, equals(Uri.parse('https://pub.dev/thing.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); }); test('parses a Firefox/Safari stack trace containing native code correctly', () { - var trace = Trace.parse('Foo._bar@http://pub.dartlang.org/stuff.js:42\n' - 'zip/<@http://pub.dartlang.org/stuff.js:0\n' - 'zip.zap(12, "@)()/<")@http://pub.dartlang.org/thing.js:1\n' + var trace = Trace.parse('Foo._bar@https://example.com/stuff.js:42\n' + 'zip/<@https://example.com/stuff.js:0\n' + 'zip.zap(12, "@)()/<")@https://pub.dev/thing.js:1\n' '[native code]'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); expect(trace.frames.length, equals(3)); }); test('parses a Firefox/Safari stack trace without a method name correctly', () { - var trace = Trace.parse('http://pub.dartlang.org/stuff.js:42\n' - 'zip/<@http://pub.dartlang.org/stuff.js:0\n' - 'zip.zap(12, "@)()/<")@http://pub.dartlang.org/thing.js:1'); + var trace = Trace.parse('https://example.com/stuff.js:42\n' + 'zip/<@https://example.com/stuff.js:0\n' + 'zip.zap(12, "@)()/<")@https://pub.dev/thing.js:1'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[0].member, equals('<fn>')); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); }); test('parses a Firefox/Safari stack trace with an empty line correctly', () { - var trace = Trace.parse('Foo._bar@http://pub.dartlang.org/stuff.js:42\n' + var trace = Trace.parse('Foo._bar@https://example.com/stuff.js:42\n' '\n' - 'zip/<@http://pub.dartlang.org/stuff.js:0\n' - 'zip.zap(12, "@)()/<")@http://pub.dartlang.org/thing.js:1'); + 'zip/<@https://example.com/stuff.js:0\n' + 'zip.zap(12, "@)()/<")@https://pub.dev/thing.js:1'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); }); test('parses a Firefox/Safari stack trace with a column number correctly', () { - var trace = Trace.parse('Foo._bar@http://pub.dartlang.org/stuff.js:42:2\n' - 'zip/<@http://pub.dartlang.org/stuff.js:0\n' - 'zip.zap(12, "@)()/<")@http://pub.dartlang.org/thing.js:1'); + var trace = Trace.parse('Foo._bar@https://example.com/stuff.js:42:2\n' + 'zip/<@https://example.com/stuff.js:0\n' + 'zip.zap(12, "@)()/<")@https://pub.dev/thing.js:1'); expect(trace.frames[0].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); expect(trace.frames[0].line, equals(42)); expect(trace.frames[0].column, equals(2)); expect(trace.frames[1].uri, - equals(Uri.parse('http://pub.dartlang.org/stuff.js'))); - expect(trace.frames[2].uri, - equals(Uri.parse('http://pub.dartlang.org/thing.js'))); + equals(Uri.parse('https://example.com/stuff.js'))); + expect( + trace.frames[2].uri, equals(Uri.parse('https://pub.dev/thing.js'))); }); test('parses a package:stack_trace stack trace correctly', () { var trace = - Trace.parse('http://dartlang.org/foo/bar.dart 10:11 Foo.<fn>.bar\n' - 'http://dartlang.org/foo/baz.dart Foo.<fn>.bar'); + Trace.parse('https://dart.dev/foo/bar.dart 10:11 Foo.<fn>.bar\n' + 'https://dart.dev/foo/baz.dart Foo.<fn>.bar'); expect(trace.frames[0].uri, - equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://dartlang.org/foo/baz.dart'))); + equals(Uri.parse('https://dart.dev/foo/baz.dart'))); }); test('parses a package:stack_trace stack chain correctly', () { var trace = - Trace.parse('http://dartlang.org/foo/bar.dart 10:11 Foo.<fn>.bar\n' - 'http://dartlang.org/foo/baz.dart Foo.<fn>.bar\n' + Trace.parse('https://dart.dev/foo/bar.dart 10:11 Foo.<fn>.bar\n' + 'https://dart.dev/foo/baz.dart Foo.<fn>.bar\n' '===== asynchronous gap ===========================\n' - 'http://dartlang.org/foo/bang.dart 10:11 Foo.<fn>.bar\n' - 'http://dartlang.org/foo/quux.dart Foo.<fn>.bar'); + 'https://dart.dev/foo/bang.dart 10:11 Foo.<fn>.bar\n' + 'https://dart.dev/foo/quux.dart Foo.<fn>.bar'); expect(trace.frames[0].uri, - equals(Uri.parse('http://dartlang.org/foo/bar.dart'))); + equals(Uri.parse('https://dart.dev/foo/bar.dart'))); expect(trace.frames[1].uri, - equals(Uri.parse('http://dartlang.org/foo/baz.dart'))); + equals(Uri.parse('https://dart.dev/foo/baz.dart'))); expect(trace.frames[2].uri, - equals(Uri.parse('http://dartlang.org/foo/bang.dart'))); + equals(Uri.parse('https://dart.dev/foo/bang.dart'))); expect(trace.frames[3].uri, - equals(Uri.parse('http://dartlang.org/foo/quux.dart'))); + equals(Uri.parse('https://dart.dev/foo/quux.dart'))); }); test('parses a real package:stack_trace stack trace correctly', () { @@ -258,13 +256,13 @@ var trace = Trace.parse(''' #0 Foo._bar (foo/bar.dart:42:21) #1 zip.<anonymous closure>.zap (dart:async/future.dart:0:2) -#2 zip.<anonymous closure>.zap (http://pub.dartlang.org/thing.dart:1:100) +#2 zip.<anonymous closure>.zap (https://pub.dev/thing.dart:1:100) '''); expect(trace.toString(), equals(''' -${path.join('foo', 'bar.dart')} 42:21 Foo._bar -dart:async/future.dart 0:2 zip.<fn>.zap -http://pub.dartlang.org/thing.dart 1:100 zip.<fn>.zap +${path.join('foo', 'bar.dart')} 42:21 Foo._bar +dart:async/future.dart 0:2 zip.<fn>.zap +https://pub.dev/thing.dart 1:100 zip.<fn>.zap ''')); }); @@ -272,14 +270,14 @@ var uri = path.toUri(path.absolute('foo')); var trace = Trace([ Frame(uri, 10, 20, 'Foo.<fn>'), - Frame(Uri.parse('http://dartlang.org/foo.dart'), null, null, 'bar'), + Frame(Uri.parse('https://dart.dev/foo.dart'), null, null, 'bar'), Frame(Uri.parse('dart:async'), 15, null, 'baz'), ]); expect( trace.vmTrace.toString(), equals('#1 Foo.<anonymous closure> ($uri:10:20)\n' - '#2 bar (http://dartlang.org/foo.dart:0:0)\n' + '#2 bar (https://dart.dev/foo.dart:0:0)\n' '#3 baz (dart:async:15:0)\n')); });