Index: tests/language/function_type/function_type12_test.dart |
diff --git a/tests/language/function_type/function_type12_test.dart b/tests/language/function_type/function_type12_test.dart |
index 9f3079120b7fc5b42cb233fa4362c5f1b88e8011..57821923a2f425d8ab00b7cdb401cb055a47dcf6 100644 |
--- a/tests/language/function_type/function_type12_test.dart |
+++ b/tests/language/function_type/function_type12_test.dart |
@@ -19,60 +19,30 @@ 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([Function x]); |
-typedef F1<T> |
- = List<Function> Function(int x); |
-typedef F2<T> |
- = core.List<core.int> Function(List<T> x); |
-typedef F3<T> |
- = Function(int y, {List<Function> x}); |
-typedef F4<T> |
- = List<Function> Function<A>(List<T> x); |
-typedef F5<T> |
- = int Function([Function x]) Function(); |
-typedef F6<T> |
- = int Function(core.List<core.int> x0) Function(); |
-typedef F7<T> |
- = Function Function(int x1, [int x2]) Function(); |
-typedef F8<T> |
- = Function Function(int x0, {List<Function> x}) Function(); |
-typedef F9<T> |
- = List<Function> Function(int x) Function(); |
-typedef F10<T> |
- = List<Function> Function(int y, [List<Function> x]) Function(); |
-typedef F11<T> |
- = List<Function> Function(int x1, [List<T> x2]) Function(); |
-typedef F12<T> |
- = core.List<core.int> Function({Function x}) Function(); |
-typedef F13<T> |
- = core.List<core.int> Function(List<T> x) Function(); |
-typedef F14<T> |
- = List<T> Function(int x0, [Function x]) Function(); |
-typedef F15<T> |
- = List<T> Function([core.List<core.int> x1]) Function(); |
-typedef F16<T> |
- = Function(int x, [int x2]) Function(); |
-typedef F17<T> |
- = Function(int y, {List<Function> x}) Function(); |
-typedef F18<T> |
- = void Function([int x]) Function(); |
-typedef F19<T> |
- = void Function(List<Function> x0) Function(); |
-typedef F20<T> |
- = void Function(int x, [List<T> x2]) Function(); |
-typedef F21<T> |
- = List<Function> Function<A>(List<T> x) Function(); |
-typedef F22<T> |
- = Function<A>() Function(); |
-typedef F23<T> |
- = void Function<A>(A x) Function(); |
+typedef F0<T> = int Function([Function x]); |
+typedef F1<T> = List<Function> Function(int x); |
+typedef F2<T> = core.List<core.int> Function(List<T> x); |
+typedef F3<T> = Function(int y, {List<Function> x}); |
+typedef F4<T> = List<Function> Function<A>(List<T> x); |
+typedef F5<T> = int Function([Function x]) Function(); |
+typedef F6<T> = int Function(core.List<core.int> x0) Function(); |
+typedef F7<T> = Function Function(int x1, [int x2]) Function(); |
+typedef F8<T> = Function Function(int x0, {List<Function> x}) Function(); |
+typedef F9<T> = List<Function> Function(int x) Function(); |
+typedef F10<T> = List<Function> Function(int y, [List<Function> x]) Function(); |
+typedef F11<T> = List<Function> Function(int x1, [List<T> x2]) Function(); |
+typedef F12<T> = core.List<core.int> Function({Function x}) Function(); |
+typedef F13<T> = core.List<core.int> Function(List<T> x) Function(); |
+typedef F14<T> = List<T> Function(int x0, [Function x]) Function(); |
+typedef F15<T> = List<T> Function([core.List<core.int> x1]) Function(); |
+typedef F16<T> = Function(int x, [int x2]) Function(); |
+typedef F17<T> = Function(int y, {List<Function> x}) Function(); |
+typedef F18<T> = void Function([int x]) Function(); |
+typedef F19<T> = void Function(List<Function> x0) Function(); |
+typedef F20<T> = void Function(int x, [List<T> x2]) Function(); |
+typedef F21<T> = List<Function> Function<A>(List<T> x) Function(); |
+typedef F22<T> = Function<A>() Function(); |
+typedef F23<T> = void Function<A>(A x) Function(); |
int f0([Function x]) => null; |
List<Function> f1(int x) => null; |
@@ -262,7 +232,7 @@ class U12<T> { |
Expect.equals(tIsDynamic, m2 is F2<bool>); |
Expect.equals(tIsDynamic, confuse(m2) is F2<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x2 = (f2 as dynamic); |
}); |
@@ -338,7 +308,7 @@ class U12<T> { |
Expect.equals(tIsDynamic, m4 is F4<bool>); |
Expect.equals(tIsDynamic, confuse(m4) is F4<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x4 = (f4 as dynamic); |
}); |
@@ -537,7 +507,7 @@ class U12<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); |
}); |
@@ -613,7 +583,7 @@ class U12<T> { |
Expect.equals(tIsDynamic, m13 is F13<bool>); |
Expect.equals(tIsDynamic, confuse(m13) is F13<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x13 = (f13 as dynamic); |
}); |
@@ -665,7 +635,7 @@ class U12<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); |
}); |
@@ -717,7 +687,7 @@ class U12<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); |
}); |
@@ -865,7 +835,7 @@ class U12<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); |
}); |
@@ -917,7 +887,7 @@ class U12<T> { |
Expect.equals(tIsDynamic, m21 is F21<bool>); |
Expect.equals(tIsDynamic, confuse(m21) is F21<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x21 = (f21 as dynamic); |
}); |