Skip to content

Commit 59fe9d7

Browse files
scheglovCommit Queue
authored andcommitted
DeCo. Rename, move XyzElementTest_declaringConstructors.
Bug: #61701 Change-Id: Iafaaf60ff0e8f97f59a0bc77950de9eb29402829 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/459342 Reviewed-by: Johnni Winther <johnniwinther@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
1 parent 893932d commit 59fe9d7

File tree

4 files changed

+81
-73
lines changed

4 files changed

+81
-73
lines changed

pkg/analyzer/test/src/summary/elements/enum_test.dart

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import '../elements_base.dart';
1212
main() {
1313
defineReflectiveSuite(() {
1414
defineReflectiveTests(EnumElementTest_keepLinking);
15-
defineReflectiveTests(EnumElementTest_keepLinking_declaringConstructors);
1615
defineReflectiveTests(EnumElementTest_fromBytes);
17-
defineReflectiveTests(EnumElementTest_fromBytes_declaringConstructors);
16+
defineReflectiveTests(EnumElementTest_declaringConstructors_keepLinking);
17+
defineReflectiveTests(EnumElementTest_declaringConstructors_fromBytes);
1818
defineReflectiveTests(EnumElementTest_augmentation_keepLinking);
1919
defineReflectiveTests(EnumElementTest_augmentation_fromBytes);
2020
defineReflectiveTests(UpdateNodeTextExpectations);
@@ -15091,14 +15091,11 @@ class EnumElementTest_augmentation_keepLinking
1509115091
bool get keepLinkingLibraries => true;
1509215092
}
1509315093

15094-
@reflectiveTest
15095-
class EnumElementTest_fromBytes extends EnumElementTest {
15096-
@override
15097-
bool get keepLinkingLibraries => false;
15098-
}
15094+
abstract class EnumElementTest_declaringConstructors extends EnumElementTest {}
1509915095

1510015096
@reflectiveTest
15101-
class EnumElementTest_fromBytes_declaringConstructors extends EnumElementTest {
15097+
class EnumElementTest_declaringConstructors_fromBytes
15098+
extends EnumElementTest_declaringConstructors {
1510215099
@override
1510315100
bool get keepLinkingLibraries => false;
1510415101

@@ -15116,14 +15113,8 @@ class EnumElementTest_fromBytes_declaringConstructors extends EnumElementTest {
1511615113
}
1511715114

1511815115
@reflectiveTest
15119-
class EnumElementTest_keepLinking extends EnumElementTest {
15120-
@override
15121-
bool get keepLinkingLibraries => true;
15122-
}
15123-
15124-
@reflectiveTest
15125-
class EnumElementTest_keepLinking_declaringConstructors
15126-
extends EnumElementTest {
15116+
class EnumElementTest_declaringConstructors_keepLinking
15117+
extends EnumElementTest_declaringConstructors {
1512715118
@override
1512815119
bool get keepLinkingLibraries => true;
1512915120

@@ -15139,3 +15130,15 @@ class EnumElementTest_keepLinking_declaringConstructors
1513915130
return super.tearDown();
1514015131
}
1514115132
}
15133+
15134+
@reflectiveTest
15135+
class EnumElementTest_fromBytes extends EnumElementTest {
15136+
@override
15137+
bool get keepLinkingLibraries => false;
15138+
}
15139+
15140+
@reflectiveTest
15141+
class EnumElementTest_keepLinking extends EnumElementTest {
15142+
@override
15143+
bool get keepLinkingLibraries => true;
15144+
}

pkg/analyzer/test/src/summary/elements/extension_test.dart

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import '../elements_base.dart';
1212
main() {
1313
defineReflectiveSuite(() {
1414
defineReflectiveTests(ExtensionElementTest_keepLinking);
15+
defineReflectiveTests(ExtensionElementTest_fromBytes);
1516
defineReflectiveTests(
16-
ExtensionElementTest_keepLinking_declaringConstructors,
17+
ExtensionElementTest_declaringConstructors_keepLinking,
1718
);
18-
defineReflectiveTests(ExtensionElementTest_fromBytes);
19-
defineReflectiveTests(ExtensionElementTest_fromBytes_declaringConstructors);
19+
defineReflectiveTests(ExtensionElementTest_declaringConstructors_fromBytes);
2020
defineReflectiveTests(ExtensionElementTest_augmentation_keepLinking);
2121
defineReflectiveTests(ExtensionElementTest_augmentation_fromBytes);
2222
defineReflectiveTests(UpdateNodeTextExpectations);
@@ -3080,15 +3080,12 @@ class ExtensionElementTest_augmentation_keepLinking
30803080
bool get keepLinkingLibraries => true;
30813081
}
30823082

3083-
@reflectiveTest
3084-
class ExtensionElementTest_fromBytes extends ExtensionElementTest {
3085-
@override
3086-
bool get keepLinkingLibraries => false;
3087-
}
3083+
abstract class ExtensionElementTest_declaringConstructors
3084+
extends ExtensionElementTest {}
30883085

30893086
@reflectiveTest
3090-
class ExtensionElementTest_fromBytes_declaringConstructors
3091-
extends ExtensionElementTest {
3087+
class ExtensionElementTest_declaringConstructors_fromBytes
3088+
extends ExtensionElementTest_declaringConstructors {
30923089
@override
30933090
bool get keepLinkingLibraries => false;
30943091

@@ -3106,14 +3103,8 @@ class ExtensionElementTest_fromBytes_declaringConstructors
31063103
}
31073104

31083105
@reflectiveTest
3109-
class ExtensionElementTest_keepLinking extends ExtensionElementTest {
3110-
@override
3111-
bool get keepLinkingLibraries => true;
3112-
}
3113-
3114-
@reflectiveTest
3115-
class ExtensionElementTest_keepLinking_declaringConstructors
3116-
extends ExtensionElementTest {
3106+
class ExtensionElementTest_declaringConstructors_keepLinking
3107+
extends ExtensionElementTest_declaringConstructors {
31173108
@override
31183109
bool get keepLinkingLibraries => true;
31193110

@@ -3129,3 +3120,15 @@ class ExtensionElementTest_keepLinking_declaringConstructors
31293120
return super.tearDown();
31303121
}
31313122
}
3123+
3124+
@reflectiveTest
3125+
class ExtensionElementTest_fromBytes extends ExtensionElementTest {
3126+
@override
3127+
bool get keepLinkingLibraries => false;
3128+
}
3129+
3130+
@reflectiveTest
3131+
class ExtensionElementTest_keepLinking extends ExtensionElementTest {
3132+
@override
3133+
bool get keepLinkingLibraries => true;
3134+
}

pkg/analyzer/test/src/summary/elements/extension_type_test.dart

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ main() {
1414
defineReflectiveTests(ExtensionTypeElementTest_keepLinking);
1515
defineReflectiveTests(ExtensionTypeElementTest_fromBytes);
1616
defineReflectiveTests(
17-
ExtensionTypeElementTest_keepLinking_declaringConstructors,
17+
ExtensionTypeElementTest_declaringConstructors_keepLinking,
1818
);
1919
defineReflectiveTests(
20-
ExtensionTypeElementTest_fromBytes_declaringConstructors,
20+
ExtensionTypeElementTest_declaringConstructors_fromBytes,
2121
);
2222
defineReflectiveTests(ExtensionTypeElementTest_augmentation_keepLinking);
2323
defineReflectiveTests(ExtensionTypeElementTest_augmentation_fromBytes);
2424
defineReflectiveTests(UpdateNodeTextExpectations);
2525
});
2626
}
2727

28-
mixin ExtensionTypeElementMixin on ElementsBaseTest {
28+
abstract class ExtensionTypeElementTest extends ElementsBaseTest {
2929
test_allSupertypes() async {
3030
var library = await buildLibrary(r'''
3131
extension type A(int? it) {}
@@ -6770,17 +6770,12 @@ class ExtensionTypeElementTest_augmentation_keepLinking
67706770
bool get keepLinkingLibraries => true;
67716771
}
67726772

6773-
@reflectiveTest
6774-
class ExtensionTypeElementTest_fromBytes extends ElementsBaseTest
6775-
with ExtensionTypeElementMixin {
6776-
@override
6777-
bool get keepLinkingLibraries => false;
6778-
}
6773+
abstract class ExtensionTypeElementTest_declaringConstructors
6774+
extends ExtensionTypeElementTest {}
67796775

67806776
@reflectiveTest
6781-
class ExtensionTypeElementTest_fromBytes_declaringConstructors
6782-
extends ElementsBaseTest
6783-
with ExtensionTypeElementMixin {
6777+
class ExtensionTypeElementTest_declaringConstructors_fromBytes
6778+
extends ExtensionTypeElementTest_declaringConstructors {
67846779
@override
67856780
bool get keepLinkingLibraries => false;
67866781

@@ -6798,16 +6793,8 @@ class ExtensionTypeElementTest_fromBytes_declaringConstructors
67986793
}
67996794

68006795
@reflectiveTest
6801-
class ExtensionTypeElementTest_keepLinking extends ElementsBaseTest
6802-
with ExtensionTypeElementMixin {
6803-
@override
6804-
bool get keepLinkingLibraries => true;
6805-
}
6806-
6807-
@reflectiveTest
6808-
class ExtensionTypeElementTest_keepLinking_declaringConstructors
6809-
extends ElementsBaseTest
6810-
with ExtensionTypeElementMixin {
6796+
class ExtensionTypeElementTest_declaringConstructors_keepLinking
6797+
extends ExtensionTypeElementTest_declaringConstructors {
68116798
@override
68126799
bool get keepLinkingLibraries => true;
68136800

@@ -6823,3 +6810,15 @@ class ExtensionTypeElementTest_keepLinking_declaringConstructors
68236810
return super.tearDown();
68246811
}
68256812
}
6813+
6814+
@reflectiveTest
6815+
class ExtensionTypeElementTest_fromBytes extends ExtensionTypeElementTest {
6816+
@override
6817+
bool get keepLinkingLibraries => false;
6818+
}
6819+
6820+
@reflectiveTest
6821+
class ExtensionTypeElementTest_keepLinking extends ExtensionTypeElementTest {
6822+
@override
6823+
bool get keepLinkingLibraries => true;
6824+
}

pkg/analyzer/test/src/summary/elements/mixin_test.dart

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import '../elements_base.dart';
1313
main() {
1414
defineReflectiveSuite(() {
1515
defineReflectiveTests(MixinElementTest_keepLinking);
16-
defineReflectiveTests(MixinElementTest_keepLinking_declaringConstructors);
1716
defineReflectiveTests(MixinElementTest_fromBytes);
18-
defineReflectiveTests(MixinElementTest_fromBytes_declaringConstructors);
17+
defineReflectiveTests(MixinElementTest_declaringConstructors_keepLinking);
18+
defineReflectiveTests(MixinElementTest_declaringConstructors_fromBytes);
1919
defineReflectiveTests(MixinElementTest_augmentation_fromBytes);
2020
defineReflectiveTests(MixinElementTest_augmentation_keepLinking);
2121
defineReflectiveTests(UpdateNodeTextExpectations);
@@ -5794,15 +5794,12 @@ class MixinElementTest_augmentation_keepLinking
57945794
bool get keepLinkingLibraries => true;
57955795
}
57965796

5797-
@reflectiveTest
5798-
class MixinElementTest_fromBytes extends MixinElementTest {
5799-
@override
5800-
bool get keepLinkingLibraries => false;
5801-
}
5797+
abstract class MixinElementTest_declaringConstructors
5798+
extends MixinElementTest {}
58025799

58035800
@reflectiveTest
5804-
class MixinElementTest_fromBytes_declaringConstructors
5805-
extends MixinElementTest {
5801+
class MixinElementTest_declaringConstructors_fromBytes
5802+
extends MixinElementTest_declaringConstructors {
58065803
@override
58075804
bool get keepLinkingLibraries => false;
58085805

@@ -5820,14 +5817,8 @@ class MixinElementTest_fromBytes_declaringConstructors
58205817
}
58215818

58225819
@reflectiveTest
5823-
class MixinElementTest_keepLinking extends MixinElementTest {
5824-
@override
5825-
bool get keepLinkingLibraries => true;
5826-
}
5827-
5828-
@reflectiveTest
5829-
class MixinElementTest_keepLinking_declaringConstructors
5830-
extends MixinElementTest {
5820+
class MixinElementTest_declaringConstructors_keepLinking
5821+
extends MixinElementTest_declaringConstructors {
58315822
@override
58325823
bool get keepLinkingLibraries => true;
58335824

@@ -5843,3 +5834,15 @@ class MixinElementTest_keepLinking_declaringConstructors
58435834
return super.tearDown();
58445835
}
58455836
}
5837+
5838+
@reflectiveTest
5839+
class MixinElementTest_fromBytes extends MixinElementTest {
5840+
@override
5841+
bool get keepLinkingLibraries => false;
5842+
}
5843+
5844+
@reflectiveTest
5845+
class MixinElementTest_keepLinking extends MixinElementTest {
5846+
@override
5847+
bool get keepLinkingLibraries => true;
5848+
}

0 commit comments

Comments
 (0)