Skip to content

Commit d5b973c

Browse files
pqCommit Queue
authored andcommitted
[element model] migrate top_level_declarations_test
Change-Id: I6410ee8a344d303a1ddca0cb6e8eb133af469a64 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401961 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
1 parent ce8a8b2 commit d5b973c

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

pkg/analyzer/analyzer_use_new_elements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ test/src/dart/resolution/prefix_element_test.dart
198198
test/src/dart/resolution/resolution.dart
199199
test/src/dart/resolution/scope_test.dart
200200
test/src/dart/resolution/super_formal_parameter_test.dart
201-
test/src/services/top_level_declarations_test.dart
202201
test/src/summary/element_text.dart
203202
test/src/summary/elements/class_test.dart
204203
test/src/summary/elements/enum_test.dart

pkg/analyzer/test/src/services/top_level_declarations_test.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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';
66
import 'package:analyzer/src/services/top_level_declarations.dart';
77
import 'package:test/test.dart';
88
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -19,24 +19,24 @@ main() {
1919
class 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

Comments
 (0)