22// for details. All rights reserved. Use of this source code is governed by a
33// BSD-style license that can be found in the LICENSE file.
44
5- import 'package:analyzer/dart/element/element .dart' ;
5+ import 'package:analyzer/dart/element/element2 .dart' ;
66import 'package:analyzer/src/services/top_level_declarations.dart' ;
77import 'package:test/test.dart' ;
88import 'package:test_reflective_loader/test_reflective_loader.dart' ;
@@ -19,24 +19,24 @@ main() {
1919class TopLevelDeclarationsTest extends PubPackageResolutionTest {
2020 /// Verifies that the located public export for [element] is the library with
2121 /// URI [libraryUri] .
22- Future <void > expectPublicExport (Element element, String libraryUri) async {
22+ Future <void > expectPublicExport (Element2 element, String libraryUri) async {
2323 var publicLibrary =
24- await TopLevelDeclarations (result).publiclyExporting (element);
25- expect (publicLibrary? .source.uri.toString (), libraryUri);
24+ await TopLevelDeclarations (result).publiclyExporting2 (element);
25+ expect (publicLibrary? .firstFragment. source.uri.toString (), libraryUri);
2626 }
2727
2828 test_publiclyExporting_getter () async {
2929 await resolveFileCode ('$testPackageLibPath /src/x.dart' , "var x = 1;" );
3030 newFile ('$testPackageLibPath /x.dart' , "export 'src/x.dart';" );
3131
32- var element = findElement .topGet ('x' );
32+ var element = findElement2 .topGet ('x' );
3333 await expectPublicExport (element, 'package:test/x.dart' );
3434 }
3535
3636 test_publiclyExporting_lib () async {
3737 await resolveFileCode ('$testPackageLibPath /x.dart' , "class X {}" );
3838
39- var element = findElement .class_ ('X' );
39+ var element = findElement2 .class_ ('X' );
4040 await expectPublicExport (element, 'package:test/x.dart' );
4141 }
4242
@@ -50,23 +50,23 @@ class TopLevelDeclarationsTest extends PubPackageResolutionTest {
5050 newFile ('$testPackageLibPath /x2.dart' , "export 'src/x.dart';" );
5151 newFile ('$testPackageLibPath /x3.dart' , "class X {}" );
5252
53- var element = findElement .class_ ('X' );
53+ var element = findElement2 .class_ ('X' );
5454 await expectPublicExport (element, 'package:test/x2.dart' );
5555 }
5656
5757 test_publiclyExporting_setter () async {
5858 await resolveFileCode ('$testPackageLibPath /src/x.dart' , "var x = 1;" );
5959 newFile ('$testPackageLibPath /x.dart' , "export 'src/x.dart';" );
6060
61- var element = findElement .topSet ('x' );
61+ var element = findElement2 .topSet ('x' );
6262 await expectPublicExport (element, 'package:test/x.dart' );
6363 }
6464
6565 test_publiclyExporting_src () async {
6666 await resolveFileCode ('$testPackageLibPath /src/x.dart' , "class X {}" );
6767 newFile ('$testPackageLibPath /x.dart' , "export 'src/x.dart';" );
6868
69- var element = findElement .class_ ('X' );
69+ var element = findElement2 .class_ ('X' );
7070 await expectPublicExport (element, 'package:test/x.dart' );
7171 }
7272}
0 commit comments