| Index: tests/compiler/dart2js/library_resolution_test.dart
|
| diff --git a/tests/compiler/dart2js/library_resolution_test.dart b/tests/compiler/dart2js/library_resolution_test.dart
|
| index c7058471aa47ce1502c248fa70d532e69a7bbc98..ed41ebe3a3b25e16ed441e23165835c9b72fe7cd 100644
|
| --- a/tests/compiler/dart2js/library_resolution_test.dart
|
| +++ b/tests/compiler/dart2js/library_resolution_test.dart
|
| @@ -21,8 +21,14 @@ import 'package:compiler/src/elements/elements.dart' show
|
| LibraryElement;
|
|
|
| import 'package:compiler/src/dart2jslib.dart' show
|
| - MessageKind,
|
| - NullSink;
|
| + MessageKind;
|
| +
|
| +import 'package:compiler/src/null_compiler_output.dart' show
|
| + NullCompilerOutput;
|
| +
|
| +import 'package:compiler/src/old_to_new_api.dart' show
|
| + LegacyCompilerDiagnostics,
|
| + LegacyCompilerInput;
|
|
|
| import 'package:sdk_library_metadata/libraries.dart' show
|
| DART2JS_PLATFORM,
|
| @@ -40,13 +46,13 @@ const LibraryInfo mock2LibraryInfo = const LibraryInfo(
|
| documented: false,
|
| platforms: DART2JS_PLATFORM);
|
|
|
| +
|
| class CustomCompiler extends Compiler {
|
| final Map<String, LibraryInfo> customLibraryInfo;
|
|
|
| CustomCompiler(
|
| this.customLibraryInfo,
|
| provider,
|
| - outputProvider,
|
| handler,
|
| libraryRoot,
|
| packageRoot,
|
| @@ -54,7 +60,7 @@ class CustomCompiler extends Compiler {
|
| environment)
|
| : super(
|
| provider,
|
| - outputProvider,
|
| + const NullCompilerOutput(),
|
| handler,
|
| libraryRoot,
|
| packageRoot,
|
| @@ -75,11 +81,6 @@ main() {
|
| var provider = new MemorySourceFileProvider(MEMORY_SOURCE_FILES);
|
| var handler = new FormattingDiagnosticHandler(provider);
|
|
|
| - outputProvider(String name, String extension) {
|
| - if (name != '') throw 'Attempt to output file "$name.$extension"';
|
| - return new NullSink('$name.$extension');
|
| - }
|
| -
|
| Future wrappedProvider(Uri uri) {
|
| if (uri == sdkRoot.resolve('lib/mock1.dart')) {
|
| return provider.readStringFromUri(Uri.parse('memory:mock1.dart'));
|
| @@ -111,9 +112,8 @@ main() {
|
|
|
| Compiler compiler = new CustomCompiler(
|
| {},
|
| - wrappedProvider,
|
| - outputProvider,
|
| - wrappedHandler,
|
| + new LegacyCompilerInput(wrappedProvider),
|
| + new LegacyCompilerDiagnostics(wrappedHandler),
|
| sdkRoot,
|
| packageRoot,
|
| [],
|
|
|