Skip to content

Commit af6b3f4

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate TopLevelVariableElementTest.
Change-Id: I32ef2ffc73a84e9d5e530d0b0e898f71ae52265b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406202 Reviewed-by: Phil Quitslund <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 6e3c85a commit af6b3f4

File tree

1 file changed

+4
-30
lines changed

1 file changed

+4
-30
lines changed

pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
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-
// ignore_for_file: analyzer_use_new_elements
6-
7-
import 'package:analyzer/dart/element/element.dart';
85
import 'package:analyzer/dart/element/type.dart';
96
import 'package:analyzer/src/dart/element/element.dart';
107
import 'package:test/test.dart';
@@ -2004,19 +2001,13 @@ library
20042001

20052002
// We intentionally don't check the text, because we want to test
20062003
// requesting individual elements, not all accessors/variables at once.
2007-
var getter = _elementOfDefiningUnit(library, ['@getter', 'x'])
2008-
as PropertyAccessorElementImpl;
2009-
var variable = getter.variable2 as TopLevelVariableElementImpl;
2004+
var getter = library.getters.single;
2005+
var variable = getter.variable3 as TopLevelVariableElementImpl2;
20102006
expect(variable, isNotNull);
20112007
expect(variable.isFinal, isFalse);
2012-
expect(variable.getter, same(getter));
2008+
expect(variable.getter2, same(getter));
20132009
_assertTypeStr(variable.type, 'int');
2014-
expect(
2015-
variable,
2016-
same(
2017-
_elementOfDefiningUnit(library, ['@topLevelVariable', 'x']),
2018-
),
2019-
);
2010+
expect(variable, same(library.topLevelVariables.single));
20202011
}
20212012

20222013
test_variable_implicit_type() async {
@@ -3638,23 +3629,6 @@ library
36383629
var typeStr = type.getDisplayString();
36393630
expect(typeStr, expected);
36403631
}
3641-
3642-
// TODO(scheglov): This is duplicate.
3643-
Element _elementOfDefiningUnit(
3644-
LibraryElementImpl library, List<String> names) {
3645-
var reference = library.definingCompilationUnit.reference!;
3646-
for (var name in names) {
3647-
reference = reference.getChild(name);
3648-
}
3649-
3650-
var element = reference.element;
3651-
if (element != null) {
3652-
return element;
3653-
}
3654-
3655-
var elementFactory = library.linkedData!.elementFactory;
3656-
return elementFactory.elementOfReference(reference)!;
3657-
}
36583632
}
36593633

36603634
abstract class TopLevelVariableElementTest_augmentation

0 commit comments

Comments
 (0)