Index: tests/language/function_type/function_type85_test.dart |
diff --git a/tests/language/function_type/function_type85_test.dart b/tests/language/function_type/function_type85_test.dart |
index 44e1ae25c2bc05b022b20da5b6ffe518f9f6b274..f6fb2d7e98069d48bc5e2ea7c018517d29a59b25 100644 |
--- a/tests/language/function_type/function_type85_test.dart |
+++ b/tests/language/function_type/function_type85_test.dart |
@@ -19,58 +19,31 @@ import 'package:expect/expect.dart'; |
@AssumeDynamic() |
confuse(f) => f; |
-final bool inCheckedMode = (() { |
- bool result = false; |
- assert(result = true); |
- return result; |
-})(); |
- |
-typedef F0<T> |
- = Function Function(int x, [List<Function> x2]); |
-typedef F1<T> |
- = core.List<core.int> Function(int x1, [Function x2]); |
-typedef F2<T> |
- = Function([int x1]); |
-typedef F3<T> |
- = void Function([List<T> x1]); |
-typedef F4<T> |
- = int Function([int x1]) Function(int x); |
-typedef F5<T> |
- = int Function({List<Function> x}) Function(int x); |
-typedef F6<T> |
- = int Function() Function(int x); |
-typedef F7<T> |
- = Function Function(int x1, [List<Function> x]) Function(int x); |
-typedef F8<T> |
- = Function Function([List<T> x1]) Function(int x); |
-typedef F9<T> |
- = List<Function> Function(int x, [Function x1]) Function(int x); |
-typedef F10<T> |
- = List<Function> Function(int y, {core.List<core.int> x}) Function(int x); |
-typedef F11<T> |
- = core.List<core.int> Function([Function x]) Function(int x); |
-typedef F12<T> |
- = core.List<core.int> Function(core.List<core.int> x1) Function(int x); |
-typedef F13<T> |
- = List<T> Function(int x2, [int x3]) Function(int x); |
-typedef F14<T> |
- = List<T> Function(int x1, {List<Function> x}) Function(int x); |
-typedef F15<T> |
- = Function(int x) Function(int x); |
-typedef F16<T> |
- = Function(int y, [List<Function> x]) Function(int x); |
-typedef F17<T> |
- = Function(int x2, [List<T> x3]) Function(int x); |
-typedef F18<T> |
- = void Function({Function x}) Function(int x); |
-typedef F19<T> |
- = void Function(List<T> x) Function(int x); |
-typedef F20<T> |
- = Function Function<A>() Function(int x); |
-typedef F21<T> |
- = List<T> Function<A>(A x) Function(int x); |
-typedef F22<T> |
- = List<A> Function<A>(List<A> x) Function(int x); |
+typedef F0<T> = Function Function(int x, [List<Function> x2]); |
+typedef F1<T> = core.List<core.int> Function(int x1, [Function x2]); |
+typedef F2<T> = Function([int x1]); |
+typedef F3<T> = void Function([List<T> x1]); |
+typedef F4<T> = int Function([int x1]) Function(int x); |
+typedef F5<T> = int Function({List<Function> x}) Function(int x); |
+typedef F6<T> = int Function() Function(int x); |
+typedef F7<T> = Function Function(int x1, [List<Function> x]) Function(int x); |
+typedef F8<T> = Function Function([List<T> x1]) Function(int x); |
+typedef F9<T> = List<Function> Function(int x, [Function x1]) Function(int x); |
+typedef F10<T> = List<Function> Function(int y, {core.List<core.int> x}) |
+ Function(int x); |
+typedef F11<T> = core.List<core.int> Function([Function x]) Function(int x); |
+typedef F12<T> = core.List<core.int> Function(core.List<core.int> x1) Function( |
+ int x); |
+typedef F13<T> = List<T> Function(int x2, [int x3]) Function(int x); |
+typedef F14<T> = List<T> Function(int x1, {List<Function> x}) Function(int x); |
+typedef F15<T> = Function(int x) Function(int x); |
+typedef F16<T> = Function(int y, [List<Function> x]) Function(int x); |
+typedef F17<T> = Function(int x2, [List<T> x3]) Function(int x); |
+typedef F18<T> = void Function({Function x}) Function(int x); |
+typedef F19<T> = void Function(List<T> x) Function(int x); |
+typedef F20<T> = Function Function<A>() Function(int x); |
+typedef F21<T> = List<T> Function<A>(A x) Function(int x); |
+typedef F22<T> = List<A> Function<A>(List<A> x) Function(int x); |
Function f0(int x, [List<Function> x0]) => null; |
core.List<core.int> f1(int x0, [Function x1]) => null; |
@@ -280,7 +253,7 @@ class U85<T> { |
Expect.equals(tIsDynamic, m3 is F3<bool>); |
Expect.equals(tIsDynamic, confuse(m3) is F3<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x3 = (f3 as dynamic); |
}); |
@@ -429,7 +402,7 @@ class U85<T> { |
Expect.equals(tIsDynamic, m8 is F8<bool>); |
Expect.equals(tIsDynamic, confuse(m8) is F8<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x8 = (f8 as dynamic); |
}); |
@@ -491,8 +464,8 @@ class U85<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int y, |
- {core.List<core.int> x}) Function(int x)); |
+ Expect.isTrue(m10 is List<Function> Function(int y, {core.List<core.int> x}) |
+ Function(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -541,8 +514,8 @@ class U85<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function( |
- core.List<core.int> x1) Function(int x)); |
+ Expect.isTrue(m12 is core.List<core.int> Function(core.List<core.int> x1) |
+ Function(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -581,7 +554,7 @@ class U85<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); |
}); |
@@ -634,7 +607,7 @@ class U85<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); |
}); |
@@ -734,7 +707,7 @@ class U85<T> { |
Expect.equals(tIsDynamic, m17 is F17<bool>); |
Expect.equals(tIsDynamic, confuse(m17) is F17<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x17 = (f17 as dynamic); |
}); |
@@ -810,7 +783,7 @@ class U85<T> { |
Expect.equals(tIsDynamic, m19 is F19<bool>); |
Expect.equals(tIsDynamic, confuse(m19) is F19<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x19 = (f19 as dynamic); |
}); |
@@ -886,7 +859,7 @@ class U85<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); |
}); |