Index: tests/language/function_type/function_type65_test.dart |
diff --git a/tests/language/function_type/function_type65_test.dart b/tests/language/function_type/function_type65_test.dart |
index dbf1da824445448f95677d255b24561591d7fe80..e195c5abf51f542d85faf8dd1f896d527fc45584 100644 |
--- a/tests/language/function_type/function_type65_test.dart |
+++ b/tests/language/function_type/function_type65_test.dart |
@@ -19,58 +19,32 @@ 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 x0, {int x}); |
-typedef F1<T> |
- = List<Function> Function(int x0, {List<T> x}); |
-typedef F2<T> |
- = List<T> Function({core.List<core.int> x}); |
-typedef F3<T> |
- = void Function(int x, [List<Function> x2]); |
-typedef F4<T> |
- = int Function(int x) Function(int x); |
-typedef F5<T> |
- = int Function(int y, [List<Function> x]) Function(int x); |
-typedef F6<T> |
- = int Function(int x2, [List<T> x3]) Function(int x); |
-typedef F7<T> |
- = Function Function({Function x}) Function(int x); |
-typedef F8<T> |
- = Function Function(List<T> x) Function(int x); |
-typedef F9<T> |
- = List<Function> Function(int x1, [Function x]) Function(int x); |
-typedef F10<T> |
- = List<Function> Function([core.List<core.int> x1]) Function(int x); |
-typedef F11<T> |
- = core.List<core.int> Function(int x, [int x1]) Function(int x); |
-typedef F12<T> |
- = core.List<core.int> Function(int y, {List<Function> x}) Function(int x); |
-typedef F13<T> |
- = List<T> Function([int x]) Function(int x); |
-typedef F14<T> |
- = List<T> Function(List<Function> x1) Function(int x); |
-typedef F15<T> |
- = List<T> Function(int x, [List<T> x1]) Function(int x); |
-typedef F16<T> |
- = Function(int x1, {Function x}) Function(int x); |
-typedef F17<T> |
- = Function([List<T> x]) Function(int x); |
-typedef F18<T> |
- = void Function(int y, [Function x]) Function(int x); |
-typedef F19<T> |
- = void Function(int x2, [core.List<core.int> x3]) Function(int x); |
-typedef F20<T> |
- = Function Function<A>(int x) Function(int x); |
-typedef F21<T> |
- = List<T> Function<A>(Function x) Function(int x); |
-typedef F22<T> |
- = List<A> Function<A>(List<Function> x) Function(int x); |
+typedef F0<T> = Function Function(int x0, {int x}); |
+typedef F1<T> = List<Function> Function(int x0, {List<T> x}); |
+typedef F2<T> = List<T> Function({core.List<core.int> x}); |
+typedef F3<T> = void Function(int x, [List<Function> x2]); |
+typedef F4<T> = int Function(int x) Function(int x); |
+typedef F5<T> = int Function(int y, [List<Function> x]) Function(int x); |
+typedef F6<T> = int Function(int x2, [List<T> x3]) Function(int x); |
+typedef F7<T> = Function Function({Function x}) Function(int x); |
+typedef F8<T> = Function Function(List<T> x) Function(int x); |
+typedef F9<T> = List<Function> Function(int x1, [Function x]) Function(int x); |
+typedef F10<T> = List<Function> Function([core.List<core.int> x1]) Function( |
+ int x); |
+typedef F11<T> = core.List<core.int> Function(int x, [int x1]) Function(int x); |
+typedef F12<T> = core.List<core.int> Function(int y, {List<Function> x}) |
+ Function(int x); |
+typedef F13<T> = List<T> Function([int x]) Function(int x); |
+typedef F14<T> = List<T> Function(List<Function> x1) Function(int x); |
+typedef F15<T> = List<T> Function(int x, [List<T> x1]) Function(int x); |
+typedef F16<T> = Function(int x1, {Function x}) Function(int x); |
+typedef F17<T> = Function([List<T> x]) Function(int x); |
+typedef F18<T> = void Function(int y, [Function x]) Function(int x); |
+typedef F19<T> = void Function(int x2, [core.List<core.int> x3]) Function( |
+ int x); |
+typedef F20<T> = Function Function<A>(int x) Function(int x); |
+typedef F21<T> = List<T> Function<A>(Function x) Function(int x); |
+typedef F22<T> = List<A> Function<A>(List<Function> x) Function(int x); |
Function f0(int x0, {int x}) => null; |
List<Function> f1(int x0, {List<int> x}) => null; |
@@ -232,7 +206,7 @@ class U65<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); |
}); |
@@ -284,7 +258,7 @@ class U65<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); |
}); |
@@ -409,7 +383,7 @@ class U65<T> { |
Expect.equals(tIsDynamic, m6 is F6<bool>); |
Expect.equals(tIsDynamic, confuse(m6) is F6<bool>); |
} else { |
- if (inCheckedMode) { |
+ if (typeAssertionsEnabled) { |
Expect.throws(() { |
x6 = (f6 as dynamic); |
}); |
@@ -485,7 +459,7 @@ class U65<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); |
}); |
@@ -547,8 +521,8 @@ class U65<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function( |
- [core.List<core.int> x1]) Function(int x)); |
+ Expect.isTrue(m10 is List<Function> Function([core.List<core.int> x1]) |
+ Function(int x)); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -597,8 +571,8 @@ class U65<T> { |
} |
Expect.isTrue(m12 is F12); |
- Expect.isTrue(m12 is core.List<core.int> Function(int y, |
- {List<Function> x}) Function(int x)); |
+ Expect.isTrue(m12 is core.List<core.int> Function(int y, {List<Function> x}) |
+ Function(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -637,7 +611,7 @@ class U65<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); |
}); |
@@ -689,7 +663,7 @@ class U65<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); |
}); |
@@ -741,7 +715,7 @@ class U65<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); |
}); |
@@ -817,7 +791,7 @@ class U65<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); |
}); |
@@ -942,7 +916,7 @@ class U65<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); |
}); |