| Index: pkg/analyzer/test/generated/compile_time_error_code_test.dart
|
| diff --git a/pkg/analyzer/test/generated/compile_time_error_code_test.dart b/pkg/analyzer/test/generated/compile_time_error_code_test.dart
|
| index 5889c8f1bb81bca0c4f5001170715433df35ff19..7876d9da7f1dd5bfebbaecd20540bebab158a2f8 100644
|
| --- a/pkg/analyzer/test/generated/compile_time_error_code_test.dart
|
| +++ b/pkg/analyzer/test/generated/compile_time_error_code_test.dart
|
| @@ -2782,21 +2782,21 @@ class B extends A implements A {}''');
|
| verify([source]);
|
| }
|
|
|
| - test_implementsSuperClass_typeAlias() async {
|
| + test_implementsSuperClass_Object_typeAlias() async {
|
| Source source = addSource(r'''
|
| -class A {}
|
| class M {}
|
| -class B = A with M implements A;''');
|
| +class A = Object with M implements Object;
|
| + ''');
|
| await computeAnalysisResult(source);
|
| assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_SUPER_CLASS]);
|
| verify([source]);
|
| }
|
|
|
| - test_implementsSuperClass_Object_typeAlias() async {
|
| + test_implementsSuperClass_typeAlias() async {
|
| Source source = addSource(r'''
|
| +class A {}
|
| class M {}
|
| -class A = Object with M implements Object;
|
| - ''');
|
| +class B = A with M implements A;''');
|
| await computeAnalysisResult(source);
|
| assertErrors(source, [CompileTimeErrorCode.IMPLEMENTS_SUPER_CLASS]);
|
| verify([source]);
|
| @@ -5357,61 +5357,61 @@ f() {
|
| verify([source]);
|
| }
|
|
|
| - test_privateCollisionInMixinApplication_mixinAndMixin() {
|
| + test_privateCollisionInClassTypeAlias_mixinAndMixin() {
|
| return _privateCollisionInMixinApplicationTest('''
|
| import 'lib1.dart';
|
| -class C extends Object with A, B {}
|
| +class C = Object with A, B;
|
| ''');
|
| }
|
|
|
| - test_privateCollisionInMixinApplication_mixinAndMixin_indirect() {
|
| + test_privateCollisionInClassTypeAlias_mixinAndMixin_indirect() {
|
| return _privateCollisionInMixinApplicationTest('''
|
| import 'lib1.dart';
|
| -class C extends Object with A {}
|
| -class D extends C with B {}
|
| +class C = Object with A;
|
| +class D = C with B;
|
| ''');
|
| }
|
|
|
| - test_privateCollisionInMixinApplication_superclassAndMixin() {
|
| + test_privateCollisionInClassTypeAlias_superclassAndMixin() {
|
| return _privateCollisionInMixinApplicationTest('''
|
| import 'lib1.dart';
|
| -class C extends A with B {}
|
| +class C = A with B;
|
| ''');
|
| }
|
|
|
| - test_privateCollisionInMixinApplication_superclassAndMixin_same() {
|
| + test_privateCollisionInClassTypeAlias_superclassAndMixin_same() {
|
| return _privateCollisionInMixinApplicationTest('''
|
| import 'lib1.dart';
|
| -class C extends A with A {}
|
| +class C = A with A;
|
| ''');
|
| }
|
|
|
| - test_privateCollisionInClassTypeAlias_mixinAndMixin() {
|
| + test_privateCollisionInMixinApplication_mixinAndMixin() {
|
| return _privateCollisionInMixinApplicationTest('''
|
| import 'lib1.dart';
|
| -class C = Object with A, B;
|
| +class C extends Object with A, B {}
|
| ''');
|
| }
|
|
|
| - test_privateCollisionInClassTypeAlias_mixinAndMixin_indirect() {
|
| + test_privateCollisionInMixinApplication_mixinAndMixin_indirect() {
|
| return _privateCollisionInMixinApplicationTest('''
|
| import 'lib1.dart';
|
| -class C = Object with A;
|
| -class D = C with B;
|
| +class C extends Object with A {}
|
| +class D extends C with B {}
|
| ''');
|
| }
|
|
|
| - test_privateCollisionInClassTypeAlias_superclassAndMixin() {
|
| + test_privateCollisionInMixinApplication_superclassAndMixin() {
|
| return _privateCollisionInMixinApplicationTest('''
|
| import 'lib1.dart';
|
| -class C = A with B;
|
| +class C extends A with B {}
|
| ''');
|
| }
|
|
|
| - test_privateCollisionInClassTypeAlias_superclassAndMixin_same() {
|
| + test_privateCollisionInMixinApplication_superclassAndMixin_same() {
|
| return _privateCollisionInMixinApplicationTest('''
|
| import 'lib1.dart';
|
| -class C = A with A;
|
| +class C extends A with A {}
|
| ''');
|
| }
|
|
|
|
|