Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/analysis_server/test/analysis/notification_outline_test.dart

Issue 1478513002: Use async/await in all analysis domain tests. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analysis_server/test/analysis/notification_occurrences_test.dart ('k') | pkg/analysis_server/test/analysis/notification_overrides_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/test/analysis/notification_outline_test.dart
diff --git a/pkg/analysis_server/test/analysis/notification_outline_test.dart b/pkg/analysis_server/test/analysis/notification_outline_test.dart
index 679baaecd58ce15f1f972383e04c62cdd7b0f8be..1230dbcd0d6e2d44b8a0a4cb96fdf27d439bbb99 100644
--- a/pkg/analysis_server/test/analysis/notification_outline_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_outline_test.dart
@@ -47,24 +47,22 @@ class _AnalysisNotificationOutlineTest extends AbstractAnalysisTest {
createProject();
}
- test_afterAnalysis() {
+ test_afterAnalysis() async {
addTestFile('''
class AAA {
}
class BBB {
}
''');
- return waitForTasksFinished().then((_) {
- expect(outline, isNull);
- return prepareOutline().then((_) {
- Outline unitOutline = outline;
- List<Outline> outlines = unitOutline.children;
- expect(outlines, hasLength(2));
- });
- });
+ await waitForTasksFinished();
+ expect(outline, isNull);
+ await prepareOutline();
+ Outline unitOutline = outline;
+ List<Outline> outlines = unitOutline.children;
+ expect(outlines, hasLength(2));
}
- test_class() {
+ test_class() async {
addTestFile('''
class A<K, V> {
int fa, fb;
@@ -81,218 +79,216 @@ class B {
B(int p);
}");
''');
- return prepareOutline().then((_) {
- Outline unitOutline = outline;
- List<Outline> topOutlines = unitOutline.children;
- expect(topOutlines, hasLength(2));
- // A
- {
- Outline outline_A = topOutlines[0];
- Element element_A = outline_A.element;
- expect(element_A.kind, ElementKind.CLASS);
- expect(element_A.name, "A");
- expect(element_A.typeParameters, "<K, V>");
- {
- Location location = element_A.location;
- expect(location.offset, testCode.indexOf("A<K, V> {"));
- expect(location.length, 1);
- }
- expect(element_A.parameters, null);
- expect(element_A.returnType, null);
- // A children
- List<Outline> outlines_A = outline_A.children;
- expect(outlines_A, hasLength(10));
- {
- Outline outline = outlines_A[0];
- Element element = outline.element;
- expect(element.kind, ElementKind.FIELD);
- expect(element.name, "fa");
- expect(element.parameters, isNull);
- expect(element.returnType, "int");
- }
- {
- Outline outline = outlines_A[1];
- Element element = outline.element;
- expect(element.kind, ElementKind.FIELD);
- expect(element.name, "fb");
- expect(element.parameters, isNull);
- expect(element.returnType, "int");
- }
- {
- Outline outline = outlines_A[2];
- Element element = outline.element;
- expect(element.kind, ElementKind.FIELD);
- expect(element.name, "fc");
- expect(element.parameters, isNull);
- expect(element.returnType, "String");
- }
- {
- Outline outline = outlines_A[3];
- Element element = outline.element;
- expect(element.kind, ElementKind.CONSTRUCTOR);
- expect(element.name, "A");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("A(int i, String s);"));
- expect(location.length, "A".length);
- }
- expect(element.parameters, "(int i, String s)");
- expect(element.returnType, isNull);
- expect(element.isAbstract, isFalse);
- expect(element.isStatic, isFalse);
- }
+ await prepareOutline();
+ Outline unitOutline = outline;
+ List<Outline> topOutlines = unitOutline.children;
+ expect(topOutlines, hasLength(2));
+ // A
+ {
+ Outline outline_A = topOutlines[0];
+ Element element_A = outline_A.element;
+ expect(element_A.kind, ElementKind.CLASS);
+ expect(element_A.name, "A");
+ expect(element_A.typeParameters, "<K, V>");
+ {
+ Location location = element_A.location;
+ expect(location.offset, testCode.indexOf("A<K, V> {"));
+ expect(location.length, 1);
+ }
+ expect(element_A.parameters, null);
+ expect(element_A.returnType, null);
+ // A children
+ List<Outline> outlines_A = outline_A.children;
+ expect(outlines_A, hasLength(10));
+ {
+ Outline outline = outlines_A[0];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FIELD);
+ expect(element.name, "fa");
+ expect(element.parameters, isNull);
+ expect(element.returnType, "int");
+ }
+ {
+ Outline outline = outlines_A[1];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FIELD);
+ expect(element.name, "fb");
+ expect(element.parameters, isNull);
+ expect(element.returnType, "int");
+ }
+ {
+ Outline outline = outlines_A[2];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FIELD);
+ expect(element.name, "fc");
+ expect(element.parameters, isNull);
+ expect(element.returnType, "String");
+ }
+ {
+ Outline outline = outlines_A[3];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.CONSTRUCTOR);
+ expect(element.name, "A");
{
- Outline outline = outlines_A[4];
- Element element = outline.element;
- expect(element.kind, ElementKind.CONSTRUCTOR);
- expect(element.name, "A.name");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("name(num p);"));
- expect(location.length, "name".length);
- }
- expect(element.parameters, "(num p)");
- expect(element.returnType, isNull);
- expect(element.isAbstract, isFalse);
- expect(element.isStatic, isFalse);
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("A(int i, String s);"));
+ expect(location.length, "A".length);
}
+ expect(element.parameters, "(int i, String s)");
+ expect(element.returnType, isNull);
+ expect(element.isAbstract, isFalse);
+ expect(element.isStatic, isFalse);
+ }
+ {
+ Outline outline = outlines_A[4];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.CONSTRUCTOR);
+ expect(element.name, "A.name");
{
- Outline outline = outlines_A[5];
- Element element = outline.element;
- expect(element.kind, ElementKind.CONSTRUCTOR);
- expect(element.name, "A._privateName");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("_privateName(num p);"));
- expect(location.length, "_privateName".length);
- }
- expect(element.parameters, "(num p)");
- expect(element.returnType, isNull);
- expect(element.isAbstract, isFalse);
- expect(element.isStatic, isFalse);
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("name(num p);"));
+ expect(location.length, "name".length);
}
+ expect(element.parameters, "(num p)");
+ expect(element.returnType, isNull);
+ expect(element.isAbstract, isFalse);
+ expect(element.isStatic, isFalse);
+ }
+ {
+ Outline outline = outlines_A[5];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.CONSTRUCTOR);
+ expect(element.name, "A._privateName");
{
- Outline outline = outlines_A[6];
- Element element = outline.element;
- expect(element.kind, ElementKind.METHOD);
- expect(element.name, "ma");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("ma(int pa) => null;"));
- expect(location.length, "ma".length);
- }
- expect(element.parameters, "(int pa)");
- expect(element.returnType, "String");
- expect(element.isAbstract, isFalse);
- expect(element.isStatic, isTrue);
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("_privateName(num p);"));
+ expect(location.length, "_privateName".length);
}
+ expect(element.parameters, "(num p)");
+ expect(element.returnType, isNull);
+ expect(element.isAbstract, isFalse);
+ expect(element.isStatic, isFalse);
+ }
+ {
+ Outline outline = outlines_A[6];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.METHOD);
+ expect(element.name, "ma");
{
- Outline outline = outlines_A[7];
- Element element = outline.element;
- expect(element.kind, ElementKind.METHOD);
- expect(element.name, "_mb");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("_mb(int pb);"));
- expect(location.length, "_mb".length);
- }
- expect(element.parameters, "(int pb)");
- expect(element.returnType, "");
- expect(element.isAbstract, isTrue);
- expect(element.isStatic, isFalse);
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("ma(int pa) => null;"));
+ expect(location.length, "ma".length);
}
+ expect(element.parameters, "(int pa)");
+ expect(element.returnType, "String");
+ expect(element.isAbstract, isFalse);
+ expect(element.isStatic, isTrue);
+ }
+ {
+ Outline outline = outlines_A[7];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.METHOD);
+ expect(element.name, "_mb");
{
- Outline outline = outlines_A[8];
- Element element = outline.element;
- expect(element.kind, ElementKind.GETTER);
- expect(element.name, "propA");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("propA => null;"));
- expect(location.length, "propA".length);
- }
- expect(element.parameters, isNull);
- expect(element.returnType, "String");
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("_mb(int pb);"));
+ expect(location.length, "_mb".length);
}
+ expect(element.parameters, "(int pb)");
+ expect(element.returnType, "");
+ expect(element.isAbstract, isTrue);
+ expect(element.isStatic, isFalse);
+ }
+ {
+ Outline outline = outlines_A[8];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.GETTER);
+ expect(element.name, "propA");
{
- Outline outline = outlines_A[9];
- Element element = outline.element;
- expect(element.kind, ElementKind.SETTER);
- expect(element.name, "propB");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("propB(int v) {}"));
- expect(location.length, "propB".length);
- }
- expect(element.parameters, "(int v)");
- expect(element.returnType, "");
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("propA => null;"));
+ expect(location.length, "propA".length);
}
+ expect(element.parameters, isNull);
+ expect(element.returnType, "String");
}
- // B
{
- Outline outline_B = topOutlines[1];
- Element element_B = outline_B.element;
- expect(element_B.kind, ElementKind.CLASS);
- expect(element_B.name, "B");
- expect(element_B.typeParameters, isNull);
+ Outline outline = outlines_A[9];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.SETTER);
+ expect(element.name, "propB");
{
- Location location = element_B.location;
- expect(location.offset, testCode.indexOf("B {"));
- expect(location.length, 1);
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("propB(int v) {}"));
+ expect(location.length, "propB".length);
}
- expect(element_B.parameters, null);
- expect(element_B.returnType, null);
- // B children
- List<Outline> outlines_B = outline_B.children;
- expect(outlines_B, hasLength(1));
+ expect(element.parameters, "(int v)");
+ expect(element.returnType, "");
+ }
+ }
+ // B
+ {
+ Outline outline_B = topOutlines[1];
+ Element element_B = outline_B.element;
+ expect(element_B.kind, ElementKind.CLASS);
+ expect(element_B.name, "B");
+ expect(element_B.typeParameters, isNull);
+ {
+ Location location = element_B.location;
+ expect(location.offset, testCode.indexOf("B {"));
+ expect(location.length, 1);
+ }
+ expect(element_B.parameters, null);
+ expect(element_B.returnType, null);
+ // B children
+ List<Outline> outlines_B = outline_B.children;
+ expect(outlines_B, hasLength(1));
+ {
+ Outline outline = outlines_B[0];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.CONSTRUCTOR);
+ expect(element.name, "B");
{
- Outline outline = outlines_B[0];
- Element element = outline.element;
- expect(element.kind, ElementKind.CONSTRUCTOR);
- expect(element.name, "B");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("B(int p);"));
- expect(location.length, "B".length);
- }
- expect(element.parameters, "(int p)");
- expect(element.returnType, isNull);
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("B(int p);"));
+ expect(location.length, "B".length);
}
+ expect(element.parameters, "(int p)");
+ expect(element.returnType, isNull);
}
- });
+ }
}
- test_enum() {
+ test_enum() async {
addTestFile('''
enum MyEnum {
A, B, C
}
''');
- return prepareOutline().then((_) {
- Outline unitOutline = outline;
- List<Outline> topOutlines = unitOutline.children;
- expect(topOutlines, hasLength(1));
- // MyEnum
- {
- Outline outline_MyEnum = topOutlines[0];
- Element element_MyEnum = outline_MyEnum.element;
- expect(element_MyEnum.kind, ElementKind.ENUM);
- expect(element_MyEnum.name, "MyEnum");
- {
- Location location = element_MyEnum.location;
- expect(location.offset, testCode.indexOf("MyEnum {"));
- expect(location.length, 'MyEnum'.length);
- }
- expect(element_MyEnum.parameters, null);
- expect(element_MyEnum.returnType, null);
- // MyEnum children
- List<Outline> outlines_MyEnum = outline_MyEnum.children;
- expect(outlines_MyEnum, hasLength(3));
- _isEnumConstant(outlines_MyEnum[0], 'A');
- _isEnumConstant(outlines_MyEnum[1], 'B');
- _isEnumConstant(outlines_MyEnum[2], 'C');
- }
- });
+ await prepareOutline();
+ Outline unitOutline = outline;
+ List<Outline> topOutlines = unitOutline.children;
+ expect(topOutlines, hasLength(1));
+ // MyEnum
+ {
+ Outline outline_MyEnum = topOutlines[0];
+ Element element_MyEnum = outline_MyEnum.element;
+ expect(element_MyEnum.kind, ElementKind.ENUM);
+ expect(element_MyEnum.name, "MyEnum");
+ {
+ Location location = element_MyEnum.location;
+ expect(location.offset, testCode.indexOf("MyEnum {"));
+ expect(location.length, 'MyEnum'.length);
+ }
+ expect(element_MyEnum.parameters, null);
+ expect(element_MyEnum.returnType, null);
+ // MyEnum children
+ List<Outline> outlines_MyEnum = outline_MyEnum.children;
+ expect(outlines_MyEnum, hasLength(3));
+ _isEnumConstant(outlines_MyEnum[0], 'A');
+ _isEnumConstant(outlines_MyEnum[1], 'B');
+ _isEnumConstant(outlines_MyEnum[2], 'C');
+ }
}
/**
@@ -300,7 +296,7 @@ enum MyEnum {
*
* https://code.google.com/p/dart/issues/detail?id=21373
*/
- test_invalidGetterInConstructor() {
+ test_invalidGetterInConstructor() async {
addTestFile('''
class A {
A() {
@@ -310,9 +306,8 @@ class A {
}
}
''');
- return prepareOutline().then((_) {
- expect(outline, isNotNull);
- });
+ await prepareOutline();
+ expect(outline, isNotNull);
}
test_libraryName_hasLibraryDirective() async {
@@ -352,7 +347,7 @@ class A {}
expect(libraryName, isNull);
}
- test_localFunctions() {
+ test_localFunctions() async {
addTestFile('''
class A {
A() {
@@ -369,254 +364,251 @@ f() {
}
}
''');
- return prepareOutline().then((_) {
- Outline unitOutline = outline;
- List<Outline> topOutlines = unitOutline.children;
- expect(topOutlines, hasLength(2));
- // A
- {
- Outline outline_A = topOutlines[0];
- Element element_A = outline_A.element;
- expect(element_A.kind, ElementKind.CLASS);
- expect(element_A.name, "A");
+ await prepareOutline();
+ Outline unitOutline = outline;
+ List<Outline> topOutlines = unitOutline.children;
+ expect(topOutlines, hasLength(2));
+ // A
+ {
+ Outline outline_A = topOutlines[0];
+ Element element_A = outline_A.element;
+ expect(element_A.kind, ElementKind.CLASS);
+ expect(element_A.name, "A");
+ {
+ Location location = element_A.location;
+ expect(location.offset, testCode.indexOf("A {"));
+ expect(location.length, "A".length);
+ }
+ expect(element_A.parameters, null);
+ expect(element_A.returnType, null);
+ // A children
+ List<Outline> outlines_A = outline_A.children;
+ expect(outlines_A, hasLength(2));
+ {
+ Outline constructorOutline = outlines_A[0];
+ Element constructorElement = constructorOutline.element;
+ expect(constructorElement.kind, ElementKind.CONSTRUCTOR);
+ expect(constructorElement.name, "A");
{
- Location location = element_A.location;
- expect(location.offset, testCode.indexOf("A {"));
+ Location location = constructorElement.location;
+ expect(location.offset, testCode.indexOf("A() {"));
expect(location.length, "A".length);
}
- expect(element_A.parameters, null);
- expect(element_A.returnType, null);
- // A children
- List<Outline> outlines_A = outline_A.children;
- expect(outlines_A, hasLength(2));
+ expect(constructorElement.parameters, "()");
+ expect(constructorElement.returnType, isNull);
+ // local function
+ List<Outline> outlines_constructor = constructorOutline.children;
+ expect(outlines_constructor, hasLength(1));
{
- Outline constructorOutline = outlines_A[0];
- Element constructorElement = constructorOutline.element;
- expect(constructorElement.kind, ElementKind.CONSTRUCTOR);
- expect(constructorElement.name, "A");
- {
- Location location = constructorElement.location;
- expect(location.offset, testCode.indexOf("A() {"));
- expect(location.length, "A".length);
- }
- expect(constructorElement.parameters, "()");
- expect(constructorElement.returnType, isNull);
- // local function
- List<Outline> outlines_constructor = constructorOutline.children;
- expect(outlines_constructor, hasLength(1));
+ Outline outline = outlines_constructor[0];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FUNCTION);
+ expect(element.name, "local_A");
{
- Outline outline = outlines_constructor[0];
- Element element = outline.element;
- expect(element.kind, ElementKind.FUNCTION);
- expect(element.name, "local_A");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("local_A() {}"));
- expect(location.length, "local_A".length);
- }
- expect(element.parameters, "()");
- expect(element.returnType, "int");
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("local_A() {}"));
+ expect(location.length, "local_A".length);
}
+ expect(element.parameters, "()");
+ expect(element.returnType, "int");
}
- {
- Outline outline_m = outlines_A[1];
- Element element_m = outline_m.element;
- expect(element_m.kind, ElementKind.METHOD);
- expect(element_m.name, "m");
- {
- Location location = element_m.location;
- expect(location.offset, testCode.indexOf("m() {"));
- expect(location.length, "m".length);
- }
- expect(element_m.parameters, "()");
- expect(element_m.returnType, "");
- // local function
- List<Outline> methodChildren = outline_m.children;
- expect(methodChildren, hasLength(1));
+ }
+ {
+ Outline outline_m = outlines_A[1];
+ Element element_m = outline_m.element;
+ expect(element_m.kind, ElementKind.METHOD);
+ expect(element_m.name, "m");
+ {
+ Location location = element_m.location;
+ expect(location.offset, testCode.indexOf("m() {"));
+ expect(location.length, "m".length);
+ }
+ expect(element_m.parameters, "()");
+ expect(element_m.returnType, "");
+ // local function
+ List<Outline> methodChildren = outline_m.children;
+ expect(methodChildren, hasLength(1));
+ {
+ Outline outline = methodChildren[0];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FUNCTION);
+ expect(element.name, "local_m");
{
- Outline outline = methodChildren[0];
- Element element = outline.element;
- expect(element.kind, ElementKind.FUNCTION);
- expect(element.name, "local_m");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("local_m() {}"));
- expect(location.length, "local_m".length);
- }
- expect(element.parameters, "()");
- expect(element.returnType, "");
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("local_m() {}"));
+ expect(location.length, "local_m".length);
}
+ expect(element.parameters, "()");
+ expect(element.returnType, "");
}
}
- // f()
+ }
+ // f()
+ {
+ Outline outline_f = topOutlines[1];
+ Element element_f = outline_f.element;
+ expect(element_f.kind, ElementKind.FUNCTION);
+ expect(element_f.name, "f");
+ {
+ Location location = element_f.location;
+ expect(location.offset, testCode.indexOf("f() {"));
+ expect(location.length, "f".length);
+ }
+ expect(element_f.parameters, "()");
+ expect(element_f.returnType, "");
+ // f() children
+ List<Outline> outlines_f = outline_f.children;
+ expect(outlines_f, hasLength(2));
{
- Outline outline_f = topOutlines[1];
- Element element_f = outline_f.element;
- expect(element_f.kind, ElementKind.FUNCTION);
- expect(element_f.name, "f");
+ Outline outline_f1 = outlines_f[0];
+ Element element_f1 = outline_f1.element;
+ expect(element_f1.kind, ElementKind.FUNCTION);
+ expect(element_f1.name, "local_f1");
{
- Location location = element_f.location;
- expect(location.offset, testCode.indexOf("f() {"));
- expect(location.length, "f".length);
+ Location location = element_f1.location;
+ expect(location.offset, testCode.indexOf("local_f1(int i) {}"));
+ expect(location.length, "local_f1".length);
}
- expect(element_f.parameters, "()");
- expect(element_f.returnType, "");
- // f() children
- List<Outline> outlines_f = outline_f.children;
- expect(outlines_f, hasLength(2));
- {
- Outline outline_f1 = outlines_f[0];
- Element element_f1 = outline_f1.element;
- expect(element_f1.kind, ElementKind.FUNCTION);
- expect(element_f1.name, "local_f1");
- {
- Location location = element_f1.location;
- expect(location.offset, testCode.indexOf("local_f1(int i) {}"));
- expect(location.length, "local_f1".length);
- }
- expect(element_f1.parameters, "(int i)");
- expect(element_f1.returnType, "");
- }
- {
- Outline outline_f2 = outlines_f[1];
- Element element_f2 = outline_f2.element;
- expect(element_f2.kind, ElementKind.FUNCTION);
- expect(element_f2.name, "local_f2");
- {
- Location location = element_f2.location;
- expect(location.offset, testCode.indexOf("local_f2(String s) {"));
- expect(location.length, "local_f2".length);
- }
- expect(element_f2.parameters, "(String s)");
- expect(element_f2.returnType, "");
- // local_f2() local function
- List<Outline> outlines_f2 = outline_f2.children;
- expect(outlines_f2, hasLength(1));
+ expect(element_f1.parameters, "(int i)");
+ expect(element_f1.returnType, "");
+ }
+ {
+ Outline outline_f2 = outlines_f[1];
+ Element element_f2 = outline_f2.element;
+ expect(element_f2.kind, ElementKind.FUNCTION);
+ expect(element_f2.name, "local_f2");
+ {
+ Location location = element_f2.location;
+ expect(location.offset, testCode.indexOf("local_f2(String s) {"));
+ expect(location.length, "local_f2".length);
+ }
+ expect(element_f2.parameters, "(String s)");
+ expect(element_f2.returnType, "");
+ // local_f2() local function
+ List<Outline> outlines_f2 = outline_f2.children;
+ expect(outlines_f2, hasLength(1));
+ {
+ Outline outline_f21 = outlines_f2[0];
+ Element element_f21 = outline_f21.element;
+ expect(element_f21.kind, ElementKind.FUNCTION);
+ expect(element_f21.name, "local_f21");
{
- Outline outline_f21 = outlines_f2[0];
- Element element_f21 = outline_f21.element;
- expect(element_f21.kind, ElementKind.FUNCTION);
- expect(element_f21.name, "local_f21");
- {
- Location location = element_f21.location;
- expect(location.offset, testCode.indexOf("local_f21(int p) {"));
- expect(location.length, "local_f21".length);
- }
- expect(element_f21.parameters, "(int p)");
- expect(element_f21.returnType, "");
+ Location location = element_f21.location;
+ expect(location.offset, testCode.indexOf("local_f21(int p) {"));
+ expect(location.length, "local_f21".length);
}
+ expect(element_f21.parameters, "(int p)");
+ expect(element_f21.returnType, "");
}
}
- });
+ }
}
- test_sourceRange_inClass() {
+ test_sourceRange_inClass() async {
addTestFile('''
class A { // leftA
int methodA() {} // endA
int methodB() {} // endB
}
''');
- return prepareOutline().then((_) {
- Outline unitOutline = outline;
- List<Outline> outlines = unitOutline.children[0].children;
- expect(outlines, hasLength(2));
- // methodA
+ await prepareOutline();
+ Outline unitOutline = outline;
+ List<Outline> outlines = unitOutline.children[0].children;
+ expect(outlines, hasLength(2));
+ // methodA
+ {
+ Outline outline = outlines[0];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.METHOD);
+ expect(element.name, "methodA");
{
- Outline outline = outlines[0];
- Element element = outline.element;
- expect(element.kind, ElementKind.METHOD);
- expect(element.name, "methodA");
- {
- int offset = testCode.indexOf(" // leftA");
- int end = testCode.indexOf(" // endA");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(" // leftA");
+ int end = testCode.indexOf(" // endA");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- // methodB
+ }
+ // methodB
+ {
+ Outline outline = outlines[1];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.METHOD);
+ expect(element.name, "methodB");
{
- Outline outline = outlines[1];
- Element element = outline.element;
- expect(element.kind, ElementKind.METHOD);
- expect(element.name, "methodB");
- {
- int offset = testCode.indexOf(" // endA");
- int end = testCode.indexOf(" // endB");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(" // endA");
+ int end = testCode.indexOf(" // endB");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- });
+ }
}
- test_sourceRange_inClass_inVariableList() {
+ test_sourceRange_inClass_inVariableList() async {
addTestFile('''
class A { // leftA
int fieldA, fieldB, fieldC; // marker
int fieldD; // marker2
}
''');
- return prepareOutline().then((_) {
- Outline unitOutline = outline;
- List<Outline> outlines = unitOutline.children[0].children;
- expect(outlines, hasLength(4));
- // fieldA
+ await prepareOutline();
+ Outline unitOutline = outline;
+ List<Outline> outlines = unitOutline.children[0].children;
+ expect(outlines, hasLength(4));
+ // fieldA
+ {
+ Outline outline = outlines[0];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FIELD);
+ expect(element.name, "fieldA");
{
- Outline outline = outlines[0];
- Element element = outline.element;
- expect(element.kind, ElementKind.FIELD);
- expect(element.name, "fieldA");
- {
- int offset = testCode.indexOf(" // leftA");
- int end = testCode.indexOf(", fieldB");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(" // leftA");
+ int end = testCode.indexOf(", fieldB");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- // fieldB
+ }
+ // fieldB
+ {
+ Outline outline = outlines[1];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FIELD);
+ expect(element.name, "fieldB");
{
- Outline outline = outlines[1];
- Element element = outline.element;
- expect(element.kind, ElementKind.FIELD);
- expect(element.name, "fieldB");
- {
- int offset = testCode.indexOf(", fieldB");
- int end = testCode.indexOf(", fieldC");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(", fieldB");
+ int end = testCode.indexOf(", fieldC");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- // fieldC
+ }
+ // fieldC
+ {
+ Outline outline = outlines[2];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FIELD);
+ expect(element.name, "fieldC");
{
- Outline outline = outlines[2];
- Element element = outline.element;
- expect(element.kind, ElementKind.FIELD);
- expect(element.name, "fieldC");
- {
- int offset = testCode.indexOf(", fieldC");
- int end = testCode.indexOf(" // marker");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(", fieldC");
+ int end = testCode.indexOf(" // marker");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- // fieldD
+ }
+ // fieldD
+ {
+ Outline outline = outlines[3];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FIELD);
+ expect(element.name, "fieldD");
{
- Outline outline = outlines[3];
- Element element = outline.element;
- expect(element.kind, ElementKind.FIELD);
- expect(element.name, "fieldD");
- {
- int offset = testCode.indexOf(" // marker");
- int end = testCode.indexOf(" // marker2");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(" // marker");
+ int end = testCode.indexOf(" // marker2");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- });
+ }
}
- test_sourceRange_inUnit() {
+ test_sourceRange_inUnit() async {
addTestFile('''
library lib;
/// My first class.
@@ -625,104 +617,102 @@ class A {
class B {
} // endB
''');
- return prepareOutline().then((_) {
- Outline unitOutline = outline;
- List<Outline> topOutlines = unitOutline.children;
- expect(topOutlines, hasLength(2));
- // A
+ await prepareOutline();
+ Outline unitOutline = outline;
+ List<Outline> topOutlines = unitOutline.children;
+ expect(topOutlines, hasLength(2));
+ // A
+ {
+ Outline outline = topOutlines[0];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.CLASS);
+ expect(element.name, "A");
{
- Outline outline = topOutlines[0];
- Element element = outline.element;
- expect(element.kind, ElementKind.CLASS);
- expect(element.name, "A");
- {
- int offset = testCode.indexOf("/// My first class.");
- int end = testCode.indexOf(" // endA");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf("/// My first class.");
+ int end = testCode.indexOf(" // endA");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- // B
+ }
+ // B
+ {
+ Outline outline = topOutlines[1];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.CLASS);
+ expect(element.name, "B");
{
- Outline outline = topOutlines[1];
- Element element = outline.element;
- expect(element.kind, ElementKind.CLASS);
- expect(element.name, "B");
- {
- int offset = testCode.indexOf(" // endA");
- int end = testCode.indexOf(" // endB");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(" // endA");
+ int end = testCode.indexOf(" // endB");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- });
+ }
}
- test_sourceRange_inUnit_inVariableList() {
+ test_sourceRange_inUnit_inVariableList() async {
addTestFile('''
int fieldA, fieldB, fieldC; // marker
int fieldD; // marker2
''');
- return prepareOutline().then((_) {
- Outline unitOutline = outline;
- List<Outline> outlines = unitOutline.children;
- expect(outlines, hasLength(4));
- // fieldA
+ await prepareOutline();
+ Outline unitOutline = outline;
+ List<Outline> outlines = unitOutline.children;
+ expect(outlines, hasLength(4));
+ // fieldA
+ {
+ Outline outline = outlines[0];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.TOP_LEVEL_VARIABLE);
+ expect(element.name, "fieldA");
{
- Outline outline = outlines[0];
- Element element = outline.element;
- expect(element.kind, ElementKind.TOP_LEVEL_VARIABLE);
- expect(element.name, "fieldA");
- {
- int offset = 0;
- int end = testCode.indexOf(", fieldB");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = 0;
+ int end = testCode.indexOf(", fieldB");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- // fieldB
+ }
+ // fieldB
+ {
+ Outline outline = outlines[1];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.TOP_LEVEL_VARIABLE);
+ expect(element.name, "fieldB");
{
- Outline outline = outlines[1];
- Element element = outline.element;
- expect(element.kind, ElementKind.TOP_LEVEL_VARIABLE);
- expect(element.name, "fieldB");
- {
- int offset = testCode.indexOf(", fieldB");
- int end = testCode.indexOf(", fieldC");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(", fieldB");
+ int end = testCode.indexOf(", fieldC");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- // fieldC
+ }
+ // fieldC
+ {
+ Outline outline = outlines[2];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.TOP_LEVEL_VARIABLE);
+ expect(element.name, "fieldC");
{
- Outline outline = outlines[2];
- Element element = outline.element;
- expect(element.kind, ElementKind.TOP_LEVEL_VARIABLE);
- expect(element.name, "fieldC");
- {
- int offset = testCode.indexOf(", fieldC");
- int end = testCode.indexOf(" // marker");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(", fieldC");
+ int end = testCode.indexOf(" // marker");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- // fieldD
+ }
+ // fieldD
+ {
+ Outline outline = outlines[3];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.TOP_LEVEL_VARIABLE);
+ expect(element.name, "fieldD");
{
- Outline outline = outlines[3];
- Element element = outline.element;
- expect(element.kind, ElementKind.TOP_LEVEL_VARIABLE);
- expect(element.name, "fieldD");
- {
- int offset = testCode.indexOf(" // marker");
- int end = testCode.indexOf(" // marker2");
- expect(outline.offset, offset);
- expect(outline.length, end - offset);
- }
+ int offset = testCode.indexOf(" // marker");
+ int end = testCode.indexOf(" // marker2");
+ expect(outline.offset, offset);
+ expect(outline.length, end - offset);
}
- });
+ }
}
- test_topLevel() {
+ test_topLevel() async {
addTestFile('''
typedef String FTA<K, V>(int i, String s);
typedef FTB(int p);
@@ -735,121 +725,120 @@ fB(int p) => null;
String get propA => null;
set propB(int v) {}
''');
- return prepareOutline().then((_) {
- Outline unitOutline = outline;
- List<Outline> topOutlines = unitOutline.children;
- expect(topOutlines, hasLength(10));
- // FTA
+ await prepareOutline();
+ Outline unitOutline = outline;
+ List<Outline> topOutlines = unitOutline.children;
+ expect(topOutlines, hasLength(10));
+ // FTA
+ {
+ Outline outline = topOutlines[0];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
+ expect(element.name, "FTA");
+ expect(element.typeParameters, "<K, V>");
{
- Outline outline = topOutlines[0];
- Element element = outline.element;
- expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
- expect(element.name, "FTA");
- expect(element.typeParameters, "<K, V>");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("FTA<K, V>("));
- expect(location.length, "FTA".length);
- }
- expect(element.parameters, "(int i, String s)");
- expect(element.returnType, "String");
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("FTA<K, V>("));
+ expect(location.length, "FTA".length);
}
- // FTB
+ expect(element.parameters, "(int i, String s)");
+ expect(element.returnType, "String");
+ }
+ // FTB
+ {
+ Outline outline = topOutlines[1];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
+ expect(element.name, "FTB");
+ expect(element.typeParameters, isNull);
{
- Outline outline = topOutlines[1];
- Element element = outline.element;
- expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
- expect(element.name, "FTB");
- expect(element.typeParameters, isNull);
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("FTB("));
- expect(location.length, "FTB".length);
- }
- expect(element.parameters, "(int p)");
- expect(element.returnType, "");
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("FTB("));
+ expect(location.length, "FTB".length);
}
- // CTA
+ expect(element.parameters, "(int p)");
+ expect(element.returnType, "");
+ }
+ // CTA
+ {
+ Outline outline = topOutlines[4];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.CLASS_TYPE_ALIAS);
+ expect(element.name, "CTA");
+ expect(element.typeParameters, '<T>');
{
- Outline outline = topOutlines[4];
- Element element = outline.element;
- expect(element.kind, ElementKind.CLASS_TYPE_ALIAS);
- expect(element.name, "CTA");
- expect(element.typeParameters, '<T>');
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("CTA<T> ="));
- expect(location.length, "CTA".length);
- }
- expect(element.parameters, isNull);
- expect(element.returnType, isNull);
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("CTA<T> ="));
+ expect(location.length, "CTA".length);
}
- // CTB
+ expect(element.parameters, isNull);
+ expect(element.returnType, isNull);
+ }
+ // CTB
+ {
+ Outline outline = topOutlines[5];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.CLASS_TYPE_ALIAS);
+ expect(element.name, 'CTB');
+ expect(element.typeParameters, isNull);
+ expect(element.returnType, isNull);
+ }
+ // fA
+ {
+ Outline outline = topOutlines[6];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FUNCTION);
+ expect(element.name, "fA");
{
- Outline outline = topOutlines[5];
- Element element = outline.element;
- expect(element.kind, ElementKind.CLASS_TYPE_ALIAS);
- expect(element.name, 'CTB');
- expect(element.typeParameters, isNull);
- expect(element.returnType, isNull);
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("fA("));
+ expect(location.length, "fA".length);
}
- // fA
- {
- Outline outline = topOutlines[6];
- Element element = outline.element;
- expect(element.kind, ElementKind.FUNCTION);
- expect(element.name, "fA");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("fA("));
- expect(location.length, "fA".length);
- }
- expect(element.parameters, "(int i, String s)");
- expect(element.returnType, "String");
- }
- // fB
+ expect(element.parameters, "(int i, String s)");
+ expect(element.returnType, "String");
+ }
+ // fB
+ {
+ Outline outline = topOutlines[7];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.FUNCTION);
+ expect(element.name, "fB");
{
- Outline outline = topOutlines[7];
- Element element = outline.element;
- expect(element.kind, ElementKind.FUNCTION);
- expect(element.name, "fB");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("fB("));
- expect(location.length, "fB".length);
- }
- expect(element.parameters, "(int p)");
- expect(element.returnType, "");
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("fB("));
+ expect(location.length, "fB".length);
}
- // propA
+ expect(element.parameters, "(int p)");
+ expect(element.returnType, "");
+ }
+ // propA
+ {
+ Outline outline = topOutlines[8];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.GETTER);
+ expect(element.name, "propA");
{
- Outline outline = topOutlines[8];
- Element element = outline.element;
- expect(element.kind, ElementKind.GETTER);
- expect(element.name, "propA");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("propA => null;"));
- expect(location.length, "propA".length);
- }
- expect(element.parameters, "");
- expect(element.returnType, "String");
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("propA => null;"));
+ expect(location.length, "propA".length);
}
- // propB
+ expect(element.parameters, "");
+ expect(element.returnType, "String");
+ }
+ // propB
+ {
+ Outline outline = topOutlines[9];
+ Element element = outline.element;
+ expect(element.kind, ElementKind.SETTER);
+ expect(element.name, "propB");
{
- Outline outline = topOutlines[9];
- Element element = outline.element;
- expect(element.kind, ElementKind.SETTER);
- expect(element.name, "propB");
- {
- Location location = element.location;
- expect(location.offset, testCode.indexOf("propB(int v) {}"));
- expect(location.length, "propB".length);
- }
- expect(element.parameters, "(int v)");
- expect(element.returnType, "");
+ Location location = element.location;
+ expect(location.offset, testCode.indexOf("propB(int v) {}"));
+ expect(location.length, "propB".length);
}
- });
+ expect(element.parameters, "(int v)");
+ expect(element.returnType, "");
+ }
}
void _isEnumConstant(Outline outline, String name) {
« no previous file with comments | « pkg/analysis_server/test/analysis/notification_occurrences_test.dart ('k') | pkg/analysis_server/test/analysis/notification_overrides_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698