Index: tests/language/function_type/function_type5_test.dart |
diff --git a/tests/language/function_type/function_type5_test.dart b/tests/language/function_type/function_type5_test.dart |
index 2a9f7082fd253a07c245d374356f2f331bdd8d20..fe68fc936b4218bf520e5bd54646a803bcca4a49 100644 |
--- a/tests/language/function_type/function_type5_test.dart |
+++ b/tests/language/function_type/function_type5_test.dart |
@@ -19,61 +19,33 @@ 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]); |
-typedef F1<T> |
- = Function Function([List<T> x1]); |
-typedef F2<T> |
- = core.List<core.int> Function(core.List<core.int> x0); |
-typedef F3<T> |
- = Function(int y, [List<Function> x]); |
-typedef F4<T> |
- = Function Function<A>(); |
-typedef F5<T> |
- = int Function(int y, {int x}) Function(int x); |
-typedef F6<T> |
- = int Function(int x1, [core.List<core.int> x]) Function(int x); |
-typedef F7<T> |
- = Function Function(int x1) Function(int x); |
-typedef F8<T> |
- = Function Function(int x, [List<Function> x1]) Function(int x); |
-typedef F9<T> |
- = Function Function(int y, {List<T> x}) Function(int x); |
-typedef F10<T> |
- = List<Function> Function([List<Function> x]) Function(int x); |
-typedef F11<T> |
- = List<Function> Function(List<T> x1) Function(int x); |
-typedef F12<T> |
- = core.List<core.int> Function(int x2, [Function x3]) Function(int x); |
-typedef F13<T> |
- = core.List<core.int> Function(int x1, {core.List<core.int> x}) Function( |
- int x); |
-typedef F14<T> |
- = List<T> Function(Function x) Function(int x); |
-typedef F15<T> |
- = List<T> Function(int y, [core.List<core.int> x]) Function(int x); |
-typedef F16<T> |
- = Function([int x1]) Function(int x); |
-typedef F17<T> |
- = Function({List<Function> x}) Function(int x); |
-typedef F18<T> |
- = Function() Function(int x); |
-typedef F19<T> |
- = void Function(int x1, [List<Function> x]) Function(int x); |
-typedef F20<T> |
- = void Function([List<T> x1]) Function(int x); |
-typedef F21<T> |
- = List<Function> Function<A>(List<Function> x) Function(int x); |
-typedef F22<T> |
- = Function<A>(core.List<core.int> x) Function(int x); |
-typedef F23<T> |
- = void Function<A>(List<T> x) Function(int x); |
+typedef F0<T> = int Function([int x1]); |
+typedef F1<T> = Function Function([List<T> x1]); |
+typedef F2<T> = core.List<core.int> Function(core.List<core.int> x0); |
+typedef F3<T> = Function(int y, [List<Function> x]); |
+typedef F4<T> = Function Function<A>(); |
+typedef F5<T> = int Function(int y, {int x}) Function(int x); |
+typedef F6<T> = int Function(int x1, [core.List<core.int> x]) Function(int x); |
+typedef F7<T> = Function Function(int x1) Function(int x); |
+typedef F8<T> = Function Function(int x, [List<Function> x1]) Function(int x); |
+typedef F9<T> = Function Function(int y, {List<T> x}) Function(int x); |
+typedef F10<T> = List<Function> Function([List<Function> x]) Function(int x); |
+typedef F11<T> = List<Function> Function(List<T> x1) Function(int x); |
+typedef F12<T> = core.List<core.int> Function(int x2, [Function x3]) Function( |
+ int x); |
+typedef F13<T> = core.List<core.int> Function(int x1, {core.List<core.int> x}) |
+ Function(int x); |
+typedef F14<T> = List<T> Function(Function x) Function(int x); |
+typedef F15<T> = List<T> Function(int y, [core.List<core.int> x]) Function( |
+ int x); |
+typedef F16<T> = Function([int x1]) Function(int x); |
+typedef F17<T> = Function({List<Function> x}) Function(int x); |
+typedef F18<T> = Function() Function(int x); |
+typedef F19<T> = void Function(int x1, [List<Function> x]) Function(int x); |
+typedef F20<T> = void Function([List<T> x1]) Function(int x); |
+typedef F21<T> = List<Function> Function<A>(List<Function> x) Function(int x); |
+typedef F22<T> = Function<A>(core.List<core.int> x) Function(int x); |
+typedef F23<T> = void Function<A>(List<T> x) Function(int x); |
int f0([int x0]) => null; |
Function f1([List<int> x0]) => null; |
@@ -242,7 +214,7 @@ class U5<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); |
}); |
@@ -464,7 +436,7 @@ class U5<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); |
}); |
@@ -541,7 +513,7 @@ class U5<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); |
}); |
@@ -578,8 +550,8 @@ class U5<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function(int x2, |
- [Function x3]) Function(int x)); |
+ Expect.isTrue(m12 is core.List<core.int> Function(int x2, [Function x3]) |
+ Function(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -605,7 +577,8 @@ class U5<T> { |
Expect.isTrue(m13 is F13); |
Expect.isTrue(m13 is core.List<core.int> Function(int x1, |
- {core.List<core.int> x}) Function(int x)); |
+ {core.List<core.int> x}) |
+ Function(int x)); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -644,7 +617,7 @@ class U5<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); |
}); |
@@ -681,8 +654,8 @@ class U5<T> { |
} |
Expect.isTrue(m15 is F15); |
- Expect.isTrue(m15 is List<T> Function(int y, |
- [core.List<core.int> x]) Function(int x)); |
+ Expect.isTrue(m15 is List<T> Function(int y, [core.List<core.int> x]) |
+ Function(int x)); |
Expect.isTrue(confuse(m15) is F15); |
// In checked mode, verifies the type. |
x15 = m15; |
@@ -697,7 +670,7 @@ class U5<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); |
}); |
@@ -847,7 +820,7 @@ class U5<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); |
}); |
@@ -948,7 +921,7 @@ class U5<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); |
}); |