Skip to content

Commit

Permalink
Add await to all assertErrors/assertNoErrorsInCode tests.
Browse files Browse the repository at this point in the history
R=brianwilkerson@google.com

Change-Id: I5bf1b77ba5224ae5b250a3aa849c1e6da057ac3d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109480
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
  • Loading branch information
scheglov authored and commit-bot@chromium.org committed Jul 17, 2019
1 parent 8e17249 commit 8dc4148
Show file tree
Hide file tree
Showing 18 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion pkg/analyzer/test/generated/compile_time_error_code.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,7 @@ var b2 = const bool.fromEnvironment('x', defaultValue: 1);
// The type of the defaultValue needs to be correct even when the default
// value isn't used (because the variable is defined in the environment).
driver.declaredVariables = new DeclaredVariables.fromMap({'x': 'true'});
assertErrorsInCode('''
await assertErrorsInCode('''
var b = const bool.fromEnvironment('x', defaultValue: 1);
''', [
error(CompileTimeErrorCode.CONST_EVAL_THROWS_EXCEPTION, 8, 48),
Expand Down
4 changes: 2 additions & 2 deletions pkg/analyzer/test/generated/resolver_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class EnclosedScopeTest extends DriverResolutionTest {
@reflectiveTest
class ErrorResolverTest extends DriverResolutionTest {
test_breakLabelOnSwitchMember() async {
assertErrorsInCode(r'''
await assertErrorsInCode(r'''
class A {
void m(int i) {
switch (i) {
Expand All @@ -187,7 +187,7 @@ class A {
}

test_continueLabelOnSwitch() async {
assertErrorsInCode(r'''
await assertErrorsInCode(r'''
class A {
void m(int i) {
l: switch (i) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/analyzer/test/generated/static_warning_code_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ main(void x) sync* {
test_importDuplicatedLibraryNamed() async {
newFile("/test/lib/lib1.dart", content: "library lib;");
newFile("/test/lib/lib2.dart", content: "library lib;");
assertErrorsInCode('''
await assertErrorsInCode('''
library test;
import 'lib1.dart';
import 'lib2.dart';''', [
Expand All @@ -773,7 +773,7 @@ import 'lib2.dart';''', [
newFile("/test/lib/lib1.dart", content: '''
part of lib;
class A {}''');
assertErrorsInCode('''
await assertErrorsInCode('''
library lib;
import 'lib1.dart' deferred as p;
var a = new p.A();''', [
Expand Down
2 changes: 1 addition & 1 deletion pkg/analyzer/test/src/dart/resolution/namespace_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ImportResolutionTest extends DriverResolutionTest {
newFile('/test/lib/declares_never.dart', content: '''
class Never {}
''');
assertNoErrorsInCode(r'''
await assertNoErrorsInCode(r'''
import 'declares_never.dart';
Never f() => throw 'foo';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ main() {
@reflectiveTest
class AmbiguousSetOrMapLiteralBothTest extends DriverResolutionTest {
test_setAndMap() async {
assertErrorsInCode('''
await assertErrorsInCode('''
Map<int, int> map;
Set<int> set;
var c = {...set, ...map};
Expand All @@ -39,7 +39,7 @@ union(a, b) => !{...a, ...b};
}

test_setAndMap() async {
assertErrorsInCode('''
await assertErrorsInCode('''
var map;
var set;
var c = {...set, ...map};
Expand Down
28 changes: 14 additions & 14 deletions pkg/analyzer/test/src/diagnostics/deprecated_member_use_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ library deprecated_library;
class A {}
''');

assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'deprecated_library.dart';
f(A a) {}
''', [HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE],
Expand All @@ -43,7 +43,7 @@ library deprecated_library;
class A {}
''');

assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'deprecated_library.dart';
f(A a) {}
''', [HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE],
Expand Down Expand Up @@ -127,7 +127,7 @@ library deprecated_library;
class A {}
''');

assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'deprecated_library.dart';
f(A a) {}
''', [HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE],
Expand Down Expand Up @@ -300,7 +300,7 @@ class A {
}

test_methodInvocation_constructor() async {
assertErrorsInCode(r'''
await assertErrorsInCode(r'''
class A {
@Deprecated('0.9')
m() {}
Expand Down Expand Up @@ -333,7 +333,7 @@ library deprecated_library;
class A {}
''');

assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'deprecated_library.dart';
f(A a) {}
''', [HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE],
Expand Down Expand Up @@ -458,7 +458,7 @@ library deprecated_library;
class A {}
''');

assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'package:foo/foo.dart';
f(A a) {}
''', // This is a cross-package deprecated member usage.
Expand All @@ -477,7 +477,7 @@ class A {}
newFile('/workspace/project/BUILD');
newFolder('/workspace/bazel-genfiles');

assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'package:foo/foo.dart';
f(A a) {}
''', // This is a cross-package deprecated member usage.
Expand All @@ -497,7 +497,7 @@ library deprecated_library;
class A {}
''');

assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import '../../project_a/lib/deprecated_library.dart';
f(A a) {}
''', // This is a same-workspace, cross-package deprecated member usage.
Expand All @@ -513,7 +513,7 @@ class A {}
''');

newPubPackage('/pkg1');
assertErrorsInCode('''
await assertErrorsInCode('''
export 'package:foo/foo.dart';
''', [HintCode.DEPRECATED_MEMBER_USE], sourceName: '/pkg1/lib/lib1.dart');
}
Expand All @@ -534,7 +534,7 @@ class A {}
'BAR=bar\n');
newFile('/workspace/out/debug-x87_128/dartlang/gen/project/foo.packages');

assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'package:foo/foo.dart';
f(A a) {}
''', // This is a cross-package deprecated member usage.
Expand All @@ -560,7 +560,7 @@ library deprecated_library;
class A {}
''');

assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import '../../project_a/lib/deprecated_library.dart';
f(A a) {}
''', // This is a same-workspace, cross-package deprecated member usage.
Expand Down Expand Up @@ -596,7 +596,7 @@ class A {
''');

newPubPackage('/pkg1');
assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'package:foo/foo.dart';
void main() => A().m();
''', [HintCode.DEPRECATED_MEMBER_USE], sourceName: '/pkg1/lib/lib1.dart');
Expand All @@ -611,7 +611,7 @@ class A {
''');

newPubPackage('/pkg1');
assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'package:foo/foo.dart';
void main() => A().m();
''', [HintCode.DEPRECATED_MEMBER_USE], sourceName: '/pkg1/lib/lib1.dart');
Expand All @@ -626,7 +626,7 @@ class A {}

newFolder('/workspace/.dart_tool/build/generated/project/lib');
newFileWithBytes('/workspace/pubspec.yaml', 'name: project'.codeUnits);
assertErrorsInCode(r'''
await assertErrorsInCode(r'''
import 'package:foo/foo.dart';
f(A a) {}
''', // This is a cross-package deprecated member usage.
Expand Down
32 changes: 16 additions & 16 deletions pkg/analyzer/test/src/diagnostics/final_not_initialized_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,68 +26,68 @@ class FinalNotInitializedWithNnbdTest extends DriverResolutionTest {
..contextFeatures = new FeatureSet.forTesting(
sdkVersion: '2.3.0', additionalFeatures: [Feature.non_nullable]);

test_field_noConstructor_initializer() {
assertNoErrorsInCode('''
test_field_noConstructor_initializer() async {
await assertNoErrorsInCode('''
class C {
late final f = 1;
}
''');
}

test_field_noConstructor_noInitializer() {
assertNoErrorsInCode('''
test_field_noConstructor_noInitializer() async {
await assertNoErrorsInCode('''
class C {
late final f;
}
''');
}

test_field_unnamedConstructor_constructorInitializer() {
assertNoErrorsInCode('''
test_field_unnamedConstructor_constructorInitializer() async {
await assertNoErrorsInCode('''
class C {
late final f;
C() : f = 2;
}
''');
}

test_field_unnamedConstructor_fieldFormalParameter() {
assertNoErrorsInCode('''
test_field_unnamedConstructor_fieldFormalParameter() async {
await assertNoErrorsInCode('''
class C {
late final f;
C(this.f);
}
''');
}

test_field_unnamedConstructor_initializer() {
assertNoErrorsInCode('''
test_field_unnamedConstructor_initializer() async {
await assertNoErrorsInCode('''
class C {
late final f = 1;
C();
}
''');
}

test_field_unnamedConstructor_noInitializer() {
assertNoErrorsInCode('''
test_field_unnamedConstructor_noInitializer() async {
await assertNoErrorsInCode('''
class C {
late final f;
C();
}
''');
}

test_localVariable_initializer() {
assertNoErrorsInCode('''
test_localVariable_initializer() async {
await assertNoErrorsInCode('''
f() {
late final x = 1;
}
''');
}

test_localVariable_noInitializer() {
assertNoErrorsInCode('''
test_localVariable_noInitializer() async {
await assertNoErrorsInCode('''
f() {
late final x;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ main() {
@reflectiveTest
class NonBoolConditionTest extends DriverResolutionTest {
test_ifElement() async {
assertErrorsInCode(
await assertErrorsInCode(
'''
const c = [if (3) 1];
''',
Expand Down
4 changes: 2 additions & 2 deletions pkg/analyzer/test/src/diagnostics/non_null_opt_out_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ class NonNullOptOutTest extends DriverResolutionTest {
sdkVersion: '2.3.0', additionalFeatures: [Feature.non_nullable]);

test_nnbd_optOut_invalidSyntax() async {
assertErrorsInCode('''
await assertErrorsInCode('''
// @dart = 2.2
// NNBD syntax is not allowed
f(x, z) { (x is String?) ? x : z; }
''', [error(ParserErrorCode.EXPERIMENT_NOT_ENABLED, 67, 1)]);
}

test_nnbd_optOut_late() async {
assertNoErrorsInCode('''
await assertNoErrorsInCode('''
// @dart = 2.2
class C {
// "late" is allowed as an identifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class NotInitializedNonNullableStaticFieldTest extends DriverResolutionTest {
AnalysisOptionsImpl()..enabledExperiments = [EnableString.non_nullable];

test_futureOr_questionArgument_none() async {
assertNoErrorsInCode('''
await assertNoErrorsInCode('''
import 'dart:async';
class A {
Expand All @@ -32,15 +32,15 @@ class A {
}

test_hasInitializer() async {
assertNoErrorsInCode('''
await assertNoErrorsInCode('''
class A {
static int v = 0;
}
''');
}

test_noInitializer() async {
assertErrorsInCode('''
await assertErrorsInCode('''
class A {
static int x = 0, y, z = 2;
}
Expand All @@ -51,31 +51,31 @@ class A {
}

test_nullable() async {
assertNoErrorsInCode('''
await assertNoErrorsInCode('''
class A {
static int? v;
}
''');
}

test_type_dynamic() async {
assertNoErrorsInCode('''
await assertNoErrorsInCode('''
class A {
static dynamic v;
}
''');
}

test_type_dynamic_implicit() async {
assertNoErrorsInCode('''
await assertNoErrorsInCode('''
class A {
static var v;
}
''');
}

test_type_never() async {
assertErrorsInCode('''
await assertErrorsInCode('''
class A {
static Never v;
}
Expand All @@ -86,7 +86,7 @@ class A {
}

test_type_void() async {
assertNoErrorsInCode('''
await assertNoErrorsInCode('''
class A {
static void v;
}
Expand Down
Loading

0 comments on commit 8dc4148

Please sign in to comment.