Skip to content

Commit 6dc6bca

Browse files
iarkhiarkh
committed
Fixes #979: I-2-b tests updated according to the recent changes for dart-lang/language#1133 
1 parent f35ddce commit 6dc6bca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+256
-3236
lines changed

‎LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_l2_01_t13.dart

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -46,54 +46,19 @@
4646
* with two related parameters: [typedef G<X extends A<X>, Y extends A<Y>> =
4747
* void Function<Y1 extends Y>(X, Y)]
4848
*
49-
* @Issue 41963, 41964
49+
* @Issue 41963, 41964, 44786
50+
* @Issue dart-lang/language#1133
5051
*
5152
* @author [email protected]
5253
*/
5354

5455
class A<X> {}
5556
typedef G<X extends A<X>, Y extends A<Y>> = void Function<Y1 extends Y>(X, Y);
5657

57-
test(G source) {
58-
void Function<X extends A<dynamic>>(A<Never>, A<dynamic>) target1 = source;
59-
60-
void Function<X extends A<dynamic>>(A<Never>, A<Never>) target2 = source;
61-
62-
void Function<X extends A<dynamic>>(A<dynamic>, A<Never>) target3 = source;
63-
// ^^^^^^
64-
// [analyzer] unspecified
65-
// [cfe] unspecified
66-
67-
void Function<X extends A<dynamic>>(A<Null>, A<Null>) target4 = source;
68-
// ^^^^^^
69-
// [analyzer] unspecified
70-
// [cfe] unspecified
71-
72-
void Function<X extends A<dynamic>>(A<dynamic>, A<Null>) target5 = source;
73-
// ^^^^^^
74-
// [analyzer] unspecified
75-
// [cfe] unspecified
76-
77-
void Function<X extends A<Never>>(A<dynamic>, A<Never>) target6 = source;
78-
// ^^^^^^
79-
// [analyzer] unspecified
80-
// [cfe] unspecified
81-
82-
void Function<X extends A<Never>>(A<Never>, A<Never>) target7 = source;
83-
// ^^^^^^
84-
// [analyzer] unspecified
85-
// [cfe] unspecified
86-
87-
void Function<X extends A<Never>>(A<Never>, A<dynamic>) target8 = source;
88-
// ^^^^^^
89-
// [analyzer] unspecified
90-
// [cfe] unspecified
91-
92-
void Function<X extends A<Null>>(A<Null>, A<Null>) target9 = source;
93-
// ^^^^^^
58+
main() {
59+
G? source;
60+
// ^^^^^^
9461
// [analyzer] unspecified
9562
// [cfe] unspecified
9663

9764
}
98-
99-
main() {}

‎LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_l2_01_t14.dart

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -45,47 +45,20 @@
4545
* @description Checks that instantiate-to-bounds works correctly for [typedef]
4646
* with two related parameters: [typedef G<X extends A<X>, Y extends A<Y>> =
4747
* void Function(X)]
48+
*
4849
* @Issue 34689, 34699, 41963, 41964
50+
* @Issue dart-lang/language#1133
4951
*
5052
* @author [email protected]
5153
*/
5254

53-
import "../../../../Utils/expect.dart";
54-
5555
class A<X> {}
5656
typedef G<X extends A<X>, Y extends A<Y>> = void Function(X);
5757

58-
test(G source) {
59-
var fsource = toF(source);
60-
61-
F<G<A<dynamic>, A<Never>>> target1 = fsource;
62-
// ^^^^^^^
58+
main() {
59+
G? source;
60+
// ^^^^^^
6361
// [analyzer] unspecified
6462
// [cfe] unspecified
6563

66-
F<G<A<dynamic>, A<dynamic>>> target2 = fsource;
67-
// ^^^^^^^
68-
// [analyzer] unspecified
69-
// [cfe] unspecified
70-
71-
F<G<A<Never>, A<dynamic>>> target3 = fsource;
72-
73-
F<G<A<Never>, A<Never>>> target4 = fsource;
74-
75-
F<G<A<dynamic>, A<Null>>> target5 = fsource;
76-
// ^^^^^^^
77-
// [analyzer] unspecified
78-
// [cfe] unspecified
79-
80-
F<G<A<Null>, A<dynamic>>> target6 = fsource;
81-
// ^^^^^^^
82-
// [analyzer] unspecified
83-
// [cfe] unspecified
84-
85-
F<G<A<Null>, A<Null>>> target7 = fsource;
86-
// ^^^^^^^
87-
// [analyzer] unspecified
88-
// [cfe] unspecified
8964
}
90-
91-
main() {}

‎LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_l2_01_t15.dart

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -46,47 +46,19 @@
4646
* with two related parameters: [typedef G<X extends A<X>, Y extends A<Y>> =
4747
* void Function(Y)]
4848
*
49-
* @Issue 41963, 41964
49+
* @Issue 41963, 41964, 44786
50+
* @Issue dart-lang/language#1133
5051
*
5152
* @author [email protected]
5253
*/
5354

54-
import "../../../../Utils/expect.dart";
55-
5655
class A<X> {}
5756
typedef G<X extends A<X>, Y extends A<Y>> = void Function(Y);
5857

59-
test(G source) {
60-
var fsource = toF(source);
61-
62-
F<G<A<dynamic>, A<Never>>> target1 = fsource;
63-
64-
F<G<A<dynamic>, A<dynamic>>> target2 = fsource;
65-
// ^^^^^^^
66-
// [analyzer] unspecified
67-
// [cfe] unspecified
68-
69-
F<G<A<Never>, A<dynamic>>> target3 = fsource;
70-
// ^^^^^^^
71-
// [analyzer] unspecified
72-
// [cfe] unspecified
73-
74-
F<G<A<Never>, A<Never>>> target4 = fsource;
75-
76-
F<G<A<dynamic>, A<Null>>> target5 = fsource;
77-
// ^^^^^^^
78-
// [analyzer] unspecified
79-
// [cfe] unspecified
80-
81-
F<G<A<Null>, A<dynamic>>> target6 = fsource;
82-
// ^^^^^^^
58+
main() {
59+
G? source;
60+
// ^^^^^^
8361
// [analyzer] unspecified
8462
// [cfe] unspecified
8563

86-
F<G<A<Null>, A<Null>>> target7 = fsource;
87-
// ^^^^^^^
88-
// [analyzer] unspecified
89-
// [cfe] unspecified
9064
}
91-
92-
main() {}

‎LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_l2_02_t01.dart

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -47,65 +47,19 @@
4747
* with two related parameters: [typedef G<X extends A<X>, Y extends X> = X
4848
* Function(Y)]
4949
*
50-
* @Issue 35068, 41963, 41964
50+
* @Issue 35068, 41963, 41964, 44786
51+
* @Issue dart-lang/language#1133
5152
*
5253
* @author [email protected]
5354
*/
5455

55-
import "../../../../Utils/expect.dart";
56-
5756
class A<X> {}
5857
typedef G<X extends A<X>, Y extends X> = X Function(Y);
5958

60-
test(G source) {
61-
var fsource = toF(source);
62-
63-
F<G<A<dynamic>, Never>> target = fsource;
64-
65-
F<G<A<dynamic>, Null>> target1 = fsource;
66-
// ^^^^^^^
67-
// [analyzer] unspecified
68-
// [cfe] unspecified
69-
70-
F<G<A<dynamic>, dynamic>> target2 = fsource;
71-
// ^^^^^^^
72-
// [analyzer] unspecified
73-
// [cfe] unspecified
74-
75-
F<G<A<dynamic>, A<dynamic>>> target3 = fsource;
76-
// ^^^^^^^
59+
main() {
60+
G? source;
61+
// ^^^^^^
7762
// [analyzer] unspecified
7863
// [cfe] unspecified
7964

80-
F<G<A<dynamic>, A<Never>>> target4 = fsource;
81-
// ^^^^^^^
82-
// [analyzer] unspecified
83-
// [cfe] unspecified
84-
85-
F<G<A<Never>, A<dynamic>>> target5 = fsource;
86-
// ^^^^^^^
87-
// [analyzer] unspecified
88-
// [cfe] unspecified
89-
90-
F<G<A<Never>, A<Never>>> target6 = fsource;
91-
// ^^^^^^^
92-
// [analyzer] unspecified
93-
// [cfe] unspecified
94-
95-
F<G<A<dynamic>, A<Null>>> target7 = fsource;
96-
// ^^^^^^^
97-
// [analyzer] unspecified
98-
// [cfe] unspecified
99-
100-
F<G<A<Null>, A<dynamic>>> target8 = fsource;
101-
// ^^^^^^^
102-
// [analyzer] unspecified
103-
// [cfe] unspecified
104-
105-
F<G<A<Null>, A<Null>>> target9 = fsource;
106-
// ^^^^^^^
107-
// [analyzer] unspecified
108-
// [cfe] unspecified
10965
}
110-
111-
main() {}

‎LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_l2_02_t03.dart

Lines changed: 6 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -45,65 +45,20 @@
4545
* @description Checks that instantiate-to-bounds works correctly for [typedef]
4646
* with two related parameters: [typedef G<X extends A<X>, Y extends X> = X
4747
* Function(X, Y)]
48-
* @Issue 41963, 41964
48+
*
49+
* @Issue 41963, 4196444786
50+
* @Issue dart-lang/language#1133
4951
*
5052
* @author [email protected]
5153
*/
5254

53-
import "../../../../Utils/expect.dart";
54-
5555
class A<X> {}
5656
typedef G<X extends A<X>, Y extends X> = X Function(X, Y);
5757

58-
test(G source) {
59-
var fsource = toF(source);
60-
61-
F<G<A<dynamic>, Never>> target = fsource;
62-
63-
F<G<A<dynamic>, Null>> target1 = fsource;
64-
// ^^^^^^^
65-
// [analyzer] unspecified
66-
// [cfe] unspecified
67-
68-
F<G<A<dynamic>, dynamic>> target2 = fsource;
69-
// ^^^^^^^
70-
// [analyzer] unspecified
71-
// [cfe] unspecified
72-
73-
F<G<A<dynamic>, A<dynamic>>> target3 = fsource;
74-
// ^^^^^^^
75-
// [analyzer] unspecified
76-
// [cfe] unspecified
77-
78-
F<G<A<dynamic>, A<Never>>> target4 = fsource;
79-
// ^^^^^^^
80-
// [analyzer] unspecified
81-
// [cfe] unspecified
82-
83-
F<G<A<Never>, A<dynamic>>> target5 = fsource;
84-
// ^^^^^^^
85-
// [analyzer] unspecified
86-
// [cfe] unspecified
87-
88-
F<G<A<Never>, A<Never>>> target6 = fsource;
89-
// ^^^^^^^
90-
// [analyzer] unspecified
91-
// [cfe] unspecified
92-
93-
F<G<A<dynamic>, A<Null>>> target7 = fsource;
94-
// ^^^^^^^
95-
// [analyzer] unspecified
96-
// [cfe] unspecified
97-
98-
F<G<A<Null>, A<dynamic>>> target8 = fsource;
99-
// ^^^^^^^
58+
main() {
59+
G? source;
60+
// ^^^^^^
10061
// [analyzer] unspecified
10162
// [cfe] unspecified
10263

103-
F<G<A<Null>, A<Null>>> target9 = fsource;
104-
// ^^^^^^^
105-
// [analyzer] unspecified
106-
// [cfe] unspecified
10764
}
108-
109-
main() {}

‎LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_l2_02_t10.dart

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -45,56 +45,19 @@
4545
* @description Checks that instantiate-to-bounds works correctly for [typedef]
4646
* with two related parameters: [typedef G<X extends A<X>, Y extends X> = void
4747
* Function<X1 extends X>(Y)]
48-
* @Issue 41963, 41964
48+
* @Issue 41963, 41964, 44786
49+
* @Issue dart-lang/language#1133
4950
*
5051
* @author [email protected]
5152
*/
5253

5354
class A<X> {}
5455
typedef G<X extends A<X>, Y extends X> = void Function<X1 extends X>(Y);
5556

56-
test(G source) {
57-
void Function<X extends A<dynamic>>(Never) target1 = source;
58-
59-
void Function<X extends A<dynamic>>(A<dynamic>) target2 = source;
60-
// ^^^^^^
61-
// [analyzer] unspecified
62-
// [cfe] unspecified
63-
64-
void Function<X extends A<Never>>(A<dynamic>) target3 = source;
65-
// ^^^^^^
66-
// [analyzer] unspecified
67-
// [cfe] unspecified
68-
69-
void Function<X extends A<Never>>(A<Never>) target4 = source;
70-
// ^^^^^^
71-
// [analyzer] unspecified
72-
// [cfe] unspecified
73-
74-
void Function<X extends A<dynamic>>(A<Never>) target5 = source;
75-
// ^^^^^^
76-
// [analyzer] unspecified
77-
// [cfe] unspecified
78-
79-
void Function<X extends A<dynamic>>(dynamic) target6 = source;
80-
// ^^^^^^
81-
// [analyzer] unspecified
82-
// [cfe] unspecified
83-
84-
void Function<X extends A<dynamic>>(Null) target7 = source;
85-
// ^^^^^^
57+
main() {
58+
G? source;
59+
// ^^^^^^
8660
// [analyzer] unspecified
8761
// [cfe] unspecified
8862

89-
void Function<X extends dynamic>(Never) target8 = source;
90-
// ^^^^^^
91-
// [analyzer] unspecified
92-
// [cfe] unspecified
93-
94-
void Function<X extends Never>(Never) target9 = source;
95-
// ^^^^^^
96-
// [analyzer] unspecified
97-
// [cfe] unspecified
9863
}
99-
100-
main() {}

0 commit comments

Comments
 (0)