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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/analysis_server/test/services/correction/assist_test.dart

Issue 1461343002: Make AssistContributor asynchronous. (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
« pkg/analysis_server/lib/plugin/edit/assist/assist_dart.dart ('K') | « pkg/analysis_server/test/edit/assists_test.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/test/services/correction/assist_test.dart
diff --git a/pkg/analysis_server/test/services/correction/assist_test.dart b/pkg/analysis_server/test/services/correction/assist_test.dart
index 5fdb6ef20801e97f6429299fdc3d49e6b7c0cd2b..61c164bf479d0d1b7a8a9cbe70f66be03b3b00c2 100644
--- a/pkg/analysis_server/test/services/correction/assist_test.dart
+++ b/pkg/analysis_server/test/services/correction/assist_test.dart
@@ -4,6 +4,8 @@
library test.services.correction.assist;
+import 'dart:async';
+
import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
import 'package:analysis_server/plugin/protocol/protocol.dart';
import 'package:analysis_server/src/plugin/server_plugin.dart';
@@ -36,8 +38,8 @@ class AssistProcessorTest extends AbstractSingleUnitTest {
* Asserts that there is an [Assist] of the given [kind] at [offset] which
* produces the [expected] code when applied to [testCode].
*/
- void assertHasAssist(AssistKind kind, String expected) {
- assist = _assertHasAssist(kind);
+ assertHasAssist(AssistKind kind, String expected) async {
+ assist = await _assertHasAssist(kind);
change = assist.change;
// apply to "file"
List<SourceFileEdit> fileEdits = change.edits;
@@ -50,17 +52,17 @@ class AssistProcessorTest extends AbstractSingleUnitTest {
/**
* Calls [assertHasAssist] at the offset of [offsetSearch] in [testCode].
*/
- void assertHasAssistAt(
- String offsetSearch, AssistKind kind, String expected) {
+ assertHasAssistAt(
+ String offsetSearch, AssistKind kind, String expected) async {
offset = findOffset(offsetSearch);
- assertHasAssist(kind, expected);
+ await assertHasAssist(kind, expected);
}
/**
* Asserts that there is no [Assist] of the given [kind] at [offset].
*/
- void assertNoAssist(AssistKind kind) {
- List<Assist> assists = computeAssists(
+ assertNoAssist(AssistKind kind) async {
+ List<Assist> assists = await computeAssists(
plugin, context, testUnit.element.source, offset, length);
for (Assist assist in assists) {
if (assist.kind == kind) {
@@ -72,9 +74,9 @@ class AssistProcessorTest extends AbstractSingleUnitTest {
/**
* Calls [assertNoAssist] at the offset of [offsetSearch] in [testCode].
*/
- void assertNoAssistAt(String offsetSearch, AssistKind kind) {
+ assertNoAssistAt(String offsetSearch, AssistKind kind) async {
offset = findOffset(offsetSearch);
- assertNoAssist(kind);
+ await assertNoAssist(kind);
}
Position expectedPosition(String search) {
@@ -106,7 +108,7 @@ class AssistProcessorTest extends AbstractSingleUnitTest {
manager.processPlugins([plugin]);
}
- void test_addTypeAnnotation_BAD_privateType_closureParameter() {
+ test_addTypeAnnotation_BAD_privateType_closureParameter() async {
addSource(
'/my_lib.dart',
'''
@@ -121,10 +123,10 @@ main() {
foo((test) {});
}
''');
- assertNoAssistAt('test)', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('test)', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_BAD_privateType_declaredIdentifier() {
+ test_addTypeAnnotation_BAD_privateType_declaredIdentifier() async {
addSource(
'/my_lib.dart',
'''
@@ -142,10 +144,10 @@ class A<T> {
}
}
''');
- assertNoAssistAt('var item', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('var item', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_BAD_privateType_list() {
+ test_addTypeAnnotation_BAD_privateType_list() async {
addSource(
'/my_lib.dart',
'''
@@ -160,10 +162,10 @@ main() {
var v = getValues();
}
''');
- assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_BAD_privateType_variable() {
+ test_addTypeAnnotation_BAD_privateType_variable() async {
addSource(
'/my_lib.dart',
'''
@@ -178,16 +180,16 @@ main() {
var v = getValue();
}
''');
- assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_classField_OK_final() {
+ test_addTypeAnnotation_classField_OK_final() async {
resolveTestUnit('''
class A {
final f = 0;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'final ',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -197,13 +199,13 @@ class A {
''');
}
- void test_addTypeAnnotation_classField_OK_int() {
+ test_addTypeAnnotation_classField_OK_int() async {
resolveTestUnit('''
class A {
var f = 0;
}
''');
- assertHasAssistAt(
+ await await assertHasAssistAt(
'var ',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -213,17 +215,17 @@ class A {
''');
}
- void test_addTypeAnnotation_declaredIdentifier_BAD_hasTypeAnnotation() {
+ test_addTypeAnnotation_declaredIdentifier_BAD_hasTypeAnnotation() async {
resolveTestUnit('''
main(List<String> items) {
for (String item in items) {
}
}
''');
- assertNoAssistAt('item in', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('item in', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_declaredIdentifier_BAD_inForEachBody() {
+ test_addTypeAnnotation_declaredIdentifier_BAD_inForEachBody() async {
resolveTestUnit('''
main(List<String> items) {
for (var item in items) {
@@ -231,10 +233,10 @@ main(List<String> items) {
}
}
''');
- assertNoAssistAt('42;', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('42;', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_declaredIdentifier_BAD_unknownType() {
+ test_addTypeAnnotation_declaredIdentifier_BAD_unknownType() async {
verifyNoTestUnitErrors = false;
resolveTestUnit('''
main() {
@@ -242,10 +244,10 @@ main() {
}
}
''');
- assertNoAssistAt('item in', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('item in', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_declaredIdentifier_generic_OK() {
+ test_addTypeAnnotation_declaredIdentifier_generic_OK() async {
resolveTestUnit('''
class A<T> {
main(List<List<T>> items) {
@@ -254,7 +256,7 @@ class A<T> {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'item in',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -267,7 +269,7 @@ class A<T> {
''');
}
- void test_addTypeAnnotation_declaredIdentifier_OK() {
+ test_addTypeAnnotation_declaredIdentifier_OK() async {
resolveTestUnit('''
main(List<String> items) {
for (var item in items) {
@@ -275,7 +277,7 @@ main(List<String> items) {
}
''');
// on identifier
- assertHasAssistAt(
+ await assertHasAssistAt(
'item in',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -285,7 +287,7 @@ main(List<String> items) {
}
''');
// on "for"
- assertHasAssistAt(
+ await assertHasAssistAt(
'for (',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -296,7 +298,7 @@ main(List<String> items) {
''');
}
- void test_addTypeAnnotation_declaredIdentifier_OK_addImport_dartUri() {
+ test_addTypeAnnotation_declaredIdentifier_OK_addImport_dartUri() async {
addSource(
'/my_lib.dart',
r'''
@@ -310,7 +312,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'future in',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -323,14 +325,14 @@ main() {
''');
}
- void test_addTypeAnnotation_declaredIdentifier_OK_final() {
+ test_addTypeAnnotation_declaredIdentifier_OK_final() async {
resolveTestUnit('''
main(List<String> items) {
for (final item in items) {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'item in',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -341,7 +343,7 @@ main(List<String> items) {
''');
}
- void test_addTypeAnnotation_local_generic_OK_literal() {
+ test_addTypeAnnotation_local_generic_OK_literal() async {
resolveTestUnit('''
class A {
main(List<int> items) {
@@ -349,7 +351,7 @@ class A {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -361,7 +363,7 @@ class A {
''');
}
- void test_addTypeAnnotation_local_generic_OK_local() {
+ test_addTypeAnnotation_local_generic_OK_local() async {
resolveTestUnit('''
class A<T> {
main(List<T> items) {
@@ -369,7 +371,7 @@ class A<T> {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -381,7 +383,7 @@ class A<T> {
''');
}
- void test_addTypeAnnotation_local_OK_addImport_dartUri() {
+ test_addTypeAnnotation_local_OK_addImport_dartUri() async {
addSource(
'/my_lib.dart',
r'''
@@ -394,7 +396,7 @@ main() {
var v = getFutureInt();
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -406,7 +408,7 @@ main() {
''');
}
- void test_addTypeAnnotation_local_OK_addImport_notLibraryUnit() {
+ test_addTypeAnnotation_local_OK_addImport_notLibraryUnit() async {
// prepare library
addSource(
'/my_lib.dart',
@@ -437,7 +439,7 @@ main() {
testLibraryElement = testUnitElement.library;
// prepare the assist
offset = findOffset('v = ');
- assist = _assertHasAssist(DartAssistKind.ADD_TYPE_ANNOTATION);
+ assist = await _assertHasAssist(DartAssistKind.ADD_TYPE_ANNOTATION);
change = assist.change;
// verify
{
@@ -466,7 +468,7 @@ main() {
}
}
- void test_addTypeAnnotation_local_OK_addImport_relUri() {
+ test_addTypeAnnotation_local_OK_addImport_relUri() async {
addSource(
'/aa/bbb/lib_a.dart',
r'''
@@ -484,7 +486,7 @@ main() {
var v = newMyClass();
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -496,13 +498,13 @@ main() {
''');
}
- void test_addTypeAnnotation_local_OK_Function() {
+ test_addTypeAnnotation_local_OK_Function() async {
resolveTestUnit('''
main() {
var v = () => 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -512,13 +514,13 @@ main() {
''');
}
- void test_addTypeAnnotation_local_OK_int() {
+ test_addTypeAnnotation_local_OK_int() async {
resolveTestUnit('''
main() {
var v = 0;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -528,13 +530,13 @@ main() {
''');
}
- void test_addTypeAnnotation_local_OK_List() {
+ test_addTypeAnnotation_local_OK_List() async {
resolveTestUnit('''
main() {
var v = <String>[];
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -544,7 +546,7 @@ main() {
''');
}
- void test_addTypeAnnotation_local_OK_localType() {
+ test_addTypeAnnotation_local_OK_localType() async {
resolveTestUnit('''
class C {}
C f() => null;
@@ -552,7 +554,7 @@ main() {
var x = f();
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'x =',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -564,13 +566,13 @@ main() {
''');
}
- void test_addTypeAnnotation_local_OK_onInitializer() {
+ test_addTypeAnnotation_local_OK_onInitializer() async {
resolveTestUnit('''
main() {
var v = 123;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'23',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -580,13 +582,13 @@ main() {
''');
}
- void test_addTypeAnnotation_local_OK_onName() {
+ test_addTypeAnnotation_local_OK_onName() async {
resolveTestUnit('''
main() {
var abc = 0;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'bc',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -596,13 +598,13 @@ main() {
''');
}
- void test_addTypeAnnotation_local_OK_onVar() {
+ test_addTypeAnnotation_local_OK_onVar() async {
resolveTestUnit('''
main() {
var v = 0;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'var ',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -612,13 +614,13 @@ main() {
''');
}
- void test_addTypeAnnotation_local_OK_onVariableDeclarationStatement() {
+ test_addTypeAnnotation_local_OK_onVariableDeclarationStatement() async {
resolveTestUnit('''
main() {
var v = 123; // marker
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
' // marker',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -628,54 +630,54 @@ main() {
''');
}
- void test_addTypeAnnotation_local_wrong_hasTypeAnnotation() {
+ test_addTypeAnnotation_local_wrong_hasTypeAnnotation() async {
resolveTestUnit('''
main() {
int v = 42;
}
''');
- assertNoAssistAt(' = 42', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt(' = 42', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_local_wrong_multiple() {
+ test_addTypeAnnotation_local_wrong_multiple() async {
resolveTestUnit('''
main() {
var a = 1, b = '';
}
''');
- assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_local_wrong_noValue() {
+ test_addTypeAnnotation_local_wrong_noValue() async {
verifyNoTestUnitErrors = false;
resolveTestUnit('''
main() {
var v;
}
''');
- assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_local_wrong_null() {
+ test_addTypeAnnotation_local_wrong_null() async {
resolveTestUnit('''
main() {
var v = null;
}
''');
- assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_local_wrong_unknown() {
+ test_addTypeAnnotation_local_wrong_unknown() async {
verifyNoTestUnitErrors = false;
resolveTestUnit('''
main() {
var v = unknownVar;
}
''');
- assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_OK_privateType_sameLibrary() {
+ test_addTypeAnnotation_OK_privateType_sameLibrary() async {
resolveTestUnit('''
class _A {}
_A getValue() => new _A();
@@ -683,7 +685,7 @@ main() {
var v = getValue();
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'var ',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -695,34 +697,34 @@ main() {
''');
}
- void test_addTypeAnnotation_parameter_BAD_hasExplicitType() {
+ test_addTypeAnnotation_parameter_BAD_hasExplicitType() async {
resolveTestUnit('''
foo(f(int p)) {}
main() {
foo((num test) {});
}
''');
- assertNoAssistAt('test', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('test', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_parameter_BAD_noPropagatedType() {
+ test_addTypeAnnotation_parameter_BAD_noPropagatedType() async {
resolveTestUnit('''
foo(f(p)) {}
main() {
foo((test) {});
}
''');
- assertNoAssistAt('test', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('test', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_parameter_OK() {
+ test_addTypeAnnotation_parameter_OK() async {
resolveTestUnit('''
foo(f(int p)) {}
main() {
foo((test) {});
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'test',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -733,11 +735,11 @@ main() {
''');
}
- void test_addTypeAnnotation_topLevelField_OK_int() {
+ test_addTypeAnnotation_topLevelField_OK_int() async {
resolveTestUnit('''
var V = 0;
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'var ',
DartAssistKind.ADD_TYPE_ANNOTATION,
'''
@@ -745,21 +747,21 @@ int V = 0;
''');
}
- void test_addTypeAnnotation_topLevelField_wrong_multiple() {
+ test_addTypeAnnotation_topLevelField_wrong_multiple() async {
resolveTestUnit('''
var A = 1, V = '';
''');
- assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_addTypeAnnotation_topLevelField_wrong_noValue() {
+ test_addTypeAnnotation_topLevelField_wrong_noValue() async {
resolveTestUnit('''
var V;
''');
- assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+ await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
}
- void test_assignToLocalVariable() {
+ test_assignToLocalVariable() async {
resolveTestUnit('''
main() {
List<int> bytes;
@@ -767,7 +769,7 @@ main() {
}
List<int> readBytes() => <int>[];
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'readBytes();',
DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE,
'''
@@ -784,17 +786,17 @@ List<int> readBytes() => <int>[];
['list', 'bytes2', 'readBytes']));
}
- void test_assignToLocalVariable_alreadyAssignment() {
+ test_assignToLocalVariable_alreadyAssignment() async {
resolveTestUnit('''
main() {
var vvv;
vvv = 42;
}
''');
- assertNoAssistAt('vvv =', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE);
+ await assertNoAssistAt('vvv =', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE);
}
- void test_assignToLocalVariable_inClosure() {
+ test_assignToLocalVariable_inClosure() async {
resolveTestUnit(r'''
main() {
print(() {
@@ -802,7 +804,7 @@ main() {
});
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'345',
DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE,
'''
@@ -814,59 +816,61 @@ main() {
''');
}
- void test_assignToLocalVariable_invocationArgument() {
+ test_assignToLocalVariable_invocationArgument() async {
resolveTestUnit(r'''
main() {
f(12345);
}
int f(p) {}
''');
- assertNoAssistAt('345', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE);
+ await assertNoAssistAt('345', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE);
}
- void test_assignToLocalVariable_throw() {
+ test_assignToLocalVariable_throw() async {
resolveTestUnit('''
main() {
throw 42;
}
''');
- assertNoAssistAt('throw ', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE);
+ await assertNoAssistAt('throw ', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE);
}
- void test_assignToLocalVariable_void() {
+ test_assignToLocalVariable_void() async {
resolveTestUnit('''
main() {
f();
}
void f() {}
''');
- assertNoAssistAt('f();', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE);
+ await assertNoAssistAt('f();', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE);
}
- void test_convertIntoBlockDocumentationComment_BAD_alreadyBlock() {
+ test_convertIntoBlockDocumentationComment_BAD_alreadyBlock() async {
resolveTestUnit('''
/**
* AAAAAAA
*/
class A {}
''');
- assertNoAssistAt('AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK);
+ await assertNoAssistAt(
+ 'AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK);
}
- void test_convertIntoBlockDocumentationComment_BAD_notDocumentation() {
+ test_convertIntoBlockDocumentationComment_BAD_notDocumentation() async {
resolveTestUnit('''
// AAAA
class A {}
''');
- assertNoAssistAt('AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK);
+ await assertNoAssistAt(
+ 'AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK);
}
- void test_convertIntoBlockDocumentationComment_OK_onReference() {
+ test_convertIntoBlockDocumentationComment_OK_onReference() async {
resolveTestUnit('''
/// AAAAAAA [int] AAAAAAA
class A {}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'nt]',
DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK,
'''
@@ -877,7 +881,7 @@ class A {}
''');
}
- void test_convertIntoBlockDocumentationComment_OK_onText() {
+ test_convertIntoBlockDocumentationComment_OK_onText() async {
resolveTestUnit('''
class A {
/// AAAAAAA [int] AAAAAAA
@@ -886,7 +890,7 @@ class A {
mmm() {}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'AAA [',
DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK,
'''
@@ -901,13 +905,13 @@ class A {
''');
}
- void test_convertToBlockBody_OK_async() {
+ test_convertToBlockBody_OK_async() async {
resolveTestUnit('''
class A {
mmm() async => 123;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'mmm()',
DartAssistKind.CONVERT_INTO_BLOCK_BODY,
'''
@@ -919,14 +923,14 @@ class A {
''');
}
- void test_convertToBlockBody_OK_closure() {
+ test_convertToBlockBody_OK_closure() async {
resolveTestUnit('''
setup(x) {}
main() {
setup(() => 42);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'() => 42',
DartAssistKind.CONVERT_INTO_BLOCK_BODY,
'''
@@ -945,14 +949,14 @@ main() {
}
}
- void test_convertToBlockBody_OK_closure_voidExpression() {
+ test_convertToBlockBody_OK_closure_voidExpression() async {
resolveTestUnit('''
setup(x) {}
main() {
setup(() => print('done'));
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'() => print',
DartAssistKind.CONVERT_INTO_BLOCK_BODY,
'''
@@ -971,13 +975,13 @@ main() {
}
}
- void test_convertToBlockBody_OK_constructor() {
+ test_convertToBlockBody_OK_constructor() async {
resolveTestUnit('''
class A {
factory A() => null;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'A()',
DartAssistKind.CONVERT_INTO_BLOCK_BODY,
'''
@@ -989,13 +993,13 @@ class A {
''');
}
- void test_convertToBlockBody_OK_method() {
+ test_convertToBlockBody_OK_method() async {
resolveTestUnit('''
class A {
mmm() => 123;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'mmm()',
DartAssistKind.CONVERT_INTO_BLOCK_BODY,
'''
@@ -1007,11 +1011,11 @@ class A {
''');
}
- void test_convertToBlockBody_OK_onName() {
+ test_convertToBlockBody_OK_onName() async {
resolveTestUnit('''
fff() => 123;
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'fff()',
DartAssistKind.CONVERT_INTO_BLOCK_BODY,
'''
@@ -1021,11 +1025,11 @@ fff() {
''');
}
- void test_convertToBlockBody_OK_onValue() {
+ test_convertToBlockBody_OK_onValue() async {
resolveTestUnit('''
fff() => 123;
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'23;',
DartAssistKind.CONVERT_INTO_BLOCK_BODY,
'''
@@ -1035,23 +1039,23 @@ fff() {
''');
}
- void test_convertToBlockBody_wrong_noEnclosingFunction() {
+ test_convertToBlockBody_wrong_noEnclosingFunction() async {
resolveTestUnit('''
var v = 123;
''');
- assertNoAssistAt('v =', DartAssistKind.CONVERT_INTO_BLOCK_BODY);
+ await assertNoAssistAt('v =', DartAssistKind.CONVERT_INTO_BLOCK_BODY);
}
- void test_convertToBlockBody_wrong_notExpressionBlock() {
+ test_convertToBlockBody_wrong_notExpressionBlock() async {
resolveTestUnit('''
fff() {
return 123;
}
''');
- assertNoAssistAt('fff() {', DartAssistKind.CONVERT_INTO_BLOCK_BODY);
+ await assertNoAssistAt('fff() {', DartAssistKind.CONVERT_INTO_BLOCK_BODY);
}
- void test_convertToExpressionBody_OK_async() {
+ test_convertToExpressionBody_OK_async() async {
resolveTestUnit('''
class A {
mmm() async {
@@ -1059,7 +1063,7 @@ class A {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'mmm',
DartAssistKind.CONVERT_INTO_EXPRESSION_BODY,
'''
@@ -1069,7 +1073,7 @@ class A {
''');
}
- void test_convertToExpressionBody_OK_closure() {
+ test_convertToExpressionBody_OK_closure() async {
resolveTestUnit('''
setup(x) {}
main() {
@@ -1078,7 +1082,7 @@ main() {
});
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'42;',
DartAssistKind.CONVERT_INTO_EXPRESSION_BODY,
'''
@@ -1089,7 +1093,7 @@ main() {
''');
}
- void test_convertToExpressionBody_OK_closure_voidExpression() {
+ test_convertToExpressionBody_OK_closure_voidExpression() async {
resolveTestUnit('''
setup(x) {}
main() {
@@ -1098,7 +1102,7 @@ main() {
});
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'print(',
DartAssistKind.CONVERT_INTO_EXPRESSION_BODY,
'''
@@ -1109,7 +1113,7 @@ main() {
''');
}
- void test_convertToExpressionBody_OK_constructor() {
+ test_convertToExpressionBody_OK_constructor() async {
resolveTestUnit('''
class A {
factory A() {
@@ -1117,7 +1121,7 @@ class A {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'A()',
DartAssistKind.CONVERT_INTO_EXPRESSION_BODY,
'''
@@ -1127,13 +1131,13 @@ class A {
''');
}
- void test_convertToExpressionBody_OK_function_onBlock() {
+ test_convertToExpressionBody_OK_function_onBlock() async {
resolveTestUnit('''
fff() {
return 42;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'{',
DartAssistKind.CONVERT_INTO_EXPRESSION_BODY,
'''
@@ -1141,13 +1145,13 @@ fff() => 42;
''');
}
- void test_convertToExpressionBody_OK_function_onName() {
+ test_convertToExpressionBody_OK_function_onName() async {
resolveTestUnit('''
fff() {
return 42;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'ff()',
DartAssistKind.CONVERT_INTO_EXPRESSION_BODY,
'''
@@ -1155,7 +1159,7 @@ fff() => 42;
''');
}
- void test_convertToExpressionBody_OK_method_onBlock() {
+ test_convertToExpressionBody_OK_method_onBlock() async {
resolveTestUnit('''
class A {
m() { // marker
@@ -1163,7 +1167,7 @@ class A {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'{ // marker',
DartAssistKind.CONVERT_INTO_EXPRESSION_BODY,
'''
@@ -1173,13 +1177,13 @@ class A {
''');
}
- void test_convertToExpressionBody_OK_topFunction_onReturnStatement() {
+ test_convertToExpressionBody_OK_topFunction_onReturnStatement() async {
resolveTestUnit('''
fff() {
return 42;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'return',
DartAssistKind.CONVERT_INTO_EXPRESSION_BODY,
'''
@@ -1187,49 +1191,53 @@ fff() => 42;
''');
}
- void test_convertToExpressionBody_wrong_already() {
+ test_convertToExpressionBody_wrong_already() async {
resolveTestUnit('''
fff() => 42;
''');
- assertNoAssistAt('fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
+ await assertNoAssistAt(
+ 'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
}
- void test_convertToExpressionBody_wrong_moreThanOneStatement() {
+ test_convertToExpressionBody_wrong_moreThanOneStatement() async {
resolveTestUnit('''
fff() {
var v = 42;
return v;
}
''');
- assertNoAssistAt('fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
+ await assertNoAssistAt(
+ 'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
}
- void test_convertToExpressionBody_wrong_noEnclosingFunction() {
+ test_convertToExpressionBody_wrong_noEnclosingFunction() async {
resolveTestUnit('''
var V = 42;
''');
- assertNoAssistAt('V = ', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
+ await assertNoAssistAt('V = ', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
}
- void test_convertToExpressionBody_wrong_noReturn() {
+ test_convertToExpressionBody_wrong_noReturn() async {
resolveTestUnit('''
fff() {
var v = 42;
}
''');
- assertNoAssistAt('fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
+ await assertNoAssistAt(
+ 'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
}
- void test_convertToExpressionBody_wrong_noReturnValue() {
+ test_convertToExpressionBody_wrong_noReturnValue() async {
resolveTestUnit('''
fff() {
return;
}
''');
- assertNoAssistAt('fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
+ await assertNoAssistAt(
+ 'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
}
- void test_convertToFieldParameter_BAD_additionalUse() {
+ test_convertToFieldParameter_BAD_additionalUse() async {
resolveTestUnit('''
class A {
int aaa2;
@@ -1237,20 +1245,20 @@ class A {
A(int aaa) : aaa2 = aaa, bbb2 = aaa;
}
''');
- assertNoAssistAt('aaa)', DartAssistKind.CONVERT_TO_FIELD_PARAMETER);
+ await assertNoAssistAt('aaa)', DartAssistKind.CONVERT_TO_FIELD_PARAMETER);
}
- void test_convertToFieldParameter_BAD_notPureAssignment() {
+ test_convertToFieldParameter_BAD_notPureAssignment() async {
resolveTestUnit('''
class A {
int aaa2;
A(int aaa) : aaa2 = aaa * 2;
}
''');
- assertNoAssistAt('aaa)', DartAssistKind.CONVERT_TO_FIELD_PARAMETER);
+ await assertNoAssistAt('aaa)', DartAssistKind.CONVERT_TO_FIELD_PARAMETER);
}
- void test_convertToFieldParameter_OK_firstInitializer() {
+ test_convertToFieldParameter_OK_firstInitializer() async {
resolveTestUnit('''
class A {
double aaa2;
@@ -1258,7 +1266,7 @@ class A {
A(int aaa, int bbb) : aaa2 = aaa, bbb2 = bbb;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'aaa, ',
DartAssistKind.CONVERT_TO_FIELD_PARAMETER,
'''
@@ -1270,7 +1278,7 @@ class A {
''');
}
- void test_convertToFieldParameter_OK_onParameterName_inInitializer() {
+ test_convertToFieldParameter_OK_onParameterName_inInitializer() async {
resolveTestUnit('''
class A {
int test2;
@@ -1278,7 +1286,7 @@ class A {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'test {',
DartAssistKind.CONVERT_TO_FIELD_PARAMETER,
'''
@@ -1290,7 +1298,7 @@ class A {
''');
}
- void test_convertToFieldParameter_OK_onParameterName_inParameters() {
+ test_convertToFieldParameter_OK_onParameterName_inParameters() async {
resolveTestUnit('''
class A {
int test;
@@ -1298,7 +1306,7 @@ class A {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'test)',
DartAssistKind.CONVERT_TO_FIELD_PARAMETER,
'''
@@ -1310,7 +1318,7 @@ class A {
''');
}
- void test_convertToFieldParameter_OK_secondInitializer() {
+ test_convertToFieldParameter_OK_secondInitializer() async {
resolveTestUnit('''
class A {
double aaa2;
@@ -1318,7 +1326,7 @@ class A {
A(int aaa, int bbb) : aaa2 = aaa, bbb2 = bbb;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'bbb)',
DartAssistKind.CONVERT_TO_FIELD_PARAMETER,
'''
@@ -1330,16 +1338,17 @@ class A {
''');
}
- void test_convertToForIndex_BAD_bodyNotBlock() {
+ test_convertToForIndex_BAD_bodyNotBlock() async {
resolveTestUnit('''
main(List<String> items) {
for (String item in items) print(item);
}
''');
- assertNoAssistAt('for (String', DartAssistKind.CONVERT_INTO_FOR_INDEX);
+ await assertNoAssistAt(
+ 'for (String', DartAssistKind.CONVERT_INTO_FOR_INDEX);
}
- void test_convertToForIndex_BAD_doesNotDeclareVariable() {
+ test_convertToForIndex_BAD_doesNotDeclareVariable() async {
resolveTestUnit('''
main(List<String> items) {
String item;
@@ -1348,10 +1357,10 @@ main(List<String> items) {
}
}
''');
- assertNoAssistAt('for (item', DartAssistKind.CONVERT_INTO_FOR_INDEX);
+ await assertNoAssistAt('for (item', DartAssistKind.CONVERT_INTO_FOR_INDEX);
}
- void test_convertToForIndex_BAD_iterableIsNotVariable() {
+ test_convertToForIndex_BAD_iterableIsNotVariable() async {
resolveTestUnit('''
main() {
for (String item in ['a', 'b', 'c']) {
@@ -1359,10 +1368,11 @@ main() {
}
}
''');
- assertNoAssistAt('for (String', DartAssistKind.CONVERT_INTO_FOR_INDEX);
+ await assertNoAssistAt(
+ 'for (String', DartAssistKind.CONVERT_INTO_FOR_INDEX);
}
- void test_convertToForIndex_BAD_iterableNotList() {
+ test_convertToForIndex_BAD_iterableNotList() async {
resolveTestUnit('''
main(Iterable<String> items) {
for (String item in items) {
@@ -1370,10 +1380,11 @@ main(Iterable<String> items) {
}
}
''');
- assertNoAssistAt('for (String', DartAssistKind.CONVERT_INTO_FOR_INDEX);
+ await assertNoAssistAt(
+ 'for (String', DartAssistKind.CONVERT_INTO_FOR_INDEX);
}
- void test_convertToForIndex_BAD_usesIJK() {
+ test_convertToForIndex_BAD_usesIJK() async {
resolveTestUnit('''
main(List<String> items) {
for (String item in items) {
@@ -1382,10 +1393,11 @@ main(List<String> items) {
}
}
''');
- assertNoAssistAt('for (String', DartAssistKind.CONVERT_INTO_FOR_INDEX);
+ await assertNoAssistAt(
+ 'for (String', DartAssistKind.CONVERT_INTO_FOR_INDEX);
}
- void test_convertToForIndex_OK_onDeclaredIdentifier_name() {
+ test_convertToForIndex_OK_onDeclaredIdentifier_name() async {
resolveTestUnit('''
main(List<String> items) {
for (String item in items) {
@@ -1393,7 +1405,7 @@ main(List<String> items) {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'item in',
DartAssistKind.CONVERT_INTO_FOR_INDEX,
'''
@@ -1406,7 +1418,7 @@ main(List<String> items) {
''');
}
- void test_convertToForIndex_OK_onDeclaredIdentifier_type() {
+ test_convertToForIndex_OK_onDeclaredIdentifier_type() async {
resolveTestUnit('''
main(List<String> items) {
for (String item in items) {
@@ -1414,7 +1426,7 @@ main(List<String> items) {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'tring item',
DartAssistKind.CONVERT_INTO_FOR_INDEX,
'''
@@ -1427,7 +1439,7 @@ main(List<String> items) {
''');
}
- void test_convertToForIndex_OK_onFor() {
+ test_convertToForIndex_OK_onFor() async {
resolveTestUnit('''
main(List<String> items) {
for (String item in items) {
@@ -1435,7 +1447,7 @@ main(List<String> items) {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'for (String',
DartAssistKind.CONVERT_INTO_FOR_INDEX,
'''
@@ -1448,7 +1460,7 @@ main(List<String> items) {
''');
}
- void test_convertToForIndex_OK_usesI() {
+ test_convertToForIndex_OK_usesI() async {
resolveTestUnit('''
main(List<String> items) {
for (String item in items) {
@@ -1456,7 +1468,7 @@ main(List<String> items) {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'for (String',
DartAssistKind.CONVERT_INTO_FOR_INDEX,
'''
@@ -1469,7 +1481,7 @@ main(List<String> items) {
''');
}
- void test_convertToForIndex_OK_usesIJ() {
+ test_convertToForIndex_OK_usesIJ() async {
resolveTestUnit('''
main(List<String> items) {
for (String item in items) {
@@ -1478,7 +1490,7 @@ main(List<String> items) {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'for (String',
DartAssistKind.CONVERT_INTO_FOR_INDEX,
'''
@@ -1492,13 +1504,13 @@ main(List<String> items) {
''');
}
- void test_convertToIsNot_OK_childOfIs_left() {
+ test_convertToIsNot_OK_childOfIs_left() async {
resolveTestUnit('''
main(p) {
!(p is String);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'p is',
DartAssistKind.CONVERT_INTO_IS_NOT,
'''
@@ -1508,13 +1520,13 @@ main(p) {
''');
}
- void test_convertToIsNot_OK_childOfIs_right() {
+ test_convertToIsNot_OK_childOfIs_right() async {
resolveTestUnit('''
main(p) {
!(p is String);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'String)',
DartAssistKind.CONVERT_INTO_IS_NOT,
'''
@@ -1524,13 +1536,13 @@ main(p) {
''');
}
- void test_convertToIsNot_OK_is() {
+ test_convertToIsNot_OK_is() async {
resolveTestUnit('''
main(p) {
!(p is String);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'is String',
DartAssistKind.CONVERT_INTO_IS_NOT,
'''
@@ -1540,13 +1552,13 @@ main(p) {
''');
}
- void test_convertToIsNot_OK_is_higherPrecedencePrefix() {
+ test_convertToIsNot_OK_is_higherPrecedencePrefix() async {
resolveTestUnit('''
main(p) {
!!(p is String);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'is String',
DartAssistKind.CONVERT_INTO_IS_NOT,
'''
@@ -1556,13 +1568,13 @@ main(p) {
''');
}
- void test_convertToIsNot_OK_is_not_higherPrecedencePrefix() {
+ test_convertToIsNot_OK_is_not_higherPrecedencePrefix() async {
resolveTestUnit('''
main(p) {
!!(p is String);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'!(p',
DartAssistKind.CONVERT_INTO_IS_NOT,
'''
@@ -1572,13 +1584,13 @@ main(p) {
''');
}
- void test_convertToIsNot_OK_not() {
+ test_convertToIsNot_OK_not() async {
resolveTestUnit('''
main(p) {
!(p is String);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'!(p',
DartAssistKind.CONVERT_INTO_IS_NOT,
'''
@@ -1588,13 +1600,13 @@ main(p) {
''');
}
- void test_convertToIsNot_OK_parentheses() {
+ test_convertToIsNot_OK_parentheses() async {
resolveTestUnit('''
main(p) {
!(p is String);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'(p is',
DartAssistKind.CONVERT_INTO_IS_NOT,
'''
@@ -1604,96 +1616,96 @@ main(p) {
''');
}
- void test_convertToIsNot_wrong_is_alreadyIsNot() {
+ test_convertToIsNot_wrong_is_alreadyIsNot() async {
resolveTestUnit('''
main(p) {
p is! String;
}
''');
- assertNoAssistAt('is!', DartAssistKind.CONVERT_INTO_IS_NOT);
+ await assertNoAssistAt('is!', DartAssistKind.CONVERT_INTO_IS_NOT);
}
- void test_convertToIsNot_wrong_is_noEnclosingParenthesis() {
+ test_convertToIsNot_wrong_is_noEnclosingParenthesis() async {
resolveTestUnit('''
main(p) {
p is String;
}
''');
- assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
+ await assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
}
- void test_convertToIsNot_wrong_is_noPrefix() {
+ test_convertToIsNot_wrong_is_noPrefix() async {
resolveTestUnit('''
main(p) {
(p is String);
}
''');
- assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
+ await assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
}
- void test_convertToIsNot_wrong_is_notIsExpression() {
+ test_convertToIsNot_wrong_is_notIsExpression() async {
resolveTestUnit('''
main(p) {
123 + 456;
}
''');
- assertNoAssistAt('123 +', DartAssistKind.CONVERT_INTO_IS_NOT);
+ await assertNoAssistAt('123 +', DartAssistKind.CONVERT_INTO_IS_NOT);
}
- void test_convertToIsNot_wrong_is_notTheNotOperator() {
+ test_convertToIsNot_wrong_is_notTheNotOperator() async {
verifyNoTestUnitErrors = false;
resolveTestUnit('''
main(p) {
++(p is String);
}
''');
- assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
+ await assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
}
- void test_convertToIsNot_wrong_not_alreadyIsNot() {
+ test_convertToIsNot_wrong_not_alreadyIsNot() async {
resolveTestUnit('''
main(p) {
!(p is! String);
}
''');
- assertNoAssistAt('!(p', DartAssistKind.CONVERT_INTO_IS_NOT);
+ await assertNoAssistAt('!(p', DartAssistKind.CONVERT_INTO_IS_NOT);
}
- void test_convertToIsNot_wrong_not_noEnclosingParenthesis() {
+ test_convertToIsNot_wrong_not_noEnclosingParenthesis() async {
resolveTestUnit('''
main(p) {
!p;
}
''');
- assertNoAssistAt('!p', DartAssistKind.CONVERT_INTO_IS_NOT);
+ await assertNoAssistAt('!p', DartAssistKind.CONVERT_INTO_IS_NOT);
}
- void test_convertToIsNot_wrong_not_notIsExpression() {
+ test_convertToIsNot_wrong_not_notIsExpression() async {
resolveTestUnit('''
main(p) {
!(p == null);
}
''');
- assertNoAssistAt('!(p', DartAssistKind.CONVERT_INTO_IS_NOT);
+ await assertNoAssistAt('!(p', DartAssistKind.CONVERT_INTO_IS_NOT);
}
- void test_convertToIsNot_wrong_not_notTheNotOperator() {
+ test_convertToIsNot_wrong_not_notTheNotOperator() async {
verifyNoTestUnitErrors = false;
resolveTestUnit('''
main(p) {
++(p is String);
}
''');
- assertNoAssistAt('++(', DartAssistKind.CONVERT_INTO_IS_NOT);
+ await assertNoAssistAt('++(', DartAssistKind.CONVERT_INTO_IS_NOT);
}
- void test_convertToIsNotEmpty_OK_on_isEmpty() {
+ test_convertToIsNotEmpty_OK_on_isEmpty() async {
resolveTestUnit('''
main(String str) {
!str.isEmpty;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'isEmpty',
DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY,
'''
@@ -1703,13 +1715,13 @@ main(String str) {
''');
}
- void test_convertToIsNotEmpty_OK_on_str() {
+ test_convertToIsNotEmpty_OK_on_str() async {
resolveTestUnit('''
main(String str) {
!str.isEmpty;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'str.',
DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY,
'''
@@ -1719,13 +1731,13 @@ main(String str) {
''');
}
- void test_convertToIsNotEmpty_OK_propertyAccess() {
+ test_convertToIsNotEmpty_OK_propertyAccess() async {
resolveTestUnit('''
main(String str) {
!'text'.isEmpty;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'isEmpty',
DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY,
'''
@@ -1735,17 +1747,18 @@ main(String str) {
''');
}
- void test_convertToIsNotEmpty_wrong_noBang() {
+ test_convertToIsNotEmpty_wrong_noBang() async {
verifyNoTestUnitErrors = false;
resolveTestUnit('''
main(String str) {
~str.isEmpty;
}
''');
- assertNoAssistAt('isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
+ await assertNoAssistAt(
+ 'isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
}
- void test_convertToIsNotEmpty_wrong_noIsNotEmpty() {
+ test_convertToIsNotEmpty_wrong_noIsNotEmpty() async {
resolveTestUnit('''
class A {
bool get isEmpty => false;
@@ -1754,28 +1767,30 @@ main(A a) {
!a.isEmpty;
}
''');
- assertNoAssistAt('isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
+ await assertNoAssistAt(
+ 'isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
}
- void test_convertToIsNotEmpty_wrong_notInPrefixExpression() {
+ test_convertToIsNotEmpty_wrong_notInPrefixExpression() async {
resolveTestUnit('''
main(String str) {
str.isEmpty;
}
''');
- assertNoAssistAt('isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
+ await assertNoAssistAt(
+ 'isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
}
- void test_convertToIsNotEmpty_wrong_notIsEmpty() {
+ test_convertToIsNotEmpty_wrong_notIsEmpty() async {
resolveTestUnit('''
main(int p) {
!p.isEven;
}
''');
- assertNoAssistAt('isEven;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
+ await assertNoAssistAt('isEven;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
}
- void test_convertToNormalParameter_OK_dynamic() {
+ test_convertToNormalParameter_OK_dynamic() async {
resolveTestUnit('''
class A {
var test;
@@ -1783,7 +1798,7 @@ class A {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'test)',
DartAssistKind.CONVERT_TO_NORMAL_PARAMETER,
'''
@@ -1795,7 +1810,7 @@ class A {
''');
}
- void test_convertToNormalParameter_OK_firstInitializer() {
+ test_convertToNormalParameter_OK_firstInitializer() async {
resolveTestUnit('''
class A {
int test;
@@ -1803,7 +1818,7 @@ class A {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'test)',
DartAssistKind.CONVERT_TO_NORMAL_PARAMETER,
'''
@@ -1815,7 +1830,7 @@ class A {
''');
}
- void test_convertToNormalParameter_OK_secondInitializer() {
+ test_convertToNormalParameter_OK_secondInitializer() async {
resolveTestUnit('''
class A {
double aaa;
@@ -1823,7 +1838,7 @@ class A {
A(this.bbb) : aaa = 1.0;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'bbb)',
DartAssistKind.CONVERT_TO_NORMAL_PARAMETER,
'''
@@ -1835,7 +1850,7 @@ class A {
''');
}
- void test_encapsulateField_BAD_alreadyPrivate() {
+ test_encapsulateField_BAD_alreadyPrivate() async {
resolveTestUnit('''
class A {
int _test = 42;
@@ -1844,19 +1859,19 @@ main(A a) {
print(a._test);
}
''');
- assertNoAssistAt('_test =', DartAssistKind.ENCAPSULATE_FIELD);
+ await assertNoAssistAt('_test =', DartAssistKind.ENCAPSULATE_FIELD);
}
- void test_encapsulateField_BAD_final() {
+ test_encapsulateField_BAD_final() async {
resolveTestUnit('''
class A {
final int test = 42;
}
''');
- assertNoAssistAt('test =', DartAssistKind.ENCAPSULATE_FIELD);
+ await assertNoAssistAt('test =', DartAssistKind.ENCAPSULATE_FIELD);
}
- void test_encapsulateField_BAD_multipleFields() {
+ test_encapsulateField_BAD_multipleFields() async {
resolveTestUnit('''
class A {
int aaa, bbb, ccc;
@@ -1865,19 +1880,19 @@ main(A a) {
print(a.bbb);
}
''');
- assertNoAssistAt('bbb, ', DartAssistKind.ENCAPSULATE_FIELD);
+ await assertNoAssistAt('bbb, ', DartAssistKind.ENCAPSULATE_FIELD);
}
- void test_encapsulateField_BAD_notOnName() {
+ test_encapsulateField_BAD_notOnName() async {
resolveTestUnit('''
class A {
int test = 1 + 2 + 3;
}
''');
- assertNoAssistAt('+ 2', DartAssistKind.ENCAPSULATE_FIELD);
+ await assertNoAssistAt('+ 2', DartAssistKind.ENCAPSULATE_FIELD);
}
- void test_encapsulateField_BAD_parseError() {
+ test_encapsulateField_BAD_parseError() async {
verifyNoTestUnitErrors = false;
resolveTestUnit('''
class A {
@@ -1887,19 +1902,19 @@ main(A a) {
print(a.test);
}
''');
- assertNoAssistAt('; // marker', DartAssistKind.ENCAPSULATE_FIELD);
+ await assertNoAssistAt('; // marker', DartAssistKind.ENCAPSULATE_FIELD);
}
- void test_encapsulateField_BAD_static() {
+ test_encapsulateField_BAD_static() async {
resolveTestUnit('''
class A {
static int test = 42;
}
''');
- assertNoAssistAt('test =', DartAssistKind.ENCAPSULATE_FIELD);
+ await assertNoAssistAt('test =', DartAssistKind.ENCAPSULATE_FIELD);
}
- void test_encapsulateField_OK_hasType() {
+ test_encapsulateField_OK_hasType() async {
resolveTestUnit('''
class A {
int test = 42;
@@ -1909,7 +1924,7 @@ main(A a) {
print(a.test);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'test = 42',
DartAssistKind.ENCAPSULATE_FIELD,
'''
@@ -1929,7 +1944,7 @@ main(A a) {
''');
}
- void test_encapsulateField_OK_noType() {
+ test_encapsulateField_OK_noType() async {
resolveTestUnit('''
class A {
var test = 42;
@@ -1938,7 +1953,7 @@ main(A a) {
print(a.test);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'test = 42',
DartAssistKind.ENCAPSULATE_FIELD,
'''
@@ -1957,20 +1972,18 @@ main(A a) {
''');
}
- void test_exchangeBinaryExpressionArguments_OK_compare() {
- Map<String, String> operatorMap = {
- '<': '>',
- '<=': '>=',
- '>': '<',
- '>=': '<='
- };
- operatorMap.forEach((initialOperator, resultOperator) {
+ test_exchangeBinaryExpressionArguments_OK_compare() async {
+ const initialOperators = const ['<', '<=', '>', '>='];
+ const resultOperators = const ['>', '>=', '<', '<='];
+ for (int i = 0; i <= 0; i++) {
+ String initialOperator = initialOperators[i];
+ String resultOperator = resultOperators[i];
resolveTestUnit('''
bool main(int a, int b) {
return a $initialOperator b;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
initialOperator,
DartAssistKind.EXCHANGE_OPERANDS,
'''
@@ -1978,16 +1991,16 @@ bool main(int a, int b) {
return b $resultOperator a;
}
''');
- });
+ }
}
- void test_exchangeBinaryExpressionArguments_OK_extended_mixOperator_1() {
+ test_exchangeBinaryExpressionArguments_OK_extended_mixOperator_1() async {
resolveTestUnit('''
main() {
1 * 2 * 3 + 4;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'* 2',
DartAssistKind.EXCHANGE_OPERANDS,
'''
@@ -1997,13 +2010,13 @@ main() {
''');
}
- void test_exchangeBinaryExpressionArguments_OK_extended_mixOperator_2() {
+ test_exchangeBinaryExpressionArguments_OK_extended_mixOperator_2() async {
resolveTestUnit('''
main() {
1 + 2 - 3 + 4;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'+ 2',
DartAssistKind.EXCHANGE_OPERANDS,
'''
@@ -2013,13 +2026,13 @@ main() {
''');
}
- void test_exchangeBinaryExpressionArguments_OK_extended_sameOperator_afterFirst() {
+ test_exchangeBinaryExpressionArguments_OK_extended_sameOperator_afterFirst() async {
resolveTestUnit('''
main() {
1 + 2 + 3;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'+ 2',
DartAssistKind.EXCHANGE_OPERANDS,
'''
@@ -2029,13 +2042,13 @@ main() {
''');
}
- void test_exchangeBinaryExpressionArguments_OK_extended_sameOperator_afterSecond() {
+ test_exchangeBinaryExpressionArguments_OK_extended_sameOperator_afterSecond() async {
resolveTestUnit('''
main() {
1 + 2 + 3;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'+ 3',
DartAssistKind.EXCHANGE_OPERANDS,
'''
@@ -2045,13 +2058,13 @@ main() {
''');
}
- void test_exchangeBinaryExpressionArguments_OK_simple_afterOperator() {
+ test_exchangeBinaryExpressionArguments_OK_simple_afterOperator() async {
resolveTestUnit('''
main() {
1 + 2;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
' 2',
DartAssistKind.EXCHANGE_OPERANDS,
'''
@@ -2061,13 +2074,13 @@ main() {
''');
}
- void test_exchangeBinaryExpressionArguments_OK_simple_beforeOperator() {
+ test_exchangeBinaryExpressionArguments_OK_simple_beforeOperator() async {
resolveTestUnit('''
main() {
1 + 2;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'+ 2',
DartAssistKind.EXCHANGE_OPERANDS,
'''
@@ -2077,14 +2090,14 @@ main() {
''');
}
- void test_exchangeBinaryExpressionArguments_OK_simple_fullSelection() {
+ test_exchangeBinaryExpressionArguments_OK_simple_fullSelection() async {
resolveTestUnit('''
main() {
1 + 2;
}
''');
length = '1 + 2'.length;
- assertHasAssistAt(
+ await assertHasAssistAt(
'1 + 2',
DartAssistKind.EXCHANGE_OPERANDS,
'''
@@ -2094,14 +2107,14 @@ main() {
''');
}
- void test_exchangeBinaryExpressionArguments_OK_simple_withLength() {
+ test_exchangeBinaryExpressionArguments_OK_simple_withLength() async {
resolveTestUnit('''
main() {
1 + 2;
}
''');
length = 2;
- assertHasAssistAt(
+ await assertHasAssistAt(
'+ 2',
DartAssistKind.EXCHANGE_OPERANDS,
'''
@@ -2111,61 +2124,61 @@ main() {
''');
}
- void test_exchangeBinaryExpressionArguments_wrong_extraLength() {
+ test_exchangeBinaryExpressionArguments_wrong_extraLength() async {
resolveTestUnit('''
main() {
111 + 222;
}
''');
length = 3;
- assertNoAssistAt('+ 222', DartAssistKind.EXCHANGE_OPERANDS);
+ await assertNoAssistAt('+ 222', DartAssistKind.EXCHANGE_OPERANDS);
}
- void test_exchangeBinaryExpressionArguments_wrong_onOperand() {
+ test_exchangeBinaryExpressionArguments_wrong_onOperand() async {
resolveTestUnit('''
main() {
111 + 222;
}
''');
length = 3;
- assertNoAssistAt('11 +', DartAssistKind.EXCHANGE_OPERANDS);
+ await assertNoAssistAt('11 +', DartAssistKind.EXCHANGE_OPERANDS);
}
- void test_exchangeBinaryExpressionArguments_wrong_selectionWithBinary() {
+ test_exchangeBinaryExpressionArguments_wrong_selectionWithBinary() async {
resolveTestUnit('''
main() {
1 + 2 + 3;
}
''');
length = '1 + 2 + 3'.length;
- assertNoAssistAt('1 + 2 + 3', DartAssistKind.EXCHANGE_OPERANDS);
+ await assertNoAssistAt('1 + 2 + 3', DartAssistKind.EXCHANGE_OPERANDS);
}
- void test_importAddShow_BAD_hasShow() {
+ test_importAddShow_BAD_hasShow() async {
resolveTestUnit('''
import 'dart:math' show PI;
main() {
PI;
}
''');
- assertNoAssistAt('import ', DartAssistKind.IMPORT_ADD_SHOW);
+ await assertNoAssistAt('import ', DartAssistKind.IMPORT_ADD_SHOW);
}
- void test_importAddShow_BAD_unresolvedUri() {
+ test_importAddShow_BAD_unresolvedUri() async {
resolveTestUnit('''
import '/no/such/lib.dart';
''');
- assertNoAssistAt('import ', DartAssistKind.IMPORT_ADD_SHOW);
+ await assertNoAssistAt('import ', DartAssistKind.IMPORT_ADD_SHOW);
}
- void test_importAddShow_BAD_unused() {
+ test_importAddShow_BAD_unused() async {
resolveTestUnit('''
import 'dart:math';
''');
- assertNoAssistAt('import ', DartAssistKind.IMPORT_ADD_SHOW);
+ await assertNoAssistAt('import ', DartAssistKind.IMPORT_ADD_SHOW);
}
- void test_importAddShow_OK_hasUnresolvedIdentifier() {
+ test_importAddShow_OK_hasUnresolvedIdentifier() async {
resolveTestUnit('''
import 'dart:math';
main(x) {
@@ -2173,7 +2186,7 @@ main(x) {
return x.foo();
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'import ',
DartAssistKind.IMPORT_ADD_SHOW,
'''
@@ -2185,7 +2198,7 @@ main(x) {
''');
}
- void test_importAddShow_OK_onDirective() {
+ test_importAddShow_OK_onDirective() async {
resolveTestUnit('''
import 'dart:math';
main() {
@@ -2194,7 +2207,7 @@ main() {
max(1, 2);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'import ',
DartAssistKind.IMPORT_ADD_SHOW,
'''
@@ -2207,7 +2220,7 @@ main() {
''');
}
- void test_importAddShow_OK_onUri() {
+ test_importAddShow_OK_onUri() async {
resolveTestUnit('''
import 'dart:math';
main() {
@@ -2216,7 +2229,7 @@ main() {
max(1, 2);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'art:math',
DartAssistKind.IMPORT_ADD_SHOW,
'''
@@ -2229,27 +2242,27 @@ main() {
''');
}
- void test_introduceLocalTestedType_BAD_notBlock() {
+ test_introduceLocalTestedType_BAD_notBlock() async {
resolveTestUnit('''
main(p) {
if (p is String)
print('not a block');
}
''');
- assertNoAssistAt('if (p', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE);
+ await assertNoAssistAt('if (p', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE);
}
- void test_introduceLocalTestedType_BAD_notIsExpression() {
+ test_introduceLocalTestedType_BAD_notIsExpression() async {
resolveTestUnit('''
main(p) {
if (p == null) {
}
}
''');
- assertNoAssistAt('if (p', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE);
+ await assertNoAssistAt('if (p', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE);
}
- void test_introduceLocalTestedType_OK_if_is() {
+ test_introduceLocalTestedType_OK_if_is() async {
resolveTestUnit('''
class MyTypeName {}
main(p) {
@@ -2267,7 +2280,7 @@ main(p) {
p = null;
}
''';
- assertHasAssistAt(
+ await assertHasAssistAt(
'is MyType', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE, expected);
_assertLinkedGroup(
change.linkedEditGroups[0],
@@ -2275,11 +2288,11 @@ main(p) {
expectedSuggestions(LinkedEditSuggestionKind.VARIABLE,
['myTypeName', 'typeName', 'name']));
// another good location
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (p', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE, expected);
}
- void test_introduceLocalTestedType_OK_if_isNot() {
+ test_introduceLocalTestedType_OK_if_isNot() async {
resolveTestUnit('''
class MyTypeName {}
main(p) {
@@ -2297,7 +2310,7 @@ main(p) {
MyTypeName myTypeName = p;
}
''';
- assertHasAssistAt(
+ await assertHasAssistAt(
'is! MyType', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE, expected);
_assertLinkedGroup(
change.linkedEditGroups[0],
@@ -2305,11 +2318,11 @@ main(p) {
expectedSuggestions(LinkedEditSuggestionKind.VARIABLE,
['myTypeName', 'typeName', 'name']));
// another good location
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (p', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE, expected);
}
- void test_introduceLocalTestedType_OK_while() {
+ test_introduceLocalTestedType_OK_while() async {
resolveTestUnit('''
main(p) {
while (p is String) {
@@ -2325,20 +2338,20 @@ main(p) {
p = null;
}
''';
- assertHasAssistAt(
+ await assertHasAssistAt(
'is String', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE, expected);
- assertHasAssistAt(
+ await assertHasAssistAt(
'while (p', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE, expected);
}
- void test_invalidSelection() {
+ test_invalidSelection() async {
resolveTestUnit('');
List<Assist> assists =
- computeAssists(plugin, context, testUnit.element.source, -1, 0);
+ await computeAssists(plugin, context, testUnit.element.source, -1, 0);
expect(assists, isEmpty);
}
- void test_invertIfStatement_blocks() {
+ test_invertIfStatement_blocks() async {
resolveTestUnit('''
main() {
if (true) {
@@ -2348,7 +2361,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (',
DartAssistKind.INVERT_IF_STATEMENT,
'''
@@ -2362,7 +2375,7 @@ main() {
''');
}
- void test_invertIfStatement_statements() {
+ test_invertIfStatement_statements() async {
resolveTestUnit('''
main() {
if (true)
@@ -2371,7 +2384,7 @@ main() {
1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (',
DartAssistKind.INVERT_IF_STATEMENT,
'''
@@ -2384,7 +2397,7 @@ main() {
''');
}
- void test_joinIfStatementInner_OK_conditionAndOr() {
+ test_joinIfStatementInner_OK_conditionAndOr() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2394,7 +2407,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (1 ==',
DartAssistKind.JOIN_IF_WITH_INNER,
'''
@@ -2406,7 +2419,7 @@ main() {
''');
}
- void test_joinIfStatementInner_OK_conditionInvocation() {
+ test_joinIfStatementInner_OK_conditionInvocation() async {
resolveTestUnit('''
main() {
if (isCheck()) {
@@ -2417,7 +2430,7 @@ main() {
}
bool isCheck() => false;
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (isCheck',
DartAssistKind.JOIN_IF_WITH_INNER,
'''
@@ -2430,7 +2443,7 @@ bool isCheck() => false;
''');
}
- void test_joinIfStatementInner_OK_conditionOrAnd() {
+ test_joinIfStatementInner_OK_conditionOrAnd() async {
resolveTestUnit('''
main() {
if (1 == 1 || 2 == 2) {
@@ -2440,7 +2453,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (1 ==',
DartAssistKind.JOIN_IF_WITH_INNER,
'''
@@ -2452,7 +2465,7 @@ main() {
''');
}
- void test_joinIfStatementInner_OK_onCondition() {
+ test_joinIfStatementInner_OK_onCondition() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2462,7 +2475,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'1 ==',
DartAssistKind.JOIN_IF_WITH_INNER,
'''
@@ -2474,7 +2487,7 @@ main() {
''');
}
- void test_joinIfStatementInner_OK_simpleConditions_block_block() {
+ test_joinIfStatementInner_OK_simpleConditions_block_block() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2484,7 +2497,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (1 ==',
DartAssistKind.JOIN_IF_WITH_INNER,
'''
@@ -2496,7 +2509,7 @@ main() {
''');
}
- void test_joinIfStatementInner_OK_simpleConditions_block_single() {
+ test_joinIfStatementInner_OK_simpleConditions_block_single() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2505,7 +2518,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (1 ==',
DartAssistKind.JOIN_IF_WITH_INNER,
'''
@@ -2517,7 +2530,7 @@ main() {
''');
}
- void test_joinIfStatementInner_OK_simpleConditions_single_blockMulti() {
+ test_joinIfStatementInner_OK_simpleConditions_single_blockMulti() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2529,7 +2542,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (1 ==',
DartAssistKind.JOIN_IF_WITH_INNER,
'''
@@ -2543,7 +2556,7 @@ main() {
''');
}
- void test_joinIfStatementInner_OK_simpleConditions_single_blockOne() {
+ test_joinIfStatementInner_OK_simpleConditions_single_blockOne() async {
resolveTestUnit('''
main() {
if (1 == 1)
@@ -2552,7 +2565,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (1 ==',
DartAssistKind.JOIN_IF_WITH_INNER,
'''
@@ -2564,7 +2577,7 @@ main() {
''');
}
- void test_joinIfStatementInner_wrong_innerNotIf() {
+ test_joinIfStatementInner_wrong_innerNotIf() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2572,10 +2585,10 @@ main() {
}
}
''');
- assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+ await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
}
- void test_joinIfStatementInner_wrong_innerWithElse() {
+ test_joinIfStatementInner_wrong_innerWithElse() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2587,19 +2600,19 @@ main() {
}
}
''');
- assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+ await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
}
- void test_joinIfStatementInner_wrong_targetNotIf() {
+ test_joinIfStatementInner_wrong_targetNotIf() async {
resolveTestUnit('''
main() {
print(0);
}
''');
- assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_INNER);
+ await assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_INNER);
}
- void test_joinIfStatementInner_wrong_targetWithElse() {
+ test_joinIfStatementInner_wrong_targetWithElse() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2611,10 +2624,10 @@ main() {
}
}
''');
- assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+ await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
}
- void test_joinIfStatementOuter_OK_conditionAndOr() {
+ test_joinIfStatementOuter_OK_conditionAndOr() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2624,7 +2637,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (2 ==',
DartAssistKind.JOIN_IF_WITH_OUTER,
'''
@@ -2636,7 +2649,7 @@ main() {
''');
}
- void test_joinIfStatementOuter_OK_conditionInvocation() {
+ test_joinIfStatementOuter_OK_conditionInvocation() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2647,7 +2660,7 @@ main() {
}
bool isCheck() => false;
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (isCheck',
DartAssistKind.JOIN_IF_WITH_OUTER,
'''
@@ -2660,7 +2673,7 @@ bool isCheck() => false;
''');
}
- void test_joinIfStatementOuter_OK_conditionOrAnd() {
+ test_joinIfStatementOuter_OK_conditionOrAnd() async {
resolveTestUnit('''
main() {
if (1 == 1 || 2 == 2) {
@@ -2670,7 +2683,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (3 == 3',
DartAssistKind.JOIN_IF_WITH_OUTER,
'''
@@ -2682,7 +2695,7 @@ main() {
''');
}
- void test_joinIfStatementOuter_OK_onCondition() {
+ test_joinIfStatementOuter_OK_onCondition() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2692,7 +2705,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (2 == 2',
DartAssistKind.JOIN_IF_WITH_OUTER,
'''
@@ -2704,7 +2717,7 @@ main() {
''');
}
- void test_joinIfStatementOuter_OK_simpleConditions_block_block() {
+ test_joinIfStatementOuter_OK_simpleConditions_block_block() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2714,7 +2727,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (2 == 2',
DartAssistKind.JOIN_IF_WITH_OUTER,
'''
@@ -2726,7 +2739,7 @@ main() {
''');
}
- void test_joinIfStatementOuter_OK_simpleConditions_block_single() {
+ test_joinIfStatementOuter_OK_simpleConditions_block_single() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2735,7 +2748,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (2 == 2',
DartAssistKind.JOIN_IF_WITH_OUTER,
'''
@@ -2747,7 +2760,7 @@ main() {
''');
}
- void test_joinIfStatementOuter_OK_simpleConditions_single_blockMulti() {
+ test_joinIfStatementOuter_OK_simpleConditions_single_blockMulti() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2759,7 +2772,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (2 == 2',
DartAssistKind.JOIN_IF_WITH_OUTER,
'''
@@ -2773,7 +2786,7 @@ main() {
''');
}
- void test_joinIfStatementOuter_OK_simpleConditions_single_blockOne() {
+ test_joinIfStatementOuter_OK_simpleConditions_single_blockOne() async {
resolveTestUnit('''
main() {
if (1 == 1)
@@ -2782,7 +2795,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (2 == 2',
DartAssistKind.JOIN_IF_WITH_OUTER,
'''
@@ -2794,7 +2807,7 @@ main() {
''');
}
- void test_joinIfStatementOuter_wrong_outerNotIf() {
+ test_joinIfStatementOuter_wrong_outerNotIf() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2802,10 +2815,10 @@ main() {
}
}
''');
- assertNoAssistAt('if (1 == 1', DartAssistKind.JOIN_IF_WITH_OUTER);
+ await assertNoAssistAt('if (1 == 1', DartAssistKind.JOIN_IF_WITH_OUTER);
}
- void test_joinIfStatementOuter_wrong_outerWithElse() {
+ test_joinIfStatementOuter_wrong_outerWithElse() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2817,19 +2830,19 @@ main() {
}
}
''');
- assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
+ await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
}
- void test_joinIfStatementOuter_wrong_targetNotIf() {
+ test_joinIfStatementOuter_wrong_targetNotIf() async {
resolveTestUnit('''
main() {
print(0);
}
''');
- assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_OUTER);
+ await assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_OUTER);
}
- void test_joinIfStatementOuter_wrong_targetWithElse() {
+ test_joinIfStatementOuter_wrong_targetWithElse() async {
resolveTestUnit('''
main() {
if (1 == 1) {
@@ -2841,17 +2854,17 @@ main() {
}
}
''');
- assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
+ await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
}
- void test_joinVariableDeclaration_onAssignment_OK() {
+ test_joinVariableDeclaration_onAssignment_OK() async {
resolveTestUnit('''
main() {
var v;
v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.JOIN_VARIABLE_DECLARATION,
'''
@@ -2861,17 +2874,17 @@ main() {
''');
}
- void test_joinVariableDeclaration_onAssignment_wrong_hasInitializer() {
+ test_joinVariableDeclaration_onAssignment_wrong_hasInitializer() async {
resolveTestUnit('''
main() {
var v = 1;
v = 2;
}
''');
- assertNoAssistAt('v = 2', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v = 2', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onAssignment_wrong_notAdjacent() {
+ test_joinVariableDeclaration_onAssignment_wrong_notAdjacent() async {
resolveTestUnit('''
main() {
var v;
@@ -2879,49 +2892,50 @@ main() {
v = 1;
}
''');
- assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onAssignment_wrong_notAssignment() {
+ test_joinVariableDeclaration_onAssignment_wrong_notAssignment() async {
resolveTestUnit('''
main() {
var v;
v += 1;
}
''');
- assertNoAssistAt('v += 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v += 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onAssignment_wrong_notDeclaration() {
+ test_joinVariableDeclaration_onAssignment_wrong_notDeclaration() async {
resolveTestUnit('''
main(var v) {
v = 1;
}
''');
- assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onAssignment_wrong_notLeftArgument() {
+ test_joinVariableDeclaration_onAssignment_wrong_notLeftArgument() async {
resolveTestUnit('''
main() {
var v;
1 + v; // marker
}
''');
- assertNoAssistAt('v; // marker', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt(
+ 'v; // marker', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onAssignment_wrong_notOneVariable() {
+ test_joinVariableDeclaration_onAssignment_wrong_notOneVariable() async {
resolveTestUnit('''
main() {
var v, v2;
v = 1;
}
''');
- assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onAssignment_wrong_notResolved() {
+ test_joinVariableDeclaration_onAssignment_wrong_notResolved() async {
verifyNoTestUnitErrors = false;
resolveTestUnit('''
main() {
@@ -2929,10 +2943,10 @@ main() {
x = 1;
}
''');
- assertNoAssistAt('x = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('x = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onAssignment_wrong_notSameBlock() {
+ test_joinVariableDeclaration_onAssignment_wrong_notSameBlock() async {
resolveTestUnit('''
main() {
var v;
@@ -2941,17 +2955,17 @@ main() {
}
}
''');
- assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onDeclaration_OK_onName() {
+ test_joinVariableDeclaration_onDeclaration_OK_onName() async {
resolveTestUnit('''
main() {
var v;
v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v;',
DartAssistKind.JOIN_VARIABLE_DECLARATION,
'''
@@ -2961,14 +2975,14 @@ main() {
''');
}
- void test_joinVariableDeclaration_onDeclaration_OK_onType() {
+ test_joinVariableDeclaration_onDeclaration_OK_onType() async {
resolveTestUnit('''
main() {
int v;
v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'int v',
DartAssistKind.JOIN_VARIABLE_DECLARATION,
'''
@@ -2978,14 +2992,14 @@ main() {
''');
}
- void test_joinVariableDeclaration_onDeclaration_OK_onVar() {
+ test_joinVariableDeclaration_onDeclaration_OK_onVar() async {
resolveTestUnit('''
main() {
var v;
v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'var v',
DartAssistKind.JOIN_VARIABLE_DECLARATION,
'''
@@ -2995,73 +3009,73 @@ main() {
''');
}
- void test_joinVariableDeclaration_onDeclaration_wrong_hasInitializer() {
+ test_joinVariableDeclaration_onDeclaration_wrong_hasInitializer() async {
resolveTestUnit('''
main() {
var v = 1;
v = 2;
}
''');
- assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onDeclaration_wrong_lastStatement() {
+ test_joinVariableDeclaration_onDeclaration_wrong_lastStatement() async {
resolveTestUnit('''
main() {
if (true)
var v;
}
''');
- assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onDeclaration_wrong_nextNotAssignmentExpression() {
+ test_joinVariableDeclaration_onDeclaration_wrong_nextNotAssignmentExpression() async {
resolveTestUnit('''
main() {
var v;
42;
}
''');
- assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onDeclaration_wrong_nextNotExpressionStatement() {
+ test_joinVariableDeclaration_onDeclaration_wrong_nextNotExpressionStatement() async {
resolveTestUnit('''
main() {
var v;
if (true) return;
}
''');
- assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onDeclaration_wrong_nextNotPureAssignment() {
+ test_joinVariableDeclaration_onDeclaration_wrong_nextNotPureAssignment() async {
resolveTestUnit('''
main() {
var v;
v += 1;
}
''');
- assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_joinVariableDeclaration_onDeclaration_wrong_notOneVariable() {
+ test_joinVariableDeclaration_onDeclaration_wrong_notOneVariable() async {
resolveTestUnit('''
main() {
var v, v2;
v = 1;
}
''');
- assertNoAssistAt('v, ', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v, ', DartAssistKind.JOIN_VARIABLE_DECLARATION);
}
- void test_removeTypeAnnotation_classField_OK() {
+ test_removeTypeAnnotation_classField_OK() async {
resolveTestUnit('''
class A {
int v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v = ',
DartAssistKind.REMOVE_TYPE_ANNOTATION,
'''
@@ -3071,13 +3085,13 @@ class A {
''');
}
- void test_removeTypeAnnotation_classField_OK_final() {
+ test_removeTypeAnnotation_classField_OK_final() async {
resolveTestUnit('''
class A {
final int v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v = ',
DartAssistKind.REMOVE_TYPE_ANNOTATION,
'''
@@ -3087,13 +3101,13 @@ class A {
''');
}
- void test_removeTypeAnnotation_localVariable_OK() {
+ test_removeTypeAnnotation_localVariable_OK() async {
resolveTestUnit('''
main() {
int a = 1, b = 2;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'int ',
DartAssistKind.REMOVE_TYPE_ANNOTATION,
'''
@@ -3103,13 +3117,13 @@ main() {
''');
}
- void test_removeTypeAnnotation_localVariable_OK_const() {
+ test_removeTypeAnnotation_localVariable_OK_const() async {
resolveTestUnit('''
main() {
const int v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'int ',
DartAssistKind.REMOVE_TYPE_ANNOTATION,
'''
@@ -3119,13 +3133,13 @@ main() {
''');
}
- void test_removeTypeAnnotation_localVariable_OK_final() {
+ test_removeTypeAnnotation_localVariable_OK_final() async {
resolveTestUnit('''
main() {
final int v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'int ',
DartAssistKind.REMOVE_TYPE_ANNOTATION,
'''
@@ -3135,11 +3149,11 @@ main() {
''');
}
- void test_removeTypeAnnotation_topLevelVariable_OK() {
+ test_removeTypeAnnotation_topLevelVariable_OK() async {
resolveTestUnit('''
int V = 1;
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'int ',
DartAssistKind.REMOVE_TYPE_ANNOTATION,
'''
@@ -3147,11 +3161,11 @@ var V = 1;
''');
}
- void test_removeTypeAnnotation_topLevelVariable_OK_final() {
+ test_removeTypeAnnotation_topLevelVariable_OK_final() async {
resolveTestUnit('''
final int V = 1;
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'int ',
DartAssistKind.REMOVE_TYPE_ANNOTATION,
'''
@@ -3159,7 +3173,7 @@ final V = 1;
''');
}
- void test_replaceConditionalWithIfElse_OK_assignment() {
+ test_replaceConditionalWithIfElse_OK_assignment() async {
resolveTestUnit('''
main() {
var v;
@@ -3167,7 +3181,7 @@ main() {
}
''');
// on conditional
- assertHasAssistAt(
+ await assertHasAssistAt(
'11 :',
DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE,
'''
@@ -3181,7 +3195,7 @@ main() {
}
''');
// on variable
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE,
'''
@@ -3196,13 +3210,13 @@ main() {
''');
}
- void test_replaceConditionalWithIfElse_OK_return() {
+ test_replaceConditionalWithIfElse_OK_return() async {
resolveTestUnit('''
main() {
return true ? 111 : 222;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'return ',
DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE,
'''
@@ -3216,13 +3230,13 @@ main() {
''');
}
- void test_replaceConditionalWithIfElse_OK_variableDeclaration() {
+ test_replaceConditionalWithIfElse_OK_variableDeclaration() async {
resolveTestUnit('''
main() {
int a = 1, vvv = true ? 111 : 222, b = 2;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'11 :',
DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE,
'''
@@ -3237,23 +3251,25 @@ main() {
''');
}
- void test_replaceConditionalWithIfElse_wrong_noEnclosingStatement() {
+ test_replaceConditionalWithIfElse_wrong_noEnclosingStatement() async {
resolveTestUnit('''
var v = true ? 111 : 222;
''');
- assertNoAssistAt('? 111', DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE);
+ await assertNoAssistAt(
+ '? 111', DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE);
}
- void test_replaceConditionalWithIfElse_wrong_notConditional() {
+ test_replaceConditionalWithIfElse_wrong_notConditional() async {
resolveTestUnit('''
main() {
var v = 42;
}
''');
- assertNoAssistAt('v = 42', DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE);
+ await assertNoAssistAt(
+ 'v = 42', DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE);
}
- void test_replaceIfElseWithConditional_OK_assignment() {
+ test_replaceIfElseWithConditional_OK_assignment() async {
resolveTestUnit('''
main() {
int vvv;
@@ -3264,7 +3280,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (true)',
DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL,
'''
@@ -3275,7 +3291,7 @@ main() {
''');
}
- void test_replaceIfElseWithConditional_OK_return() {
+ test_replaceIfElseWithConditional_OK_return() async {
resolveTestUnit('''
main() {
if (true) {
@@ -3285,7 +3301,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'if (true)',
DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL,
'''
@@ -3295,7 +3311,7 @@ main() {
''');
}
- void test_replaceIfElseWithConditional_wrong_expressionVsReturn() {
+ test_replaceIfElseWithConditional_wrong_expressionVsReturn() async {
resolveTestUnit('''
main() {
if (true) {
@@ -3305,19 +3321,21 @@ main() {
}
}
''');
- assertNoAssistAt('else', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
+ await assertNoAssistAt(
+ 'else', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
}
- void test_replaceIfElseWithConditional_wrong_notIfStatement() {
+ test_replaceIfElseWithConditional_wrong_notIfStatement() async {
resolveTestUnit('''
main() {
print(0);
}
''');
- assertNoAssistAt('print', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
+ await assertNoAssistAt(
+ 'print', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
}
- void test_replaceIfElseWithConditional_wrong_notSingleStatement() {
+ test_replaceIfElseWithConditional_wrong_notSingleStatement() async {
resolveTestUnit('''
main() {
int vvv;
@@ -3330,11 +3348,11 @@ main() {
}
}
''');
- assertNoAssistAt(
+ await assertNoAssistAt(
'if (true)', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
}
- void test_splitAndCondition_OK_innerAndExpression() {
+ test_splitAndCondition_OK_innerAndExpression() async {
resolveTestUnit('''
main() {
if (1 == 1 && 2 == 2 && 3 == 3) {
@@ -3342,7 +3360,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'&& 2 == 2',
DartAssistKind.SPLIT_AND_CONDITION,
'''
@@ -3356,7 +3374,7 @@ main() {
''');
}
- void test_splitAndCondition_OK_thenBlock() {
+ test_splitAndCondition_OK_thenBlock() async {
resolveTestUnit('''
main() {
if (true && false) {
@@ -3367,7 +3385,7 @@ main() {
}
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'&& false',
DartAssistKind.SPLIT_AND_CONDITION,
'''
@@ -3384,14 +3402,14 @@ main() {
''');
}
- void test_splitAndCondition_OK_thenStatement() {
+ test_splitAndCondition_OK_thenStatement() async {
resolveTestUnit('''
main() {
if (true && false)
print(0);
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'&& false',
DartAssistKind.SPLIT_AND_CONDITION,
'''
@@ -3403,7 +3421,7 @@ main() {
''');
}
- void test_splitAndCondition_wrong() {
+ test_splitAndCondition_wrong() async {
resolveTestUnit('''
main() {
if (1 == 1 && 2 == 2) {
@@ -3413,15 +3431,15 @@ main() {
}
''');
// not binary expression
- assertNoAssistAt('main() {', DartAssistKind.SPLIT_AND_CONDITION);
+ await assertNoAssistAt('main() {', DartAssistKind.SPLIT_AND_CONDITION);
// selection is not empty and includes more than just operator
{
length = 5;
- assertNoAssistAt('&& 2 == 2', DartAssistKind.SPLIT_AND_CONDITION);
+ await assertNoAssistAt('&& 2 == 2', DartAssistKind.SPLIT_AND_CONDITION);
}
}
- void test_splitAndCondition_wrong_hasElse() {
+ test_splitAndCondition_wrong_hasElse() async {
resolveTestUnit('''
main() {
if (1 == 1 && 2 == 2) {
@@ -3431,10 +3449,10 @@ main() {
}
}
''');
- assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
+ await assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
}
- void test_splitAndCondition_wrong_notAnd() {
+ test_splitAndCondition_wrong_notAnd() async {
resolveTestUnit('''
main() {
if (1 == 1 || 2 == 2) {
@@ -3442,19 +3460,19 @@ main() {
}
}
''');
- assertNoAssistAt('|| 2', DartAssistKind.SPLIT_AND_CONDITION);
+ await assertNoAssistAt('|| 2', DartAssistKind.SPLIT_AND_CONDITION);
}
- void test_splitAndCondition_wrong_notPartOfIf() {
+ test_splitAndCondition_wrong_notPartOfIf() async {
resolveTestUnit('''
main() {
print(1 == 1 && 2 == 2);
}
''');
- assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
+ await assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
}
- void test_splitAndCondition_wrong_notTopLevelAnd() {
+ test_splitAndCondition_wrong_notTopLevelAnd() async {
resolveTestUnit('''
main() {
if (true || (1 == 1 && 2 == 2)) {
@@ -3465,17 +3483,17 @@ main() {
}
}
''');
- assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
- assertNoAssistAt('&& 4', DartAssistKind.SPLIT_AND_CONDITION);
+ await assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
+ await assertNoAssistAt('&& 4', DartAssistKind.SPLIT_AND_CONDITION);
}
- void test_splitVariableDeclaration_OK_onName() {
+ test_splitVariableDeclaration_OK_onName() async {
resolveTestUnit('''
main() {
var v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'v =',
DartAssistKind.SPLIT_VARIABLE_DECLARATION,
'''
@@ -3486,13 +3504,13 @@ main() {
''');
}
- void test_splitVariableDeclaration_OK_onType() {
+ test_splitVariableDeclaration_OK_onType() async {
resolveTestUnit('''
main() {
int v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'int ',
DartAssistKind.SPLIT_VARIABLE_DECLARATION,
'''
@@ -3503,13 +3521,13 @@ main() {
''');
}
- void test_splitVariableDeclaration_OK_onVar() {
+ test_splitVariableDeclaration_OK_onVar() async {
resolveTestUnit('''
main() {
var v = 1;
}
''');
- assertHasAssistAt(
+ await assertHasAssistAt(
'var ',
DartAssistKind.SPLIT_VARIABLE_DECLARATION,
'''
@@ -3520,16 +3538,16 @@ main() {
''');
}
- void test_splitVariableDeclaration_wrong_notOneVariable() {
+ test_splitVariableDeclaration_wrong_notOneVariable() async {
resolveTestUnit('''
main() {
var v = 1, v2;
}
''');
- assertNoAssistAt('v = 1', DartAssistKind.SPLIT_VARIABLE_DECLARATION);
+ await assertNoAssistAt('v = 1', DartAssistKind.SPLIT_VARIABLE_DECLARATION);
}
- void test_surroundWith_block() {
+ test_surroundWith_block() async {
resolveTestUnit('''
main() {
// start
@@ -3539,7 +3557,7 @@ main() {
}
''');
_setStartEndSelection();
- assertHasAssist(
+ await assertHasAssist(
DartAssistKind.SURROUND_WITH_BLOCK,
'''
main() {
@@ -3553,7 +3571,7 @@ main() {
''');
}
- void test_surroundWith_doWhile() {
+ test_surroundWith_doWhile() async {
resolveTestUnit('''
main() {
// start
@@ -3563,7 +3581,7 @@ main() {
}
''');
_setStartEndSelection();
- assertHasAssist(
+ await assertHasAssist(
DartAssistKind.SURROUND_WITH_DO_WHILE,
'''
main() {
@@ -3577,7 +3595,7 @@ main() {
''');
}
- void test_surroundWith_for() {
+ test_surroundWith_for() async {
resolveTestUnit('''
main() {
// start
@@ -3587,7 +3605,7 @@ main() {
}
''');
_setStartEndSelection();
- assertHasAssist(
+ await assertHasAssist(
DartAssistKind.SURROUND_WITH_FOR,
'''
main() {
@@ -3601,7 +3619,7 @@ main() {
''');
}
- void test_surroundWith_forIn() {
+ test_surroundWith_forIn() async {
resolveTestUnit('''
main() {
// start
@@ -3611,7 +3629,7 @@ main() {
}
''');
_setStartEndSelection();
- assertHasAssist(
+ await assertHasAssist(
DartAssistKind.SURROUND_WITH_FOR_IN,
'''
main() {
@@ -3625,7 +3643,7 @@ main() {
''');
}
- void test_surroundWith_if() {
+ test_surroundWith_if() async {
resolveTestUnit('''
main() {
// start
@@ -3635,7 +3653,7 @@ main() {
}
''');
_setStartEndSelection();
- assertHasAssist(
+ await assertHasAssist(
DartAssistKind.SURROUND_WITH_IF,
'''
main() {
@@ -3649,7 +3667,7 @@ main() {
''');
}
- void test_surroundWith_tryCatch() {
+ test_surroundWith_tryCatch() async {
resolveTestUnit('''
main() {
// start
@@ -3659,7 +3677,7 @@ main() {
}
''');
_setStartEndSelection();
- assertHasAssist(
+ await assertHasAssist(
DartAssistKind.SURROUND_WITH_TRY_CATCH,
'''
main() {
@@ -3675,7 +3693,7 @@ main() {
''');
}
- void test_surroundWith_tryFinally() {
+ test_surroundWith_tryFinally() async {
resolveTestUnit('''
main() {
// start
@@ -3685,7 +3703,7 @@ main() {
}
''');
_setStartEndSelection();
- assertHasAssist(
+ await assertHasAssist(
DartAssistKind.SURROUND_WITH_TRY_FINALLY,
'''
main() {
@@ -3701,7 +3719,7 @@ main() {
''');
}
- void test_surroundWith_while() {
+ test_surroundWith_while() async {
resolveTestUnit('''
main() {
// start
@@ -3711,7 +3729,7 @@ main() {
}
''');
_setStartEndSelection();
- assertHasAssist(
+ await assertHasAssist(
DartAssistKind.SURROUND_WITH_WHILE,
'''
main() {
@@ -3728,8 +3746,8 @@ main() {
/**
* Computes assists and verifies that there is an assist of the given kind.
*/
- Assist _assertHasAssist(AssistKind kind) {
- List<Assist> assists = computeAssists(
+ Future<Assist> _assertHasAssist(AssistKind kind) async {
+ List<Assist> assists = await computeAssists(
plugin, context, testUnit.element.source, offset, length);
for (Assist assist in assists) {
if (assist.kind == kind) {
« pkg/analysis_server/lib/plugin/edit/assist/assist_dart.dart ('K') | « pkg/analysis_server/test/edit/assists_test.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698