| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import "package:expect/expect.dart"; | 5 import "package:expect/expect.dart"; |
| 6 import 'dart:async'; | 6 import 'dart:async'; |
| 7 import 'dart:uri'; | |
| 8 import 'parser_helper.dart'; | 7 import 'parser_helper.dart'; |
| 9 import 'mock_compiler.dart'; | 8 import 'mock_compiler.dart'; |
| 10 import '../../../sdk/lib/_internal/compiler/compiler.dart'; | 9 import '../../../sdk/lib/_internal/compiler/compiler.dart'; |
| 11 import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart' as l
eg; | 10 import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart' as l
eg; |
| 12 import '../../../sdk/lib/_internal/compiler/implementation/dart_backend/dart_bac
kend.dart'; | 11 import '../../../sdk/lib/_internal/compiler/implementation/dart_backend/dart_bac
kend.dart'; |
| 13 import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dar
t'; | 12 import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dar
t'; |
| 14 import '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart'; | 13 import '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart'; |
| 15 | 14 |
| 16 const coreLib = r''' | 15 const coreLib = r''' |
| 17 library corelib; | 16 library corelib; |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 stripTypes: stripTypes); | 79 stripTypes: stripTypes); |
| 81 } | 80 } |
| 82 | 81 |
| 83 /** | 82 /** |
| 84 * Library name is assumed to be 'mylib' in 'mylib.dart' file. | 83 * Library name is assumed to be 'mylib' in 'mylib.dart' file. |
| 85 */ | 84 */ |
| 86 testDart2DartWithLibrary( | 85 testDart2DartWithLibrary( |
| 87 String srcMain, String srcLibrary, | 86 String srcMain, String srcLibrary, |
| 88 {void continuation(String s), bool minify: false, | 87 {void continuation(String s), bool minify: false, |
| 89 bool stripTypes: false}) { | 88 bool stripTypes: false}) { |
| 90 fileUri(path) => new Uri.fromComponents(scheme: 'file', path: path); | 89 fileUri(path) => new Uri(scheme: 'file', path: path); |
| 91 | 90 |
| 92 final scriptUri = fileUri('script.dart'); | 91 final scriptUri = fileUri('script.dart'); |
| 93 final libUri = fileUri('mylib.dart'); | 92 final libUri = fileUri('mylib.dart'); |
| 94 | 93 |
| 95 provider(uri) { | 94 provider(uri) { |
| 96 if (uri == scriptUri) return new Future.value(srcMain); | 95 if (uri == scriptUri) return new Future.value(srcMain); |
| 97 if (uri.toString() == libUri.toString()) { | 96 if (uri.toString() == libUri.toString()) { |
| 98 return new Future.value(srcLibrary); | 97 return new Future.value(srcLibrary); |
| 99 } | 98 } |
| 100 if (uri.path.endsWith('/core.dart')) { | 99 if (uri.path.endsWith('/core.dart')) { |
| (...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 722 testStaticAccessIoLib(); | 721 testStaticAccessIoLib(); |
| 723 testLocalFunctionPlaceholder(); | 722 testLocalFunctionPlaceholder(); |
| 724 testMinification(); | 723 testMinification(); |
| 725 testClosureLocalsMinified(); | 724 testClosureLocalsMinified(); |
| 726 testParametersMinified(); | 725 testParametersMinified(); |
| 727 testDeclarationTypePlaceholders(); | 726 testDeclarationTypePlaceholders(); |
| 728 testPlatformLibraryMemberNamesAreFixed(); | 727 testPlatformLibraryMemberNamesAreFixed(); |
| 729 testConflictsWithCoreLib(); | 728 testConflictsWithCoreLib(); |
| 730 testUnresolvedNamedConstructor(); | 729 testUnresolvedNamedConstructor(); |
| 731 } | 730 } |
| OLD | NEW |