Fix mock SDK and Flutter to pass some Flutter tests.
R=brianwilkerson@google.com
Change-Id: If5bbbd608d6a5ed378bb161ad36850df2c5b8533
Reviewed-on: https://dart-review.googlesource.com/68820
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/test/mock_sdk.dart b/pkg/analysis_server/test/mock_sdk.dart
index 299a4b0..bcad20a 100644
--- a/pkg/analysis_server/test/mock_sdk.dart
+++ b/pkg/analysis_server/test/mock_sdk.dart
@@ -22,7 +22,7 @@
import 'dart:_internal';
class Object {
- const Object() {}
+ const Object();
bool operator ==(other) => identical(this, other);
String toString() => 'a string';
int get hashCode => 0;
diff --git a/pkg/analysis_server/test/services/correction/assist_test.dart b/pkg/analysis_server/test/services/correction/assist_test.dart
index 9a80b9a..0b387a7 100644
--- a/pkg/analysis_server/test/services/correction/assist_test.dart
+++ b/pkg/analysis_server/test/services/correction/assist_test.dart
@@ -6317,258 +6317,6 @@
@failingTest
@override
- test_convertToFinalField_OK_hasOverride() =>
- super.test_convertToFinalField_OK_hasOverride();
-
- @failingTest
- @override
- test_convertToGetter_OK() => super.test_convertToGetter_OK();
-
- @failingTest
- @override
- test_flutterConvertToChildren_BAD_childUnresolved() =>
- super.test_flutterConvertToChildren_BAD_childUnresolved();
-
- @failingTest
- @override
- test_flutterConvertToChildren_BAD_notOnChild() =>
- super.test_flutterConvertToChildren_BAD_notOnChild();
-
- @failingTest
- @override
- test_flutterConvertToChildren_OK_multiLine() =>
- super.test_flutterConvertToChildren_OK_multiLine();
-
- @failingTest
- @override
- test_flutterConvertToChildren_OK_newlineChild() =>
- super.test_flutterConvertToChildren_OK_newlineChild();
-
- @failingTest
- @override
- test_flutterConvertToChildren_OK_singleLine() =>
- super.test_flutterConvertToChildren_OK_singleLine();
-
- @failingTest
- @override
- test_flutterConvertToStatefulWidget_BAD_notClass() =>
- super.test_flutterConvertToStatefulWidget_BAD_notClass();
-
- @failingTest
- @override
- test_flutterConvertToStatefulWidget_BAD_notStatelessWidget() =>
- super.test_flutterConvertToStatefulWidget_BAD_notStatelessWidget();
-
- @failingTest
- @override
- test_flutterConvertToStatefulWidget_BAD_notWidget() =>
- super.test_flutterConvertToStatefulWidget_BAD_notWidget();
-
- @failingTest
- @override
- test_flutterConvertToStatefulWidget_OK() =>
- super.test_flutterConvertToStatefulWidget_OK();
-
- @failingTest
- @override
- test_flutterConvertToStatefulWidget_OK_empty() =>
- super.test_flutterConvertToStatefulWidget_OK_empty();
-
- @failingTest
- @override
- test_flutterConvertToStatefulWidget_OK_fields() =>
- super.test_flutterConvertToStatefulWidget_OK_fields();
-
- @failingTest
- @override
- test_flutterConvertToStatefulWidget_OK_getters() =>
- super.test_flutterConvertToStatefulWidget_OK_getters();
-
- @failingTest
- @override
- test_flutterConvertToStatefulWidget_OK_methods() =>
- super.test_flutterConvertToStatefulWidget_OK_methods();
-
- @failingTest
- @override
- test_flutterConvertToStatefulWidget_OK_tail() =>
- super.test_flutterConvertToStatefulWidget_OK_tail();
-
- @failingTest
- @override
- test_flutterMoveWidgetDown_BAD_last() =>
- super.test_flutterMoveWidgetDown_BAD_last();
-
- @failingTest
- @override
- test_flutterMoveWidgetDown_BAD_notInList() =>
- super.test_flutterMoveWidgetDown_BAD_notInList();
-
- @failingTest
- @override
- test_flutterMoveWidgetDown_OK() => super.test_flutterMoveWidgetDown_OK();
-
- @failingTest
- @override
- test_flutterMoveWidgetUp_BAD_first() =>
- super.test_flutterMoveWidgetUp_BAD_first();
-
- @failingTest
- @override
- test_flutterMoveWidgetUp_BAD_notInList() =>
- super.test_flutterMoveWidgetUp_BAD_notInList();
-
- @failingTest
- @override
- test_flutterMoveWidgetUp_OK() => super.test_flutterMoveWidgetUp_OK();
-
- @failingTest
- @override
- test_flutterRemoveWidget_BAD_childrenMultipleIntoChild() =>
- super.test_flutterRemoveWidget_BAD_childrenMultipleIntoChild();
-
- @failingTest
- @override
- test_flutterRemoveWidget_OK_childIntoChild_multiLine() =>
- super.test_flutterRemoveWidget_OK_childIntoChild_multiLine();
-
- @failingTest
- @override
- test_flutterRemoveWidget_OK_childIntoChild_singleLine() =>
- super.test_flutterRemoveWidget_OK_childIntoChild_singleLine();
-
- @failingTest
- @override
- test_flutterRemoveWidget_OK_childIntoChildren() =>
- super.test_flutterRemoveWidget_OK_childIntoChildren();
-
- @failingTest
- @override
- test_flutterRemoveWidget_OK_childrenOneIntoChild() =>
- super.test_flutterRemoveWidget_OK_childrenOneIntoChild();
-
- @failingTest
- @override
- test_flutterRemoveWidget_OK_childrenOneIntoReturn() =>
- super.test_flutterRemoveWidget_OK_childrenOneIntoReturn();
-
- @failingTest
- @override
- test_flutterRemoveWidget_OK_intoChildren() =>
- super.test_flutterRemoveWidget_OK_intoChildren();
-
- @failingTest
- @override
- test_flutterSwapWithChild_OK() => super.test_flutterSwapWithChild_OK();
-
- @failingTest
- @override
- test_flutterSwapWithChild_OK_notFormatted() =>
- super.test_flutterSwapWithChild_OK_notFormatted();
-
- @failingTest
- @override
- test_flutterSwapWithParent_OK() => super.test_flutterSwapWithParent_OK();
-
- @failingTest
- @override
- test_flutterSwapWithParent_OK_notFormatted() =>
- super.test_flutterSwapWithParent_OK_notFormatted();
-
- @failingTest
- @override
- test_flutterSwapWithParent_OK_outerIsInChildren() =>
- super.test_flutterSwapWithParent_OK_outerIsInChildren();
-
- @failingTest
- @override
- test_flutterWrapCenter_BAD_onCenter() =>
- super.test_flutterWrapCenter_BAD_onCenter();
-
- @failingTest
- @override
- test_flutterWrapCenter_OK() => super.test_flutterWrapCenter_OK();
-
- @failingTest
- @override
- test_flutterWrapCenter_OK_implicitNew() =>
- super.test_flutterWrapCenter_OK_implicitNew();
-
- @failingTest
- @override
- test_flutterWrapCenter_OK_namedConstructor() =>
- super.test_flutterWrapCenter_OK_namedConstructor();
-
- @failingTest
- @override
- test_flutterWrapColumn_OK_coveredByWidget() =>
- super.test_flutterWrapColumn_OK_coveredByWidget();
-
- @failingTest
- @override
- test_flutterWrapColumn_OK_coversWidgets() =>
- super.test_flutterWrapColumn_OK_coversWidgets();
-
- @failingTest
- @override
- test_flutterWrapColumn_OK_implicitNew() =>
- super.test_flutterWrapColumn_OK_implicitNew();
-
- @failingTest
- @override
- test_flutterWrapPadding_BAD_onPadding() =>
- super.test_flutterWrapPadding_BAD_onPadding();
-
- @failingTest
- @override
- test_flutterWrapPadding_OK() => super.test_flutterWrapPadding_OK();
-
- @failingTest
- @override
- test_flutterWrapRow_OK() => super.test_flutterWrapRow_OK();
-
- @failingTest
- @override
- test_flutterWrapWidget_BAD_multiLine() =>
- super.test_flutterWrapWidget_BAD_multiLine();
-
- @failingTest
- @override
- test_flutterWrapWidget_BAD_singleLine() =>
- super.test_flutterWrapWidget_BAD_singleLine();
-
- @failingTest
- @override
- test_flutterWrapWidget_OK_multiLine() =>
- super.test_flutterWrapWidget_OK_multiLine();
-
- @failingTest
- @override
- test_flutterWrapWidget_OK_multiLines() =>
- super.test_flutterWrapWidget_OK_multiLines();
-
- @failingTest
- @override
- test_flutterWrapWidget_OK_multiLines_eol2() =>
- super.test_flutterWrapWidget_OK_multiLines_eol2();
-
- @failingTest
- @override
- test_flutterWrapWidget_OK_singleLine1() =>
- super.test_flutterWrapWidget_OK_singleLine1();
-
- @failingTest
- @override
- test_flutterWrapWidget_OK_singleLine2() =>
- super.test_flutterWrapWidget_OK_singleLine2();
-
- @failingTest
- @override
- test_flutterWrapWidget_OK_variable() =>
- super.test_flutterWrapWidget_OK_variable();
-
- @failingTest
- @override
test_importAddShow_BAD_unresolvedUri() =>
super.test_importAddShow_BAD_unresolvedUri();
}
diff --git a/pkg/analysis_server/test/src/utilities/flutter_util.dart b/pkg/analysis_server/test/src/utilities/flutter_util.dart
index e7012a1..6e689e5 100644
--- a/pkg/analysis_server/test/src/utilities/flutter_util.dart
+++ b/pkg/analysis_server/test/src/utilities/flutter_util.dart
@@ -28,7 +28,6 @@
newFile('$flutterPkgLibPath/widgets.dart', r'''
export 'src/widgets/basic.dart';
-export 'src/widgets/center.dart';
export 'src/widgets/container.dart';
export 'src/widgets/framework.dart';
export 'src/widgets/icon.dart';
@@ -87,6 +86,7 @@
Widget child,
onTap,
});
+}
''');
}
@@ -160,8 +160,9 @@
void createSrcWidgets() {
newFile('$flutterPkgLibPath/src/widgets/basic.dart', r'''
+import 'package:flutter/rendering.dart';
+
import 'framework.dart';
-import 'rendering.dart';
export 'package:flutter/painting.dart';
export 'package:flutter/rendering.dart';
