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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/analysis_server/test/analysis/get_hover_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 | « no previous file | pkg/analysis_server/test/analysis/notification_analyzedFiles_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/get_hover_test.dart
diff --git a/pkg/analysis_server/test/analysis/get_hover_test.dart b/pkg/analysis_server/test/analysis/get_hover_test.dart
index 34db5105a935029480b2ade347672047697aeb98..8e876fee42fbe1ae0c33e1a9ac5803842986c716 100644
--- a/pkg/analysis_server/test/analysis/get_hover_test.dart
+++ b/pkg/analysis_server/test/analysis/get_hover_test.dart
@@ -42,7 +42,7 @@ class AnalysisHoverTest extends AbstractAnalysisTest {
createProject();
}
- test_dartdoc_clunky() {
+ test_dartdoc_clunky() async {
addTestFile('''
library my.library;
/**
@@ -52,12 +52,11 @@ library my.library;
main() {
}
''');
- return prepareHover('main() {').then((HoverInformation hover) {
- expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
- });
+ HoverInformation hover = await prepareHover('main() {');
+ expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
}
- test_dartdoc_elegant() {
+ test_dartdoc_elegant() async {
addTestFile('''
library my.library;
/// doc aaa
@@ -65,12 +64,11 @@ library my.library;
main() {
}
''');
- return prepareHover('main() {').then((HoverInformation hover) {
- expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
- });
+ HoverInformation hover = await prepareHover('main() {');
+ expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
}
- test_expression_function() {
+ test_expression_function() async {
addTestFile('''
library my.library;
/// doc aaa
@@ -78,43 +76,41 @@ library my.library;
List<String> fff(int a, String b) {
}
''');
- return prepareHover('fff(int a').then((HoverInformation hover) {
- // element
- expect(hover.containingLibraryName, 'my.library');
- expect(hover.containingLibraryPath, testFile);
- expect(hover.containingClassDescription, isNull);
- expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
- expect(hover.elementDescription, 'fff(int a, String b) → List<String>');
- expect(hover.elementKind, 'function');
- // types
- expect(hover.staticType, '(int, String) → List<String>');
- expect(hover.propagatedType, isNull);
- // no parameter
- expect(hover.parameter, isNull);
- });
+ HoverInformation hover = await prepareHover('fff(int a');
+ // element
+ expect(hover.containingLibraryName, 'my.library');
+ expect(hover.containingLibraryPath, testFile);
+ expect(hover.containingClassDescription, isNull);
+ expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
+ expect(hover.elementDescription, 'fff(int a, String b) → List<String>');
+ expect(hover.elementKind, 'function');
+ // types
+ expect(hover.staticType, '(int, String) → List<String>');
+ expect(hover.propagatedType, isNull);
+ // no parameter
+ expect(hover.parameter, isNull);
}
- test_expression_literal_noElement() {
+ test_expression_literal_noElement() async {
addTestFile('''
main() {
foo(123);
}
foo(Object myParameter) {}
''');
- return prepareHover('123').then((HoverInformation hover) {
- // literal, no Element
- expect(hover.containingClassDescription, isNull);
- expect(hover.elementDescription, isNull);
- expect(hover.elementKind, isNull);
- // types
- expect(hover.staticType, 'int');
- expect(hover.propagatedType, isNull);
- // parameter
- expect(hover.parameter, 'Object myParameter');
- });
+ HoverInformation hover = await prepareHover('123');
+ // literal, no Element
+ expect(hover.containingClassDescription, isNull);
+ expect(hover.elementDescription, isNull);
+ expect(hover.elementKind, isNull);
+ // types
+ expect(hover.staticType, 'int');
+ expect(hover.propagatedType, isNull);
+ // parameter
+ expect(hover.parameter, 'Object myParameter');
}
- test_expression_method() {
+ test_expression_method() async {
addTestFile('''
library my.library;
class A {
@@ -124,23 +120,22 @@ class A {
}
}
''');
- return prepareHover('mmm(int a').then((HoverInformation hover) {
- // element
- expect(hover.containingLibraryName, 'my.library');
- expect(hover.containingLibraryPath, testFile);
- expect(hover.containingClassDescription, 'A');
- expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
- expect(hover.elementDescription, 'mmm(int a, String b) → List<String>');
- expect(hover.elementKind, 'method');
- // types
- expect(hover.staticType, '(int, String) → List<String>');
- expect(hover.propagatedType, isNull);
- // no parameter
- expect(hover.parameter, isNull);
- });
+ HoverInformation hover = await prepareHover('mmm(int a');
+ // element
+ expect(hover.containingLibraryName, 'my.library');
+ expect(hover.containingLibraryPath, testFile);
+ expect(hover.containingClassDescription, 'A');
+ expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
+ expect(hover.elementDescription, 'mmm(int a, String b) → List<String>');
+ expect(hover.elementKind, 'method');
+ // types
+ expect(hover.staticType, '(int, String) → List<String>');
+ expect(hover.propagatedType, isNull);
+ // no parameter
+ expect(hover.parameter, isNull);
}
- test_expression_method_invocation() {
+ test_expression_method_invocation() async {
addTestFile('''
library my.library;
class A {
@@ -151,24 +146,23 @@ main(A a) {
a.mmm(42, 'foo');
}
''');
- return prepareHover('mm(42, ').then((HoverInformation hover) {
- // range
- expect(hover.offset, findOffset('mmm(42, '));
- expect(hover.length, 'mmm'.length);
- // element
- expect(hover.containingLibraryName, 'my.library');
- expect(hover.containingLibraryPath, testFile);
- expect(hover.elementDescription, 'mmm(int a, String b) → List<String>');
- expect(hover.elementKind, 'method');
- // types
- expect(hover.staticType, isNull);
- expect(hover.propagatedType, isNull);
- // no parameter
- expect(hover.parameter, isNull);
- });
+ HoverInformation hover = await prepareHover('mm(42, ');
+ // range
+ expect(hover.offset, findOffset('mmm(42, '));
+ expect(hover.length, 'mmm'.length);
+ // element
+ expect(hover.containingLibraryName, 'my.library');
+ expect(hover.containingLibraryPath, testFile);
+ expect(hover.elementDescription, 'mmm(int a, String b) → List<String>');
+ expect(hover.elementKind, 'method');
+ // types
+ expect(hover.staticType, isNull);
+ expect(hover.propagatedType, isNull);
+ // no parameter
+ expect(hover.parameter, isNull);
}
- test_expression_parameter() {
+ test_expression_parameter() async {
addTestFile('''
library my.library;
class A {
@@ -177,23 +171,22 @@ class A {
}
}
''');
- return prepareHover('p) {').then((HoverInformation hover) {
- // element
- expect(hover.containingLibraryName, isNull);
- expect(hover.containingLibraryPath, isNull);
- expect(hover.containingClassDescription, isNull);
- expect(hover.dartdoc, 'The method documentation.');
- expect(hover.elementDescription, 'int p');
- expect(hover.elementKind, 'parameter');
- // types
- expect(hover.staticType, 'int');
- expect(hover.propagatedType, isNull);
- // no parameter
- expect(hover.parameter, isNull);
- });
+ HoverInformation hover = await prepareHover('p) {');
+ // element
+ expect(hover.containingLibraryName, isNull);
+ expect(hover.containingLibraryPath, isNull);
+ expect(hover.containingClassDescription, isNull);
+ expect(hover.dartdoc, 'The method documentation.');
+ expect(hover.elementDescription, 'int p');
+ expect(hover.elementKind, 'parameter');
+ // types
+ expect(hover.staticType, 'int');
+ expect(hover.propagatedType, isNull);
+ // no parameter
+ expect(hover.parameter, isNull);
}
- test_expression_syntheticGetter() {
+ test_expression_syntheticGetter() async {
addTestFile('''
library my.library;
class A {
@@ -205,21 +198,20 @@ main(A a) {
print(a.fff);
}
''');
- return prepareHover('fff);').then((HoverInformation hover) {
- // element
- expect(hover.containingLibraryName, 'my.library');
- expect(hover.containingLibraryPath, testFile);
- expect(hover.containingClassDescription, 'A');
- expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
- expect(hover.elementDescription, 'String fff');
- expect(hover.elementKind, 'field');
- // types
- expect(hover.staticType, 'String');
- expect(hover.propagatedType, isNull);
- });
+ HoverInformation hover = await prepareHover('fff);');
+ // element
+ expect(hover.containingLibraryName, 'my.library');
+ expect(hover.containingLibraryPath, testFile);
+ expect(hover.containingClassDescription, 'A');
+ expect(hover.dartdoc, '''doc aaa\ndoc bbb''');
+ expect(hover.elementDescription, 'String fff');
+ expect(hover.elementKind, 'field');
+ // types
+ expect(hover.staticType, 'String');
+ expect(hover.propagatedType, isNull);
}
- test_expression_variable_hasPropagatedType() {
+ test_expression_variable_hasPropagatedType() async {
addTestFile('''
library my.library;
main() {
@@ -227,21 +219,20 @@ main() {
print(vvv);
}
''');
- return prepareHover('vvv);').then((HoverInformation hover) {
- // element
- expect(hover.containingLibraryName, isNull);
- expect(hover.containingLibraryPath, isNull);
- expect(hover.containingClassDescription, isNull);
- expect(hover.dartdoc, isNull);
- expect(hover.elementDescription, 'dynamic vvv');
- expect(hover.elementKind, 'local variable');
- // types
- expect(hover.staticType, 'dynamic');
- expect(hover.propagatedType, 'int');
- });
+ HoverInformation hover = await prepareHover('vvv);');
+ // element
+ expect(hover.containingLibraryName, isNull);
+ expect(hover.containingLibraryPath, isNull);
+ expect(hover.containingClassDescription, isNull);
+ expect(hover.dartdoc, isNull);
+ expect(hover.elementDescription, 'dynamic vvv');
+ expect(hover.elementKind, 'local variable');
+ // types
+ expect(hover.staticType, 'dynamic');
+ expect(hover.propagatedType, 'int');
}
- test_expression_variable_inMethod() {
+ test_expression_variable_inMethod() async {
addTestFile('''
library my.library;
class A {
@@ -250,23 +241,22 @@ class A {
}
}
''');
- return prepareHover('vvv = 42').then((HoverInformation hover) {
- // element
- expect(hover.containingLibraryName, isNull);
- expect(hover.containingLibraryPath, isNull);
- expect(hover.containingClassDescription, isNull);
- expect(hover.dartdoc, isNull);
- expect(hover.elementDescription, 'num vvv');
- expect(hover.elementKind, 'local variable');
- // types
- expect(hover.staticType, 'num');
- expect(hover.propagatedType, 'int');
- // no parameter
- expect(hover.parameter, isNull);
- });
+ HoverInformation hover = await prepareHover('vvv = 42');
+ // element
+ expect(hover.containingLibraryName, isNull);
+ expect(hover.containingLibraryPath, isNull);
+ expect(hover.containingClassDescription, isNull);
+ expect(hover.dartdoc, isNull);
+ expect(hover.elementDescription, 'num vvv');
+ expect(hover.elementKind, 'local variable');
+ // types
+ expect(hover.staticType, 'num');
+ expect(hover.propagatedType, 'int');
+ // no parameter
+ expect(hover.parameter, isNull);
}
- test_instanceCreation_implicit() {
+ test_instanceCreation_implicit() async {
addTestFile('''
library my.library;
class A {
@@ -275,25 +265,24 @@ main() {
new A();
}
''');
- return prepareHover('new A').then((HoverInformation hover) {
- // range
- expect(hover.offset, findOffset('new A'));
- expect(hover.length, 'new A()'.length);
- // element
- expect(hover.containingLibraryName, 'my.library');
- expect(hover.containingLibraryPath, testFile);
- expect(hover.dartdoc, isNull);
- expect(hover.elementDescription, 'A() → A');
- expect(hover.elementKind, 'constructor');
- // types
- expect(hover.staticType, 'A');
- expect(hover.propagatedType, isNull);
- // no parameter
- expect(hover.parameter, isNull);
- });
+ HoverInformation hover = await prepareHover('new A');
+ // range
+ expect(hover.offset, findOffset('new A'));
+ expect(hover.length, 'new A()'.length);
+ // element
+ expect(hover.containingLibraryName, 'my.library');
+ expect(hover.containingLibraryPath, testFile);
+ expect(hover.dartdoc, isNull);
+ expect(hover.elementDescription, 'A() → A');
+ expect(hover.elementKind, 'constructor');
+ // types
+ expect(hover.staticType, 'A');
+ expect(hover.propagatedType, isNull);
+ // no parameter
+ expect(hover.parameter, isNull);
}
- test_instanceCreation_implicit_withTypeArgument() {
+ test_instanceCreation_implicit_withTypeArgument() async {
addTestFile('''
library my.library;
class A<T> {}
@@ -301,7 +290,7 @@ main() {
new A<String>();
}
''');
- Function onConstructor = (HoverInformation hover) {
+ void onConstructor(HoverInformation hover) {
// range
expect(hover.offset, findOffset('new A<String>'));
expect(hover.length, 'new A<String>()'.length);
@@ -316,18 +305,24 @@ main() {
expect(hover.propagatedType, isNull);
// no parameter
expect(hover.parameter, isNull);
- };
- var futureNewA = prepareHover('new A').then(onConstructor);
- var futureA = prepareHover('A<String>()').then(onConstructor);
- var futureString = prepareHover('String>').then((HoverInformation hover) {
+ }
+ {
+ HoverInformation hover = await prepareHover('new A');
+ onConstructor(hover);
+ }
+ {
+ HoverInformation hover = await prepareHover('A<String>()');
+ onConstructor(hover);
+ }
+ {
+ HoverInformation hover = await prepareHover('String>');
expect(hover.offset, findOffset('String>'));
expect(hover.length, 'String'.length);
expect(hover.elementKind, 'class');
- });
- return Future.wait([futureNewA, futureA, futureString]);
+ }
}
- test_instanceCreation_named() {
+ test_instanceCreation_named() async {
addTestFile('''
library my.library;
class A {
@@ -338,7 +333,7 @@ main() {
new A.named();
}
''');
- var onConstructor = (HoverInformation hover) {
+ void onConstructor(HoverInformation hover) {
// range
expect(hover.offset, findOffset('new A'));
expect(hover.length, 'new A.named()'.length);
@@ -346,10 +341,15 @@ main() {
expect(hover.dartdoc, 'my doc');
expect(hover.elementDescription, 'A.named() → A');
expect(hover.elementKind, 'constructor');
- };
- var futureCreation = prepareHover('new A').then(onConstructor);
- var futureName = prepareHover('named();').then(onConstructor);
- return Future.wait([futureCreation, futureName]);
+ }
+ {
+ HoverInformation hover = await prepareHover('new A');
+ onConstructor(hover);
+ }
+ {
+ HoverInformation hover = await prepareHover('named();');
+ onConstructor(hover);
+ }
}
test_noHoverInfo() {
« no previous file with comments | « no previous file | pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698