Index: tests/language/function_type/function_type6_test.dart |
diff --git a/tests/language/function_type/function_type6_test.dart b/tests/language/function_type/function_type6_test.dart |
index 24e03782f3ed1759e0962f726fcbea8e4eebd997..a1787fdac7b5162df3875413b6c3ccf96c0fdb0a 100644 |
--- a/tests/language/function_type/function_type6_test.dart |
+++ b/tests/language/function_type/function_type6_test.dart |
@@ -19,67 +19,41 @@ import 'package:expect/expect.dart'; |
@AssumeDynamic() |
confuse(f) => f; |
-final bool inCheckedMode = (() { |
- bool result = false; |
- assert(result = true); |
- return result; |
-})(); |
- |
-typedef F0<T> |
- = int Function(int x1, [int x2]); |
-typedef F1<T> |
- = Function Function(int x1, [List<T> x2]); |
-typedef F2<T> |
- = core.List<core.int> Function([core.List<core.int> x1]); |
-typedef F3<T> |
- = Function(List<Function> x0); |
-typedef F4<T> |
- = Function Function<A>(A x); |
-typedef F5<T> |
- = int Function(int y, {int x}) Function<B extends core.int>(); |
-typedef F6<T> |
- = int Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>(); |
-typedef F7<T> |
- = Function Function(int x1) Function<B extends core.int>(); |
-typedef F8<T> |
- = Function Function(int x, |
- [List<Function> x1]) Function<B extends core.int>(); |
-typedef F9<T> |
- = Function Function(int y, {List<T> x}) Function<B extends core.int>(); |
-typedef F10<T> |
- = List<Function> Function( |
- [List<Function> x]) Function<B extends core.int>(); |
-typedef F11<T> |
- = List<Function> Function(List<T> x1) Function<B extends core.int>(); |
-typedef F12<T> |
- = core.List<core.int> Function(int x2, |
- [Function x3]) Function<B extends core.int>(); |
-typedef F13<T> |
- = core.List<core.int> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>(); |
-typedef F14<T> |
- = List<T> Function(Function x) Function<B extends core.int>(); |
-typedef F15<T> |
- = List<T> Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>(); |
-typedef F16<T> |
- = Function([int x1]) Function<B extends core.int>(); |
-typedef F17<T> |
- = Function({List<Function> x}) Function<B extends core.int>(); |
-typedef F18<T> |
- = Function() Function<B extends core.int>(); |
-typedef F19<T> |
- = void Function(int x1, [List<Function> x]) Function<B extends core.int>(); |
-typedef F20<T> |
- = void Function([List<T> x1]) Function<B extends core.int>(); |
-typedef F21<T> |
- = List<Function> Function<A>( |
- List<Function> x) Function<B extends core.int>(); |
-typedef F22<T> |
- = Function<A>(core.List<core.int> x) Function<B extends core.int>(); |
-typedef F23<T> |
- = void Function<A>(List<T> x) Function<B extends core.int>(); |
+typedef F0<T> = int Function(int x1, [int x2]); |
+typedef F1<T> = Function Function(int x1, [List<T> x2]); |
+typedef F2<T> = core.List<core.int> Function([core.List<core.int> x1]); |
+typedef F3<T> = Function(List<Function> x0); |
+typedef F4<T> = Function Function<A>(A x); |
+typedef F5<T> = int Function(int y, {int x}) Function<B extends core.int>(); |
+typedef F6<T> = int Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>(); |
+typedef F7<T> = Function Function(int x1) Function<B extends core.int>(); |
+typedef F8<T> = Function Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>(); |
+typedef F9<T> = Function Function(int y, {List<T> x}) |
+ Function<B extends core.int>(); |
+typedef F10<T> = List<Function> Function([List<Function> x]) |
+ Function<B extends core.int>(); |
+typedef F11<T> = List<Function> Function(List<T> x1) |
+ Function<B extends core.int>(); |
+typedef F12<T> = core.List<core.int> Function(int x2, [Function x3]) |
+ Function<B extends core.int>(); |
+typedef F13<T> = core.List<core.int> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>(); |
+typedef F14<T> = List<T> Function(Function x) Function<B extends core.int>(); |
+typedef F15<T> = List<T> Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>(); |
+typedef F16<T> = Function([int x1]) Function<B extends core.int>(); |
+typedef F17<T> = Function({List<Function> x}) Function<B extends core.int>(); |
+typedef F18<T> = Function() Function<B extends core.int>(); |
+typedef F19<T> = void Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>(); |
+typedef F20<T> = void Function([List<T> x1]) Function<B extends core.int>(); |
+typedef F21<T> = List<Function> Function<A>(List<Function> x) |
+ Function<B extends core.int>(); |
+typedef F22<T> = Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>(); |
+typedef F23<T> = void Function<A>(List<T> x) Function<B extends core.int>(); |
int f0(int x0, [int x1]) => null; |
Function f1(int x0, [List<int> x1]) => null; |
@@ -129,13 +103,13 @@ class U6<T> { |
List<Function> Function([List<Function> x]) Function<B extends core.int>() |
x10; |
List<Function> Function(List<T> x1) Function<B extends core.int>() x11; |
- core.List<core.int> Function(int x2, |
- [Function x3]) Function<B extends core.int>() x12; |
- core.List<core.int> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>() x13; |
+ core.List<core.int> Function(int x2, [Function x3]) |
+ Function<B extends core.int>() x12; |
+ core.List<core.int> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>() x13; |
List<T> Function(Function x) Function<B extends core.int>() x14; |
- List<T> Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>() x15; |
+ List<T> Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>() x15; |
Function([int x1]) Function<B extends core.int>() x16; |
Function({List<Function> x}) Function<B extends core.int>() x17; |
Function() Function<B extends core.int>() x18; |
@@ -261,7 +235,7 @@ class U6<T> { |
Expect.equals(tIsDynamic, m1 is F1<bool>); |
Expect.equals(tIsDynamic, confuse(m1) is F1<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x1 = (f1 as dynamic); |
}); |
@@ -396,8 +370,8 @@ class U6<T> { |
} |
Expect.isTrue(m6 is F6); |
- Expect.isTrue(m6 is int Function(int x1, |
- [core.List<core.int> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m6 is int Function(int x1, [core.List<core.int> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m6) is F6); |
// In checked mode, verifies the type. |
x6 = m6; |
@@ -447,8 +421,8 @@ class U6<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function(int x, |
- [List<Function> x1]) Function<B extends core.int>()); |
+ Expect.isTrue(m8 is Function Function(int x, [List<Function> x1]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -472,8 +446,8 @@ class U6<T> { |
} |
Expect.isTrue(m9 is F9); |
- Expect.isTrue(m9 is Function Function(int y, |
- {List<T> x}) Function<B extends core.int>()); |
+ Expect.isTrue(m9 is Function Function(int y, {List<T> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m9) is F9); |
// In checked mode, verifies the type. |
x9 = m9; |
@@ -488,7 +462,7 @@ class U6<T> { |
Expect.equals(tIsDynamic, m9 is F9<bool>); |
Expect.equals(tIsDynamic, confuse(m9) is F9<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x9 = (f9 as dynamic); |
}); |
@@ -527,8 +501,8 @@ class U6<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function( |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m10 is List<Function> Function([List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -552,8 +526,8 @@ class U6<T> { |
} |
Expect.isTrue(m11 is F11); |
- Expect.isTrue(m11 is List<Function> Function( |
- List<T> x1) Function<B extends core.int>()); |
+ Expect.isTrue(m11 is List<Function> Function(List<T> x1) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m11) is F11); |
// In checked mode, verifies the type. |
x11 = m11; |
@@ -568,7 +542,7 @@ class U6<T> { |
Expect.equals(tIsDynamic, m11 is F11<bool>); |
Expect.equals(tIsDynamic, confuse(m11) is F11<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x11 = (f11 as dynamic); |
}); |
@@ -596,8 +570,8 @@ class U6<T> { |
Expect.isTrue(f12 is F12); |
Expect.isTrue(confuse(f12) is F12); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int x2, |
- [Function x3]) Function<B extends core.int>() l12; |
+ core.List<core.int> Function(int x2, [Function x3]) |
+ Function<B extends core.int>() l12; |
// The static function f12 sets `T` to `int`. |
if (!tIsBool) { |
x12 = f12 as dynamic; |
@@ -607,8 +581,8 @@ class U6<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function(int x2, |
- [Function x3]) Function<B extends core.int>()); |
+ Expect.isTrue(m12 is core.List<core.int> Function(int x2, [Function x3]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -622,8 +596,8 @@ class U6<T> { |
Expect.isTrue(f13 is F13); |
Expect.isTrue(confuse(f13) is F13); |
// In checked mode, verifies the type. |
- core.List<core.int> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>() l13; |
+ core.List<core.int> Function(int x1, {core.List<core.int> x}) |
+ Function<B extends core.int>() l13; |
// The static function f13 sets `T` to `int`. |
if (!tIsBool) { |
x13 = f13 as dynamic; |
@@ -634,7 +608,8 @@ class U6<T> { |
Expect.isTrue(m13 is F13); |
Expect.isTrue(m13 is core.List<core.int> Function(int x1, |
- {core.List<core.int> x}) Function<B extends core.int>()); |
+ {core.List<core.int> x}) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -674,7 +649,7 @@ class U6<T> { |
Expect.equals(tIsDynamic, m14 is F14<bool>); |
Expect.equals(tIsDynamic, confuse(m14) is F14<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x14 = (f14 as dynamic); |
}); |
@@ -701,8 +676,8 @@ class U6<T> { |
Expect.isTrue(f15 is F15); |
Expect.isTrue(confuse(f15) is F15); |
// In checked mode, verifies the type. |
- List<T> Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>() l15; |
+ List<T> Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>() l15; |
// The static function f15 sets `T` to `int`. |
if (!tIsBool) { |
x15 = f15 as dynamic; |
@@ -712,8 +687,8 @@ class U6<T> { |
} |
Expect.isTrue(m15 is F15); |
- Expect.isTrue(m15 is List<T> Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m15 is List<T> Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m15) is F15); |
// In checked mode, verifies the type. |
x15 = m15; |
@@ -728,15 +703,15 @@ class U6<T> { |
Expect.equals(tIsDynamic, m15 is F15<bool>); |
Expect.equals(tIsDynamic, confuse(m15) is F15<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x15 = (f15 as dynamic); |
}); |
Expect.throws(() { |
x15 = confuse(f15); |
}); |
- List<T> Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>() l15; |
+ List<T> Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>() l15; |
Expect.throws(() { |
l15 = (f15 as dynamic); |
}); |
@@ -744,8 +719,8 @@ class U6<T> { |
l15 = confuse(f15); |
}); |
} |
- List<T> Function(int y, |
- [core.List<core.int> x]) Function<B extends core.int>() l15 = m15; |
+ List<T> Function(int y, [core.List<core.int> x]) |
+ Function<B extends core.int>() l15 = m15; |
// In checked mode, verifies the type. |
x15 = m15; |
x15 = confuse(m15); |
@@ -841,8 +816,8 @@ class U6<T> { |
} |
Expect.isTrue(m19 is F19); |
- Expect.isTrue(m19 is void Function(int x1, |
- [List<Function> x]) Function<B extends core.int>()); |
+ Expect.isTrue(m19 is void Function(int x1, [List<Function> x]) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m19) is F19); |
// In checked mode, verifies the type. |
x19 = m19; |
@@ -882,7 +857,7 @@ class U6<T> { |
Expect.equals(tIsDynamic, m20 is F20<bool>); |
Expect.equals(tIsDynamic, confuse(m20) is F20<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x20 = (f20 as dynamic); |
}); |
@@ -920,8 +895,8 @@ class U6<T> { |
} |
Expect.isTrue(m21 is F21); |
- Expect.isTrue(m21 is List<Function> Function<A>( |
- List<Function> x) Function<B extends core.int>()); |
+ Expect.isTrue(m21 is List<Function> Function<A>(List<Function> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m21) is F21); |
// In checked mode, verifies the type. |
x21 = m21; |
@@ -945,8 +920,8 @@ class U6<T> { |
} |
Expect.isTrue(m22 is F22); |
- Expect.isTrue(m22 is Function<A>( |
- core.List<core.int> x) Function<B extends core.int>()); |
+ Expect.isTrue(m22 is Function<A>(core.List<core.int> x) |
+ Function<B extends core.int>()); |
Expect.isTrue(confuse(m22) is F22); |
// In checked mode, verifies the type. |
x22 = m22; |
@@ -986,7 +961,7 @@ class U6<T> { |
Expect.equals(tIsDynamic, m23 is F23<bool>); |
Expect.equals(tIsDynamic, confuse(m23) is F23<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x23 = (f23 as dynamic); |
}); |