Extract DiagnosticReporter implementation from Compiler.

tests/compiler/dart2js/exit_code_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.
 
 // Test the exit code of dart2js in case of exceptions, errors, warnings, etc.
 
 
 import 'dart:async';
 import 'dart:io' show Platform;
 
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
 
 import 'package:compiler/compiler.dart' as old_api;
 import 'package:compiler/compiler_new.dart' as api;
 import 'package:compiler/src/common/codegen.dart';
 import 'package:compiler/src/compile_time_constants.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/dart2js.dart' as entry;
+import 'package:compiler/src/diagnostics/diagnostic_listener.dart';
 import 'package:compiler/src/diagnostics/invariant.dart';
 import 'package:compiler/src/diagnostics/messages.dart';
 import 'package:compiler/src/diagnostics/spannable.dart';
 import 'package:compiler/src/apiimpl.dart' as apiimpl;
 import 'package:compiler/src/enqueue.dart';
 import 'package:compiler/src/elements/elements.dart';
 import 'package:compiler/src/library_loader.dart';
 import 'package:compiler/src/null_compiler_output.dart';
 import 'package:compiler/src/old_to_new_api.dart';
 import 'package:compiler/src/resolution/resolution.dart';
 import 'package:compiler/src/scanner/scanner_task.dart';
+import 'diagnostic_reporter_helper.dart';
 
 class TestCompiler extends apiimpl.Compiler {
   final String testMarker;
   final String testType;
   final Function onTest;
+  DiagnosticReporter reporter;
 
   TestCompiler(api.CompilerInput inputProvider,
                api.CompilerOutput outputProvider,
                api.CompilerDiagnostics handler,
                Uri libraryRoot,
                Uri packageRoot,
                List<String> options,
                Map<String, dynamic> environment,
                Uri packageConfig,
                api.PackagesDiscoveryProvider findPackages,
                String this.testMarker,
                String this.testType,
                Function this.onTest)
       : super(inputProvider, outputProvider, handler, libraryRoot,
               packageRoot, options, environment, packageConfig, findPackages) {
     scanner = new TestScanner(this);
     resolver = new TestResolver(this, backend.constantCompilerTask);
+    reporter = new TestDiagnosticReporter(this, super.reporter);
     test('Compiler');
   }
 
   Future<bool> run(Uri uri) {
     test('Compiler.run');
     return super.run(uri);
   }
 
   Future onLibraryScanned(LibraryElement element, LibraryLoader loader) {
     test('Compiler.onLibraryScanned');
     return super.onLibraryScanned(element, loader);
   }
 
   Future onLibrariesLoaded(LoadedLibraries loadedLibraries) {
     test('Compiler.onLibrariesLoaded');
     return super.onLibrariesLoaded(loadedLibraries);
   }
 
   WorldImpact analyzeElement(Element element) {
     test('Compiler.analyzeElement');
     return super.analyzeElement(element);
   }
 
   WorldImpact codegen(CodegenWorkItem work, CodegenEnqueuer world) {
     test('Compiler.codegen');
     return super.codegen(work, world);
   }
 
-  withCurrentElement(Element element, f()) {
-    return super.withCurrentElement(element, () {
-      test('Compiler.withCurrentElement');
-      return f();
-    });
-  }
-
   test(String marker) {
     if (marker == testMarker) {
       switch (testType) {
       case 'assert':
         onTest(testMarker, testType);
         assert(false);
         break;
       case 'invariant':
         onTest(testMarker, testType);
         invariant(NO_LOCATION_SPANNABLE, false, message: marker);
         break;
       case 'warning':
         onTest(testMarker, testType);
-        reportWarning(createMessage(
+        reporter.reportWarningMessage(
             NO_LOCATION_SPANNABLE,
-            MessageKind.GENERIC, {'text': marker}));
+            MessageKind.GENERIC, {'text': marker});
         break;
       case 'error':
         onTest(testMarker, testType);
-        reportError(createMessage(
+        reporter.reportErrorMessage(
             NO_LOCATION_SPANNABLE,
-            MessageKind.GENERIC, {'text': marker}));
+            MessageKind.GENERIC, {'text': marker});
         break;
       case 'internalError':
         onTest(testMarker, testType);
-        internalError(NO_LOCATION_SPANNABLE, marker);
+        reporter.internalError(NO_LOCATION_SPANNABLE, marker);
         break;
       case 'NoSuchMethodError':
         onTest(testMarker, testType);
         null.foo;
         break;
       case '':
         onTest(testMarker, testType);
         break;
       }
     }
   }
 }
 
+class TestDiagnosticReporter extends DiagnosticReporterWrapper {
+  final TestCompiler compiler;
+  final DiagnosticReporter reporter;
+
+  TestDiagnosticReporter(this.compiler, this.reporter);
+
+  @override
+  withCurrentElement(Element element, f()) {
+    return super.withCurrentElement(element, () {
+      compiler.test('Compiler.withCurrentElement');
+      return f();
+    });
+  }
+}
+
 class TestScanner extends ScannerTask {
   TestScanner(TestCompiler compiler) : super(compiler);
 
   TestCompiler get compiler => super.compiler;
 
   void scanElements(CompilationUnitElement compilationUnit) {
     compiler.test('ScannerTask.scanElements');
     super.scanElements(compilationUnit);
   }
 }
@@ skipping 142 matching lines @@
 
       expected = _expectedExitCode(
           beforeRun: tests[marker], fatalWarnings: true);
       totalExpectedErrors += expected.length;
       await testExitCodes(marker, expected, ['--fatal-warnings']);
     }
 
     Expect.equals(totalExpectedErrors, checkedResults);
   });
 }