Unify parsing of Firefox and Safari stack traces.

pkg/stack_trace/test/frame_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 frame_test;
 
 import 'package:path/path.dart' as path;
 import 'package:stack_trace/stack_trace.dart';
 import 'package:unittest/unittest.dart';
 
@@ skipping 192 matching lines @@
           throwsFormatException);
       expect(() => new Frame.parseV8('    at dart:async/future.dart'),
           throwsFormatException);
       expect(() => new Frame.parseV8('    at dart:async/future.dart:10'),
           throwsFormatException);
       expect(() => new Frame.parseV8('dart:async/future.dart:10:15'),
           throwsFormatException);
     });
   });
 
-  group('.parseFirefox', () {
+  group('.parseFirefox/.parseSafari', () {
     test('parses a simple stack frame correctly', () {
       var frame = new 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")));
       expect(frame.line, equals(560));
       expect(frame.column, isNull);
       expect(frame.member, equals('VW.call\$0'));
     });
 
@@ skipping 125 matching lines @@
     test('throws a FormatException for malformed frames', () {
       expect(() => new Frame.parseFirefox(''), throwsFormatException);
       expect(() => new Frame.parseFirefox('.foo'), throwsFormatException);
       expect(() => new Frame.parseFirefox('.foo@dart:async/future.dart'),
           throwsFormatException);
       expect(() => new Frame.parseFirefox('.foo(@dart:async/future.dart:10'),
           throwsFormatException);
       expect(() => new Frame.parseFirefox('@dart:async/future.dart'),
           throwsFormatException);
     });
-  });
 
-  group('.parseSafari6_1', () {
     test('parses a simple stack frame correctly', () {
-      var frame = new Frame.parseSafari6_1(
+      var frame = new Frame.parseFirefox(
           "foo\$bar@http://dartlang.org/foo/bar.dart:10:11");
       expect(frame.uri, equals(Uri.parse("http://dartlang.org/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 = new Frame.parseSafari6_1(
+      var frame = new Frame.parseFirefox(
           "http://dartlang.org/foo/bar.dart:10:11");
       expect(frame.uri, equals(Uri.parse("http://dartlang.org/foo/bar.dart")));
       expect(frame.line, equals(10));
       expect(frame.column, equals(11));
       expect(frame.member, equals('<fn>'));
     });
 
     test('parses a stack frame with no line correctly', () {
-      var frame = new Frame.parseSafari6_1(
+      var frame = new Frame.parseFirefox(
           "foo\$bar@http://dartlang.org/foo/bar.dart::11");
       expect(frame.uri, equals(Uri.parse("http://dartlang.org/foo/bar.dart")));
       expect(frame.line, isNull);
       expect(frame.column, equals(11));
       expect(frame.member, equals('foo\$bar'));
     });
 
     test('parses a stack frame with no column correctly', () {
-      var frame = new Frame.parseSafari6_1(
+      var frame = new Frame.parseFirefox(
           "foo\$bar@http://dartlang.org/foo/bar.dart:10:");
       expect(frame.uri, equals(Uri.parse("http://dartlang.org/foo/bar.dart")));
       expect(frame.line, equals(10));
       expect(frame.column, isNull);
       expect(frame.member, equals('foo\$bar'));
     });
 
     test('parses a stack frame with no line or column correctly', () {
-      var frame = new Frame.parseSafari6_1(
+      var frame = new Frame.parseFirefox(
           "foo\$bar@http://dartlang.org/foo/bar.dart:10:11");
       expect(frame.uri, equals(Uri.parse("http://dartlang.org/foo/bar.dart")));
       expect(frame.line, equals(10));
       expect(frame.column, equals(11));
       expect(frame.member, equals('foo\$bar'));
     });
   });
 
   group('.parseFriendly', () {
     test('parses a simple stack frame correctly', () {
@@ skipping 117 matching lines @@
           equals('dart:core/uri.dart 5 in Foo'));
     });
 
     test('prints relative paths as relative', () {
       var relative = path.normalize('relative/path/to/foo.dart');
       expect(new Frame.parseFriendly('$relative 5:10  Foo').toString(),
           equals('$relative 5:10 in Foo'));
     });
   });
 }