Add a --reporter flag and expose the expanded reporter.

test/runner/expanded_reporter_test.dart

 // Copyright (c) 2015, 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.
 
 @TestOn("vm")
 
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
 import 'package:test/src/util/io.dart';
 import 'package:test/test.dart';
 
 import '../io.dart';
 
 void main() {
   test("reports when no tests are run", () {
     return withTempDir((path) {
       new File(p.join(path, "test.dart")).writeAsStringSync("void main() {}");
-      var result = runTest(["test.dart"], workingDirectory: path);
+      var result = runTest(["-r", "expanded", "test.dart"],
+          workingDirectory: path);
       expect(result.stdout, equals("No tests ran.\n"));
     });
   });
 
   test("runs several successful tests and reports when each completes", () {
     _expectReport("""
         test('success 1', () {});
         test('success 2', () {});
         test('success 3', () {});""",
         """
         +0: success 1
-        +1: success 1
         +1: success 2
-        +2: success 2
         +2: success 3
-        +3: success 3
         +3: All tests passed!""");
   });
 
   test("runs several failing tests and reports when each fails", () {
     _expectReport("""
         test('failure 1', () => throw new TestFailure('oh no'));
         test('failure 2', () => throw new TestFailure('oh no'));
         test('failure 3', () => throw new TestFailure('oh no'));""",
         """
         +0: failure 1
         +0 -1: failure 1
           oh no
           test.dart 6:33  main.<fn>
 
-
         +0 -1: failure 2
         +0 -2: failure 2
           oh no
           test.dart 7:33  main.<fn>
 
-
         +0 -2: failure 3
         +0 -3: failure 3
           oh no
           test.dart 8:33  main.<fn>
 
-
         +0 -3: Some tests failed.""");
   });
 
   test("runs failing tests along with successful tests", () {
     _expectReport("""
         test('failure 1', () => throw new TestFailure('oh no'));
         test('success 1', () {});
         test('failure 2', () => throw new TestFailure('oh no'));
         test('success 2', () {});""",
         """
         +0: failure 1
         +0 -1: failure 1
           oh no
           test.dart 6:33  main.<fn>
 
-
         +0 -1: success 1
-        +1 -1: success 1
         +1 -1: failure 2
         +1 -2: failure 2
           oh no
           test.dart 8:33  main.<fn>
 
-
         +1 -2: success 2
-        +2 -2: success 2
         +2 -2: Some tests failed.""");
   });
 
   test("gracefully handles multiple test failures in a row", () {
     _expectReport("""
         // This completer ensures that the test isolate isn't killed until all
         // errors have been thrown.
         var completer = new Completer();
         test('failures', () {
           new Future.microtask(() => throw 'first error');
@@ skipping 16 matching lines @@
           ===== asynchronous gap ===========================
           dart:async       Future.Future.microtask
           test.dart 11:15  main.<fn>
 
           third error
           test.dart 12:38  main.<fn>.<fn>
           ===== asynchronous gap ===========================
           dart:async       Future.Future.microtask
           test.dart 12:15  main.<fn>
 
-
         +0 -1: wait
-        +1 -1: wait
         +1 -1: Some tests failed.""");
   });
 
   group("print:", () {
     test("handles multiple prints", () {
       _expectReport("""
         test('test', () {
           print("one");
           print("two");
           print("three");
           print("four");
         });""",
         """
         +0: test
         one
         two
         three
         four
-
-        +1: test
         +1: All tests passed!""");
     });
 
     test("handles a print after the test completes", () {
       _expectReport("""
         // This completer ensures that the test isolate isn't killed until all
         // prints have happened.
         var testDone = new Completer();
         var waitStarted = new Completer();
         test('test', () {
           waitStarted.future.then((_) {
             new Future(() => print("one"));
             new Future(() => print("two"));
             new Future(() => print("three"));
             new Future(() => print("four"));
             new Future(testDone.complete);
           });
         });
 
         test('wait', () {
           waitStarted.complete();
           return testDone.future;
         });""", """
         +0: test
-        +1: test
         +1: wait
         +1: test
         one
         two
         three
         four
-
-        +2: wait
         +2: All tests passed!""");
     });
 
     test("interleaves prints and errors", () {
       _expectReport("""
         // This completer ensures that the test isolate isn't killed until all
         // prints have happened.
         var completer = new Completer();
         test('test', () {
           scheduleMicrotask(() {
@@ skipping 11 matching lines @@
           print("one");
           print("two");
           throw "first error";
         });
 
         test('wait', () => completer.future);""",
         """
         +0: test
         one
         two
-
         +0 -1: test
           first error
           test.dart 24:11  main.<fn>
 
         three
         four
           second error
           test.dart 13:13  main.<fn>.<fn>
           ===== asynchronous gap ===========================
           dart:async       scheduleMicrotask
           test.dart 10:11  main.<fn>
 
         five
         six
-
         +0 -1: wait
-        +1 -1: wait
         +1 -1: Some tests failed.""");
     });
   });
 
   group("skip:", () {
     test("displays skipped tests separately", () {
       _expectReport("""
           test('skip 1', () {}, skip: true);
           test('skip 2', () {}, skip: true);
           test('skip 3', () {}, skip: true);""",
           """
           +0: skip 1
-          +0 ~1: skip 1
           +0 ~1: skip 2
-          +0 ~2: skip 2
           +0 ~2: skip 3
-          +0 ~3: skip 3
           +0 ~3: All tests skipped.""");
     });
 
     test("runs skipped tests along with successful tests", () {
       _expectReport("""
           test('skip 1', () {}, skip: true);
           test('success 1', () {});
           test('skip 2', () {}, skip: true);
           test('success 2', () {});""",
           """
           +0: skip 1
-          +0 ~1: skip 1
           +0 ~1: success 1
-          +1 ~1: success 1
           +1 ~1: skip 2
-          +1 ~2: skip 2
           +1 ~2: success 2
-          +2 ~2: success 2
           +2 ~2: All tests passed!""");
     });
 
     test("runs skipped tests along with successful and failing tests", () {
       _expectReport("""
           test('failure 1', () => throw new TestFailure('oh no'));
           test('skip 1', () {}, skip: true);
           test('success 1', () {});
           test('failure 2', () => throw new TestFailure('oh no'));
           test('skip 2', () {}, skip: true);
           test('success 2', () {});""",
           """
           +0: failure 1
           +0 -1: failure 1
             oh no
             test.dart 6:35  main.<fn>
 
-
           +0 -1: skip 1
-          +0 ~1 -1: skip 1
           +0 ~1 -1: success 1
-          +1 ~1 -1: success 1
           +1 ~1 -1: failure 2
           +1 ~1 -2: failure 2
             oh no
             test.dart 9:35  main.<fn>
 
-
           +1 ~1 -2: skip 2
-          +1 ~2 -2: skip 2
           +1 ~2 -2: success 2
-          +2 ~2 -2: success 2
           +2 ~2 -2: Some tests failed.""");
     });
 
     test("displays the skip reason if available", () {
       _expectReport("""
           test('skip 1', () {}, skip: 'some reason');
           test('skip 2', () {}, skip: 'or another');""",
           """
           +0: skip 1
           +0 ~1: skip 1
             Skip: some reason
-
           +0 ~1: skip 2
           +0 ~2: skip 2
             Skip: or another
-
           +0 ~2: All tests skipped.""");
     });
   });
 }
 
 void _expectReport(String tests, String expected, {List<String> args,
     int concurrency}) {
   if (concurrency == null) concurrency = 1;
 
   var dart = """
 import 'dart:async';
 
 import 'package:test/test.dart';
 
 void main() {
 $tests
 }
 """;
 
   expect(withTempDir((path) {
     new File(p.join(path, "test.dart")).writeAsStringSync(dart);
     if (args == null) args = [];
-    args = args.toList()..add("test.dart");
-    args.add("--concurrency=$concurrency");
+    args = args.toList()
+      ..add("test.dart")
+      ..add("--concurrency=$concurrency")
+      ..add("--reporter=expanded");
     var result = runTest(args, workingDirectory: path);
 
-    // Convert CRs into newlines, remove excess trailing whitespace, and trim
-    // off timestamps.
-    var actual = result.stdout.trim().split(new RegExp(r"[\r\n]")).map((line) {
+    // Remove excess trailing whitespace and trim off timestamps.
+    var actual = result.stdout.trim().split("\n").map((line) {
       if (line.startsWith("  ") || line.isEmpty) return line.trimRight();
       return line.trim().replaceFirst(new RegExp("^[0-9]{2}:[0-9]{2} "), "");
     }).join("\n");
 
     // Un-indent the expected string.
     var indentation = expected.indexOf(new RegExp("[^ ]"));
     expected = expected.split("\n").map((line) {
       if (line.isEmpty) return line;
       return line.substring(indentation);
     }).join("\n");
 
     expect(actual, equals(expected));
   }), completes);
 }