Skip to content

Commit

Permalink
Clean up use of callFailingTest
Browse files Browse the repository at this point in the history
Change-Id: I00ed46b48c03038825d62e1d9bac355bbe2354a7
Reviewed-on: https://dart-review.googlesource.com/68380
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
  • Loading branch information
bwilkerson authored and commit-bot@chromium.org committed Aug 3, 2018
1 parent 8d3d82a commit b83072c
Show file tree
Hide file tree
Showing 11 changed files with 459 additions and 191 deletions.
47 changes: 32 additions & 15 deletions pkg/analysis_server/test/analysis/notification_highlights_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ main() {
assertNoRegion(HighlightRegionType.BUILT_IN, 'get = 42');
}

test_BUILT_IN_hide() async {
Future<void> test_BUILT_IN_hide() async {
addTestFile('''
import 'foo.dart' hide Foo;
main() {
Expand All @@ -276,7 +276,7 @@ main() {
assertNoRegion(HighlightRegionType.BUILT_IN, 'implements = 42');
}

test_BUILT_IN_import() async {
Future<void> test_BUILT_IN_import() async {
addTestFile('''
import "foo.dart";
main() {
Expand All @@ -298,7 +298,7 @@ main() {
assertNoRegion(HighlightRegionType.BUILT_IN, 'library = 42');
}

test_BUILT_IN_native() async {
Future<void> test_BUILT_IN_native() async {
addTestFile('''
class A native "A_native" {}
class B {
Expand Down Expand Up @@ -380,7 +380,7 @@ main() {
assertNoRegion(HighlightRegionType.BUILT_IN, 'set = 42');
}

test_BUILT_IN_show() async {
Future<void> test_BUILT_IN_show() async {
addTestFile('''
import 'foo.dart' show Foo;
main() {
Expand Down Expand Up @@ -537,7 +537,7 @@ main() {
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(42)');
}

test_DIRECTIVE() async {
Future<void> test_DIRECTIVE() async {
addTestFile('''
library lib;
import 'dart:math';
Expand Down Expand Up @@ -913,7 +913,7 @@ main(A a) {
assertHasRegion(HighlightRegionType.FIELD, 'bbb = 2');
}

test_TOP_LEVEL_VARIABLE() async {
Future<void> test_TOP_LEVEL_VARIABLE() async {
addTestFile('''
const VVV = 0;
@VVV // annotation
Expand All @@ -930,7 +930,7 @@ main() {
assertHasRegion(HighlightRegionType.TOP_LEVEL_VARIABLE, 'VVV = 1');
}

test_TYPE_NAME_DYNAMIC() async {
Future<void> test_TYPE_NAME_DYNAMIC() async {
addTestFile('''
dynamic main() {
dynamic = 42;
Expand Down Expand Up @@ -972,33 +972,50 @@ class AnalysisNotificationHighlightsTest_UseCFE

@failingTest
@override
test_BUILT_IN_hide() async => callFailingTest(super.test_BUILT_IN_hide());
test_BUILT_IN_hide() async {
fail('Timeout');
// return callFailingTest(super.test_BUILT_IN_hide);
}

@failingTest
@override
test_BUILT_IN_import() async => callFailingTest(super.test_BUILT_IN_import());
test_BUILT_IN_import() async {
fail('Timeout');
// return callFailingTest(super.test_BUILT_IN_import);
}

@failingTest
@override
test_BUILT_IN_native() async => callFailingTest(super.test_BUILT_IN_native());
test_BUILT_IN_native() async {
fail('Timeout');
// return callFailingTest(super.test_BUILT_IN_native);
}

@failingTest
@override
test_BUILT_IN_show() async => callFailingTest(super.test_BUILT_IN_show());
test_BUILT_IN_show() async {
fail('Timeout');
// return callFailingTest(super.test_BUILT_IN_show);
}

@failingTest
@override
test_DIRECTIVE() async => callFailingTest(super.test_DIRECTIVE());
test_DIRECTIVE() async {
fail('Timeout');
// return callFailingTest(super.test_DIRECTIVE);
}

@failingTest
@override
test_TOP_LEVEL_VARIABLE() async =>
callFailingTest(super.test_TOP_LEVEL_VARIABLE());
callFailingTest(super.test_TOP_LEVEL_VARIABLE);

@failingTest
@override
test_TYPE_NAME_DYNAMIC() async =>
callFailingTest(super.test_TYPE_NAME_DYNAMIC());
test_TYPE_NAME_DYNAMIC() async {
fail('Timeout');
// return callFailingTest(super.test_TYPE_NAME_DYNAMIC);
}
}

@reflectiveTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ main() {
assertNoRegion(HighlightRegionType.BUILT_IN, 'get = 42');
}

test_BUILT_IN_hide() async {
Future<void> test_BUILT_IN_hide() async {
addTestFile('''
import 'foo.dart' hide Foo;
main() {
Expand All @@ -277,7 +277,7 @@ main() {
assertNoRegion(HighlightRegionType.BUILT_IN, 'implements = 42');
}

test_BUILT_IN_import() async {
Future<void> test_BUILT_IN_import() async {
addTestFile('''
import "foo.dart";
main() {
Expand All @@ -299,7 +299,7 @@ main() {
assertNoRegion(HighlightRegionType.BUILT_IN, 'library = 42');
}

test_BUILT_IN_native() async {
Future<void> test_BUILT_IN_native() async {
addTestFile('''
class A native "A_native" {}
class B {
Expand Down Expand Up @@ -381,7 +381,7 @@ main() {
assertNoRegion(HighlightRegionType.BUILT_IN, 'set = 42');
}

test_BUILT_IN_show() async {
Future<void> test_BUILT_IN_show() async {
addTestFile('''
import 'foo.dart' show Foo;
main() {
Expand Down Expand Up @@ -538,7 +538,7 @@ main() {
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(42)');
}

test_DIRECTIVE() async {
Future<void> test_DIRECTIVE() async {
addTestFile('''
library lib;
import 'dart:math';
Expand Down Expand Up @@ -1010,7 +1010,7 @@ main() {
HighlightRegionType.TOP_LEVEL_FUNCTION_REFERENCE, 'fff(42)');
}

test_TOP_LEVEL_VARIABLE() async {
Future<void> test_TOP_LEVEL_VARIABLE() async {
addTestFile('''
const V1 = 1;
var V2 = 2;
Expand All @@ -1031,7 +1031,7 @@ main() {
assertHasRegion(HighlightRegionType.TOP_LEVEL_SETTER_REFERENCE, 'V2 = 3');
}

test_TYPE_NAME_DYNAMIC() async {
Future<void> test_TYPE_NAME_DYNAMIC() async {
addTestFile('''
dynamic main() {
dynamic = 42;
Expand Down Expand Up @@ -1123,33 +1123,45 @@ class AnalysisNotificationHighlightsTest_UseCFE

@failingTest
@override
test_BUILT_IN_hide() async => callFailingTest(super.test_BUILT_IN_hide());

@failingTest
@override
test_BUILT_IN_import() async => callFailingTest(super.test_BUILT_IN_import());
test_BUILT_IN_hide() async {
fail('Timeout');
// return callFailingTest(super.test_BUILT_IN_hide);
}

@failingTest
@override
test_BUILT_IN_native() async => callFailingTest(super.test_BUILT_IN_native());
test_BUILT_IN_import() async {
fail('Timeout');
// return callFailingTest(super.test_BUILT_IN_import);
}

@failingTest
@override
test_BUILT_IN_show() async => callFailingTest(super.test_BUILT_IN_show());
test_BUILT_IN_native() async {
fail('Timeout');
// return callFailingTest(super.test_BUILT_IN_native);
}

@failingTest
@override
test_DIRECTIVE() async => callFailingTest(super.test_DIRECTIVE());
test_BUILT_IN_show() async {
fail('Timeout');
// return callFailingTest(super.test_BUILT_IN_show);
}

@failingTest
@override
test_TOP_LEVEL_VARIABLE() async =>
callFailingTest(super.test_TOP_LEVEL_VARIABLE());
test_DIRECTIVE() async {
fail('Timeout');
// return callFailingTest(super.test_DIRECTIVE);
}

@failingTest
@override
test_TYPE_NAME_DYNAMIC() async =>
callFailingTest(super.test_TYPE_NAME_DYNAMIC());
test_TYPE_NAME_DYNAMIC() async {
fail('Timeout');
// return callFailingTest(super.test_TYPE_NAME_DYNAMIC);
}
}

@reflectiveTest
Expand Down
32 changes: 20 additions & 12 deletions pkg/analysis_server/test/analysis/notification_navigation_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ library my.lib;
assertHasTargetString('my.lib');
}

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

test_string_export_unresolvedUri() async {
Future<void> test_string_export_unresolvedUri() async {
addTestFile('export "no.dart";');
await prepareNavigation();
assertNoRegionString('"no.dart"');
Expand All @@ -837,7 +837,7 @@ class A {
assertNoRegionAt('import ;');
}

test_string_import_unresolvedUri() async {
Future<void> test_string_import_unresolvedUri() async {
addTestFile('import "no.dart";');
await prepareNavigation();
assertNoRegionString('"no.dart"');
Expand All @@ -856,7 +856,7 @@ part "test_unit.dart";
assertHasFileTarget(unitFile, 0, 0);
}

test_string_part_unresolvedUri() async {
Future<void> test_string_part_unresolvedUri() async {
addTestFile('''
library lib;
part "test_unit.dart";
Expand Down Expand Up @@ -1062,8 +1062,10 @@ class AnalysisNotificationNavigationTest_UseCFE

@failingTest
@override
test_multiplyDefinedElement() async =>
callFailingTest(super.test_multiplyDefinedElement());
test_multiplyDefinedElement() async {
fail('Timeout');
// return callFailingTest(super.test_multiplyDefinedElement);
}

@failingTest
@override
Expand All @@ -1075,20 +1077,26 @@ class AnalysisNotificationNavigationTest_UseCFE

@failingTest
@override
test_string_export_unresolvedUri() async =>
callFailingTest(super.test_string_export_unresolvedUri());
test_string_export_unresolvedUri() async {
fail('Timeout');
// return callFailingTest(super.test_string_export_unresolvedUri);
}

@failingTest
@override
test_string_import() async => super.test_string_import();

@failingTest
@override
test_string_import_unresolvedUri() async =>
callFailingTest(super.test_string_import_unresolvedUri());
test_string_import_unresolvedUri() async {
fail('Timeout');
// return callFailingTest(super.test_string_import_unresolvedUri);
}

@failingTest
@override
test_string_part_unresolvedUri() async =>
callFailingTest(super.test_string_part_unresolvedUri());
test_string_part_unresolvedUri() async {
fail('Timeout');
// return callFailingTest(super.test_string_part_unresolvedUri);
}
}
16 changes: 10 additions & 6 deletions pkg/analysis_server/test/analysis/notification_outline_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ library my.lib;
}

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

test_libraryName_hasPartOfDirective() async {
Future<void> test_libraryName_hasPartOfDirective() async {
addTestFile('''
part of my.lib;
''');
Expand Down Expand Up @@ -143,11 +143,15 @@ class AnalysisNotificationOutlineTest_UseCFE

@failingTest
@override
test_libraryName_hasLibraryPartOfDirectives() async =>
callFailingTest(super.test_libraryName_hasLibraryPartOfDirectives());
test_libraryName_hasLibraryPartOfDirectives() async {
fail('Timeout');
// return callFailingTest(super.test_libraryName_hasLibraryPartOfDirectives);
}

@failingTest
@override
test_libraryName_hasPartOfDirective() async =>
callFailingTest(super.test_libraryName_hasPartOfDirective());
test_libraryName_hasPartOfDirective() async {
fail('Timeout');
// return callFailingTest(super.test_libraryName_hasPartOfDirective);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ class B extends A {
assertNoInterfaceMembers();
}

test_super_method_superTypeCycle() async {
Future<void> test_super_method_superTypeCycle() async {
addTestFile('''
class A extends B {
m() {} // in A
Expand Down Expand Up @@ -646,6 +646,8 @@ class AnalysisNotificationOverridesTest_UseCFE

@failingTest
@override
test_super_method_superTypeCycle() async =>
callFailingTest(super.test_super_method_superTypeCycle());
test_super_method_superTypeCycle() async {
fail('Timeout');
// return callFailingTest(super.test_super_method_superTypeCycle);
}
}
Loading

0 comments on commit b83072c

Please sign in to comment.