Skip to content

Commit b83072c

Browse files
bwilkersoncommit-bot@chromium.org
bwilkerson
authored and
[email protected]
committed
Clean up use of callFailingTest
Change-Id: I00ed46b48c03038825d62e1d9bac355bbe2354a7 Reviewed-on: https://dart-review.googlesource.com/68380 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
1 parent 8d3d82a commit b83072c

11 files changed

+459
-191
lines changed

‎pkg/analysis_server/test/analysis/notification_highlights_test.dart‎

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ main() {
253253
assertNoRegion(HighlightRegionType.BUILT_IN, 'get = 42');
254254
}
255255

256-
test_BUILT_IN_hide() async {
256+
Future<void> test_BUILT_IN_hide() async {
257257
addTestFile('''
258258
import 'foo.dart' hide Foo;
259259
main() {
@@ -276,7 +276,7 @@ main() {
276276
assertNoRegion(HighlightRegionType.BUILT_IN, 'implements = 42');
277277
}
278278

279-
test_BUILT_IN_import() async {
279+
Future<void> test_BUILT_IN_import() async {
280280
addTestFile('''
281281
import "foo.dart";
282282
main() {
@@ -298,7 +298,7 @@ main() {
298298
assertNoRegion(HighlightRegionType.BUILT_IN, 'library = 42');
299299
}
300300

301-
test_BUILT_IN_native() async {
301+
Future<void> test_BUILT_IN_native() async {
302302
addTestFile('''
303303
class A native "A_native" {}
304304
class B {
@@ -380,7 +380,7 @@ main() {
380380
assertNoRegion(HighlightRegionType.BUILT_IN, 'set = 42');
381381
}
382382

383-
test_BUILT_IN_show() async {
383+
Future<void> test_BUILT_IN_show() async {
384384
addTestFile('''
385385
import 'foo.dart' show Foo;
386386
main() {
@@ -537,7 +537,7 @@ main() {
537537
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(42)');
538538
}
539539

540-
test_DIRECTIVE() async {
540+
Future<void> test_DIRECTIVE() async {
541541
addTestFile('''
542542
library lib;
543543
import 'dart:math';
@@ -913,7 +913,7 @@ main(A a) {
913913
assertHasRegion(HighlightRegionType.FIELD, 'bbb = 2');
914914
}
915915

916-
test_TOP_LEVEL_VARIABLE() async {
916+
Future<void> test_TOP_LEVEL_VARIABLE() async {
917917
addTestFile('''
918918
const VVV = 0;
919919
@VVV // annotation
@@ -930,7 +930,7 @@ main() {
930930
assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV = 1');
931931
}
932932

933-
test_TYPE_NAME_DYNAMIC() async {
933+
Future<void> test_TYPE_NAME_DYNAMIC() async {
934934
addTestFile('''
935935
dynamic main() {
936936
dynamic = 42;
@@ -972,33 +972,50 @@ class AnalysisNotificationHighlightsTest_UseCFE
972972

973973
@failingTest
974974
@override
975-
test_BUILT_IN_hide() async => callFailingTest(super.test_BUILT_IN_hide());
975+
test_BUILT_IN_hide() async {
976+
fail('Timeout');
977+
// return callFailingTest(super.test_BUILT_IN_hide);
978+
}
976979

977980
@failingTest
978981
@override
979-
test_BUILT_IN_import() async => callFailingTest(super.test_BUILT_IN_import());
982+
test_BUILT_IN_import() async {
983+
fail('Timeout');
984+
// return callFailingTest(super.test_BUILT_IN_import);
985+
}
980986

981987
@failingTest
982988
@override
983-
test_BUILT_IN_native() async => callFailingTest(super.test_BUILT_IN_native());
989+
test_BUILT_IN_native() async {
990+
fail('Timeout');
991+
// return callFailingTest(super.test_BUILT_IN_native);
992+
}
984993

985994
@failingTest
986995
@override
987-
test_BUILT_IN_show() async => callFailingTest(super.test_BUILT_IN_show());
996+
test_BUILT_IN_show() async {
997+
fail('Timeout');
998+
// return callFailingTest(super.test_BUILT_IN_show);
999+
}
9881000

9891001
@failingTest
9901002
@override
991-
test_DIRECTIVE() async => callFailingTest(super.test_DIRECTIVE());
1003+
test_DIRECTIVE() async {
1004+
fail('Timeout');
1005+
// return callFailingTest(super.test_DIRECTIVE);
1006+
}
9921007

9931008
@failingTest
9941009
@override
9951010
test_TOP_LEVEL_VARIABLE() async =>
996-
callFailingTest(super.test_TOP_LEVEL_VARIABLE());
1011+
callFailingTest(super.test_TOP_LEVEL_VARIABLE);
9971012

9981013
@failingTest
9991014
@override
1000-
test_TYPE_NAME_DYNAMIC() async =>
1001-
callFailingTest(super.test_TYPE_NAME_DYNAMIC());
1015+
test_TYPE_NAME_DYNAMIC() async {
1016+
fail('Timeout');
1017+
// return callFailingTest(super.test_TYPE_NAME_DYNAMIC);
1018+
}
10021019
}
10031020

10041021
@reflectiveTest

‎pkg/analysis_server/test/analysis/notification_highlights_test2.dart‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ main() {
254254
assertNoRegion(HighlightRegionType.BUILT_IN, 'get = 42');
255255
}
256256

257-
test_BUILT_IN_hide() async {
257+
Future<void> test_BUILT_IN_hide() async {
258258
addTestFile('''
259259
import 'foo.dart' hide Foo;
260260
main() {
@@ -277,7 +277,7 @@ main() {
277277
assertNoRegion(HighlightRegionType.BUILT_IN, 'implements = 42');
278278
}
279279

280-
test_BUILT_IN_import() async {
280+
Future<void> test_BUILT_IN_import() async {
281281
addTestFile('''
282282
import "foo.dart";
283283
main() {
@@ -299,7 +299,7 @@ main() {
299299
assertNoRegion(HighlightRegionType.BUILT_IN, 'library = 42');
300300
}
301301

302-
test_BUILT_IN_native() async {
302+
Future<void> test_BUILT_IN_native() async {
303303
addTestFile('''
304304
class A native "A_native" {}
305305
class B {
@@ -381,7 +381,7 @@ main() {
381381
assertNoRegion(HighlightRegionType.BUILT_IN, 'set = 42');
382382
}
383383

384-
test_BUILT_IN_show() async {
384+
Future<void> test_BUILT_IN_show() async {
385385
addTestFile('''
386386
import 'foo.dart' show Foo;
387387
main() {
@@ -538,7 +538,7 @@ main() {
538538
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(42)');
539539
}
540540

541-
test_DIRECTIVE() async {
541+
Future<void> test_DIRECTIVE() async {
542542
addTestFile('''
543543
library lib;
544544
import 'dart:math';
@@ -1010,7 +1010,7 @@ main() {
10101010
HighlightRegionType.TOP_LEVEL_FUNCTION_REFERENCE, 'fff(42)');
10111011
}
10121012

1013-
test_TOP_LEVEL_VARIABLE() async {
1013+
Future<void> test_TOP_LEVEL_VARIABLE() async {
10141014
addTestFile('''
10151015
const V1 = 1;
10161016
var V2 = 2;
@@ -1031,7 +1031,7 @@ main() {
10311031
assertHasRegion(HighlightRegionType.TOP_LEVEL_SETTER_REFERENCE, 'V2 = 3');
10321032
}
10331033

1034-
test_TYPE_NAME_DYNAMIC() async {
1034+
Future<void> test_TYPE_NAME_DYNAMIC() async {
10351035
addTestFile('''
10361036
dynamic main() {
10371037
dynamic = 42;
@@ -1123,33 +1123,45 @@ class AnalysisNotificationHighlightsTest_UseCFE
11231123

11241124
@failingTest
11251125
@override
1126-
test_BUILT_IN_hide() async => callFailingTest(super.test_BUILT_IN_hide());
1127-
1128-
@failingTest
1129-
@override
1130-
test_BUILT_IN_import() async => callFailingTest(super.test_BUILT_IN_import());
1126+
test_BUILT_IN_hide() async {
1127+
fail('Timeout');
1128+
// return callFailingTest(super.test_BUILT_IN_hide);
1129+
}
11311130

11321131
@failingTest
11331132
@override
1134-
test_BUILT_IN_native() async => callFailingTest(super.test_BUILT_IN_native());
1133+
test_BUILT_IN_import() async {
1134+
fail('Timeout');
1135+
// return callFailingTest(super.test_BUILT_IN_import);
1136+
}
11351137

11361138
@failingTest
11371139
@override
1138-
test_BUILT_IN_show() async => callFailingTest(super.test_BUILT_IN_show());
1140+
test_BUILT_IN_native() async {
1141+
fail('Timeout');
1142+
// return callFailingTest(super.test_BUILT_IN_native);
1143+
}
11391144

11401145
@failingTest
11411146
@override
1142-
test_DIRECTIVE() async => callFailingTest(super.test_DIRECTIVE());
1147+
test_BUILT_IN_show() async {
1148+
fail('Timeout');
1149+
// return callFailingTest(super.test_BUILT_IN_show);
1150+
}
11431151

11441152
@failingTest
11451153
@override
1146-
test_TOP_LEVEL_VARIABLE() async =>
1147-
callFailingTest(super.test_TOP_LEVEL_VARIABLE());
1154+
test_DIRECTIVE() async {
1155+
fail('Timeout');
1156+
// return callFailingTest(super.test_DIRECTIVE);
1157+
}
11481158

11491159
@failingTest
11501160
@override
1151-
test_TYPE_NAME_DYNAMIC() async =>
1152-
callFailingTest(super.test_TYPE_NAME_DYNAMIC());
1161+
test_TYPE_NAME_DYNAMIC() async {
1162+
fail('Timeout');
1163+
// return callFailingTest(super.test_TYPE_NAME_DYNAMIC);
1164+
}
11531165
}
11541166

11551167
@reflectiveTest

‎pkg/analysis_server/test/analysis/notification_navigation_test.dart‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ library my.lib;
697697
assertHasTargetString('my.lib');
698698
}
699699

700-
test_multiplyDefinedElement() async {
700+
Future<void> test_multiplyDefinedElement() async {
701701
newFile('$projectPath/bin/libA.dart', content: 'library A; int TEST = 1;');
702702
newFile('$projectPath/bin/libB.dart', content: 'library B; int TEST = 2;');
703703
addTestFile('''
@@ -816,7 +816,7 @@ class A {
816816
assertHasFileTarget(libFile, libCode.indexOf('lib;'), 'lib'.length);
817817
}
818818

819-
test_string_export_unresolvedUri() async {
819+
Future<void> test_string_export_unresolvedUri() async {
820820
addTestFile('export "no.dart";');
821821
await prepareNavigation();
822822
assertNoRegionString('"no.dart"');
@@ -837,7 +837,7 @@ class A {
837837
assertNoRegionAt('import ;');
838838
}
839839

840-
test_string_import_unresolvedUri() async {
840+
Future<void> test_string_import_unresolvedUri() async {
841841
addTestFile('import "no.dart";');
842842
await prepareNavigation();
843843
assertNoRegionString('"no.dart"');
@@ -856,7 +856,7 @@ part "test_unit.dart";
856856
assertHasFileTarget(unitFile, 0, 0);
857857
}
858858

859-
test_string_part_unresolvedUri() async {
859+
Future<void> test_string_part_unresolvedUri() async {
860860
addTestFile('''
861861
library lib;
862862
part "test_unit.dart";
@@ -1062,8 +1062,10 @@ class AnalysisNotificationNavigationTest_UseCFE
10621062

10631063
@failingTest
10641064
@override
1065-
test_multiplyDefinedElement() async =>
1066-
callFailingTest(super.test_multiplyDefinedElement());
1065+
test_multiplyDefinedElement() async {
1066+
fail('Timeout');
1067+
// return callFailingTest(super.test_multiplyDefinedElement);
1068+
}
10671069

10681070
@failingTest
10691071
@override
@@ -1075,20 +1077,26 @@ class AnalysisNotificationNavigationTest_UseCFE
10751077

10761078
@failingTest
10771079
@override
1078-
test_string_export_unresolvedUri() async =>
1079-
callFailingTest(super.test_string_export_unresolvedUri());
1080+
test_string_export_unresolvedUri() async {
1081+
fail('Timeout');
1082+
// return callFailingTest(super.test_string_export_unresolvedUri);
1083+
}
10801084

10811085
@failingTest
10821086
@override
10831087
test_string_import() async => super.test_string_import();
10841088

10851089
@failingTest
10861090
@override
1087-
test_string_import_unresolvedUri() async =>
1088-
callFailingTest(super.test_string_import_unresolvedUri());
1091+
test_string_import_unresolvedUri() async {
1092+
fail('Timeout');
1093+
// return callFailingTest(super.test_string_import_unresolvedUri);
1094+
}
10891095

10901096
@failingTest
10911097
@override
1092-
test_string_part_unresolvedUri() async =>
1093-
callFailingTest(super.test_string_part_unresolvedUri());
1098+
test_string_part_unresolvedUri() async {
1099+
fail('Timeout');
1100+
// return callFailingTest(super.test_string_part_unresolvedUri);
1101+
}
10941102
}

‎pkg/analysis_server/test/analysis/notification_outline_test.dart‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ library my.lib;
8484
}
8585

8686
@failingTest
87-
test_libraryName_hasLibraryPartOfDirectives() async {
87+
Future<void> test_libraryName_hasLibraryPartOfDirectives() async {
8888
// This appears to have broken with the move to the new analysis driver.
8989
addTestFile('''
9090
part of lib.in.part.of;
@@ -95,7 +95,7 @@ library my.lib;
9595
expect(libraryName, 'my.lib');
9696
}
9797

98-
test_libraryName_hasPartOfDirective() async {
98+
Future<void> test_libraryName_hasPartOfDirective() async {
9999
addTestFile('''
100100
part of my.lib;
101101
''');
@@ -143,11 +143,15 @@ class AnalysisNotificationOutlineTest_UseCFE
143143

144144
@failingTest
145145
@override
146-
test_libraryName_hasLibraryPartOfDirectives() async =>
147-
callFailingTest(super.test_libraryName_hasLibraryPartOfDirectives());
146+
test_libraryName_hasLibraryPartOfDirectives() async {
147+
fail('Timeout');
148+
// return callFailingTest(super.test_libraryName_hasLibraryPartOfDirectives);
149+
}
148150

149151
@failingTest
150152
@override
151-
test_libraryName_hasPartOfDirective() async =>
152-
callFailingTest(super.test_libraryName_hasPartOfDirective());
153+
test_libraryName_hasPartOfDirective() async {
154+
fail('Timeout');
155+
// return callFailingTest(super.test_libraryName_hasPartOfDirective);
156+
}
153157
}

‎pkg/analysis_server/test/analysis/notification_overrides_test.dart‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ class B extends A {
597597
assertNoInterfaceMembers();
598598
}
599599

600-
test_super_method_superTypeCycle() async {
600+
Future<void> test_super_method_superTypeCycle() async {
601601
addTestFile('''
602602
class A extends B {
603603
m() {} // in A
@@ -646,6 +646,8 @@ class AnalysisNotificationOverridesTest_UseCFE
646646

647647
@failingTest
648648
@override
649-
test_super_method_superTypeCycle() async =>
650-
callFailingTest(super.test_super_method_superTypeCycle());
649+
test_super_method_superTypeCycle() async {
650+
fail('Timeout');
651+
// return callFailingTest(super.test_super_method_superTypeCycle);
652+
}
651653
}

0 commit comments

Comments
 (0)