commit d5b973c32c03dad9188f4598ebe41a8b9c70cf92
author pq <pquitslund@google.com> Fri Dec 20 07:57:29 2024 -0800
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Dec 20 07:57:29 2024 -0800
tree eff53be9a7d5bf9d9a72fff43e8871069fd1618d
parent ce8a8b29b62c5ad3b6bee27d8aee10ff7ca89023

[element model] migrate `top_level_declarations_test`

Change-Id: I6410ee8a344d303a1ddca0cb6e8eb133af469a64
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401961
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>

pkg/analyzer/analyzer_use_new_elements.txt

diff --git a/pkg/analyzer/analyzer_use_new_elements.txt b/pkg/analyzer/analyzer_use_new_elements.txt
index 2b7e325..3687a5b 100644
--- a/pkg/analyzer/analyzer_use_new_elements.txt
+++ b/pkg/analyzer/analyzer_use_new_elements.txt
@@ -198,7 +198,6 @@
 test/src/dart/resolution/resolution.dart
 test/src/dart/resolution/scope_test.dart
 test/src/dart/resolution/super_formal_parameter_test.dart
-test/src/services/top_level_declarations_test.dart
 test/src/summary/element_text.dart
 test/src/summary/elements/class_test.dart
 test/src/summary/elements/enum_test.dart

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

diff --git a/pkg/analyzer/test/src/services/top_level_declarations_test.dart b/pkg/analyzer/test/src/services/top_level_declarations_test.dart
index e40fde8..9a4120c 100644
--- a/pkg/analyzer/test/src/services/top_level_declarations_test.dart
+++ b/pkg/analyzer/test/src/services/top_level_declarations_test.dart
@@ -2,7 +2,7 @@
 // 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.
 
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/services/top_level_declarations.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -19,24 +19,24 @@
 class TopLevelDeclarationsTest extends PubPackageResolutionTest {
   /// Verifies that the located public export for [element] is the library with
   /// URI [libraryUri].
-  Future<void> expectPublicExport(Element element, String libraryUri) async {
+  Future<void> expectPublicExport(Element2 element, String libraryUri) async {
     var publicLibrary =
-        await TopLevelDeclarations(result).publiclyExporting(element);
-    expect(publicLibrary?.source.uri.toString(), libraryUri);
+        await TopLevelDeclarations(result).publiclyExporting2(element);
+    expect(publicLibrary?.firstFragment.source.uri.toString(), libraryUri);
   }
 
   test_publiclyExporting_getter() async {
     await resolveFileCode('$testPackageLibPath/src/x.dart', "var x = 1;");
     newFile('$testPackageLibPath/x.dart', "export 'src/x.dart';");
 
-    var element = findElement.topGet('x');
+    var element = findElement2.topGet('x');
     await expectPublicExport(element, 'package:test/x.dart');
   }
 
   test_publiclyExporting_lib() async {
     await resolveFileCode('$testPackageLibPath/x.dart', "class X {}");
 
-    var element = findElement.class_('X');
+    var element = findElement2.class_('X');
     await expectPublicExport(element, 'package:test/x.dart');
   }
 
@@ -50,7 +50,7 @@
     newFile('$testPackageLibPath/x2.dart', "export 'src/x.dart';");
     newFile('$testPackageLibPath/x3.dart', "class X {}");
 
-    var element = findElement.class_('X');
+    var element = findElement2.class_('X');
     await expectPublicExport(element, 'package:test/x2.dart');
   }
 
@@ -58,7 +58,7 @@
     await resolveFileCode('$testPackageLibPath/src/x.dart', "var x = 1;");
     newFile('$testPackageLibPath/x.dart', "export 'src/x.dart';");
 
-    var element = findElement.topSet('x');
+    var element = findElement2.topSet('x');
     await expectPublicExport(element, 'package:test/x.dart');
   }
 
@@ -66,7 +66,7 @@
     await resolveFileCode('$testPackageLibPath/src/x.dart', "class X {}");
     newFile('$testPackageLibPath/x.dart', "export 'src/x.dart';");
 
-    var element = findElement.class_('X');
+    var element = findElement2.class_('X');
     await expectPublicExport(element, 'package:test/x.dart');
   }
 }