Index: tests/language/function_type/function_type25_test.dart |
diff --git a/tests/language/function_type/function_type25_test.dart b/tests/language/function_type/function_type25_test.dart |
index 6ee5d165e1f00c8c706cd0fa0d7b1d3718a3e13e..189104a544f7eb6ef9b17f8fa4d9aca92fffbbc6 100644 |
--- a/tests/language/function_type/function_type25_test.dart |
+++ b/tests/language/function_type/function_type25_test.dart |
@@ -19,60 +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 y, [List<Function> x]); |
-typedef F1<T> |
- = List<Function> Function(int x0, [Function x]); |
-typedef F2<T> |
- = List<T> Function([int x]); |
-typedef F3<T> |
- = Function([List<T> x]); |
-typedef F4<T> |
- = List<T> Function<A>(Function x); |
-typedef F5<T> |
- = int Function(Function x1) Function(int x); |
-typedef F6<T> |
- = int Function(int x, [core.List<core.int> x1]) Function(int x); |
-typedef F7<T> |
- = Function Function(int x1, {int x}) Function(int x); |
-typedef F8<T> |
- = Function Function([core.List<core.int> x]) Function(int x); |
-typedef F9<T> |
- = List<Function> Function(int y, [int x]) Function(int x); |
-typedef F10<T> |
- = List<Function> Function(int x2, [List<Function> x3]) Function(int x); |
-typedef F11<T> |
- = List<Function> Function(int x1, {List<T> x}) Function(int x); |
-typedef F12<T> |
- = core.List<core.int> Function(List<Function> x) Function(int x); |
-typedef F13<T> |
- = core.List<core.int> Function(int y, [List<T> x]) Function(int x); |
-typedef F14<T> |
- = List<T> Function([Function x1]) Function(int x); |
-typedef F15<T> |
- = List<T> Function({core.List<core.int> x}) Function(int x); |
-typedef F16<T> |
- = Function(int y, {int x}) Function(int x); |
-typedef F17<T> |
- = Function(int x1, [core.List<core.int> x]) Function(int x); |
-typedef F18<T> |
- = void Function(int x1) Function(int x); |
-typedef F19<T> |
- = void Function(int x, [List<Function> x1]) Function(int x); |
-typedef F20<T> |
- = void Function(int y, {List<T> x}) Function(int x); |
-typedef F21<T> |
- = List<Function> Function<A>(List<A> x) Function(int x); |
-typedef F22<T> |
- = A Function<A>(int x) Function(int x); |
-typedef F23<T> |
- = List<Function> Function(B x) Function<B extends core.int>(int x); |
+typedef F0<T> = int Function(int y, [List<Function> x]); |
+typedef F1<T> = List<Function> Function(int x0, [Function x]); |
+typedef F2<T> = List<T> Function([int x]); |
+typedef F3<T> = Function([List<T> x]); |
+typedef F4<T> = List<T> Function<A>(Function x); |
+typedef F5<T> = int Function(Function x1) Function(int x); |
+typedef F6<T> = int Function(int x, [core.List<core.int> x1]) Function(int x); |
+typedef F7<T> = Function Function(int x1, {int x}) Function(int x); |
+typedef F8<T> = Function Function([core.List<core.int> x]) Function(int x); |
+typedef F9<T> = List<Function> Function(int y, [int x]) Function(int x); |
+typedef F10<T> = List<Function> Function(int x2, [List<Function> x3]) Function( |
+ int x); |
+typedef F11<T> = List<Function> Function(int x1, {List<T> x}) Function(int x); |
+typedef F12<T> = core.List<core.int> Function(List<Function> x) Function(int x); |
+typedef F13<T> = core.List<core.int> Function(int y, [List<T> x]) Function( |
+ int x); |
+typedef F14<T> = List<T> Function([Function x1]) Function(int x); |
+typedef F15<T> = List<T> Function({core.List<core.int> x}) Function(int x); |
+typedef F16<T> = Function(int y, {int x}) Function(int x); |
+typedef F17<T> = Function(int x1, [core.List<core.int> x]) Function(int x); |
+typedef F18<T> = void Function(int x1) Function(int x); |
+typedef F19<T> = void Function(int x, [List<Function> x1]) Function(int x); |
+typedef F20<T> = void Function(int y, {List<T> x}) Function(int x); |
+typedef F21<T> = List<Function> Function<A>(List<A> x) Function(int x); |
+typedef F22<T> = A Function<A>(int x) Function(int x); |
+typedef F23<T> = List<Function> Function(B x) Function<B extends core.int>( |
+ int x); |
int f0(int y, [List<Function> x]) => null; |
List<Function> f1(int x0, [Function x]) => null; |
@@ -262,7 +235,7 @@ class U25<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); |
}); |
@@ -314,7 +287,7 @@ class U25<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); |
}); |
@@ -366,7 +339,7 @@ class U25<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); |
}); |
@@ -526,8 +499,8 @@ class U25<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int x2, |
- [List<Function> x3]) Function(int x)); |
+ Expect.isTrue(m10 is List<Function> Function(int x2, [List<Function> x3]) |
+ Function(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -567,7 +540,7 @@ class U25<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); |
}); |
@@ -629,8 +602,8 @@ class U25<T> { |
} |
Expect.isTrue(m13 is F13); |
- Expect.isTrue(m13 is core.List<core.int> Function(int y, |
- [List<T> x]) Function(int x)); |
+ Expect.isTrue(m13 is core.List<core.int> Function(int y, [List<T> x]) |
+ Function(int x)); |
Expect.isTrue(confuse(m13) is F13); |
// In checked mode, verifies the type. |
x13 = m13; |
@@ -645,7 +618,7 @@ class U25<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); |
}); |
@@ -698,7 +671,7 @@ class U25<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); |
}); |
@@ -751,7 +724,7 @@ class U25<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); |
}); |
@@ -901,7 +874,7 @@ class U25<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); |
}); |
@@ -986,8 +959,8 @@ class U25<T> { |
} |
Expect.isTrue(m23 is F23); |
- Expect.isTrue(m23 is List<Function> Function( |
- B x) Function<B extends core.int>(int x)); |
+ Expect.isTrue(m23 is List<Function> Function(B x) |
+ Function<B extends core.int>(int x)); |
Expect.isTrue(confuse(m23) is F23); |
// In checked mode, verifies the type. |
x23 = m23; |