Index: tests/language/function_type/function_type56_test.dart |
diff --git a/tests/language/function_type/function_type56_test.dart b/tests/language/function_type/function_type56_test.dart |
index 8f8558315913f976a7006d97c32e2fb4a6eeced8..c33ffbf129f136488bda99953001576f2e2e4d16 100644 |
--- a/tests/language/function_type/function_type56_test.dart |
+++ b/tests/language/function_type/function_type56_test.dart |
@@ -19,58 +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> |
- = Function Function(int x); |
-typedef F1<T> |
- = List<Function> Function(List<T> x); |
-typedef F2<T> |
- = List<T> Function(int y, {List<Function> x}); |
-typedef F3<T> |
- = void Function(int x0, {Function x}); |
-typedef F4<T> |
- = void Function<A>(int x); |
-typedef F5<T> |
- = int Function([List<Function> x]) Function(); |
-typedef F6<T> |
- = int Function(List<T> x0) Function(); |
-typedef F7<T> |
- = Function Function(int x1, [Function x2]) Function(); |
-typedef F8<T> |
- = Function Function(int x0, {core.List<core.int> x}) Function(); |
-typedef F9<T> |
- = List<Function> Function(Function x) Function(); |
-typedef F10<T> |
- = List<Function> Function(int y, [core.List<core.int> x]) Function(); |
-typedef F11<T> |
- = core.List<core.int> Function([int x1]) Function(); |
-typedef F12<T> |
- = core.List<core.int> Function({List<Function> x}) Function(); |
-typedef F13<T> |
- = core.List<core.int> Function() Function(); |
-typedef F14<T> |
- = List<T> Function(int x0, [List<Function> x]) Function(); |
-typedef F15<T> |
- = List<T> Function([List<T> x1]) Function(); |
-typedef F16<T> |
- = Function(int x, [Function x2]) Function(); |
-typedef F17<T> |
- = Function(int y, {core.List<core.int> x}) Function(); |
-typedef F18<T> |
- = void Function([Function x]) Function(); |
-typedef F19<T> |
- = void Function(core.List<core.int> x0) Function(); |
-typedef F20<T> |
- = int Function<A>(A x) Function(); |
-typedef F21<T> |
- = core.List<core.int> Function<A>(List<A> x) Function(); |
-typedef F22<T> |
- = List<A> Function<A>(int x) Function(); |
+typedef F0<T> = Function Function(int x); |
+typedef F1<T> = List<Function> Function(List<T> x); |
+typedef F2<T> = List<T> Function(int y, {List<Function> x}); |
+typedef F3<T> = void Function(int x0, {Function x}); |
+typedef F4<T> = void Function<A>(int x); |
+typedef F5<T> = int Function([List<Function> x]) Function(); |
+typedef F6<T> = int Function(List<T> x0) Function(); |
+typedef F7<T> = Function Function(int x1, [Function x2]) Function(); |
+typedef F8<T> = Function Function(int x0, {core.List<core.int> x}) Function(); |
+typedef F9<T> = List<Function> Function(Function x) Function(); |
+typedef F10<T> = List<Function> Function(int y, [core.List<core.int> x]) |
+ Function(); |
+typedef F11<T> = core.List<core.int> Function([int x1]) Function(); |
+typedef F12<T> = core.List<core.int> Function({List<Function> x}) Function(); |
+typedef F13<T> = core.List<core.int> Function() Function(); |
+typedef F14<T> = List<T> Function(int x0, [List<Function> x]) Function(); |
+typedef F15<T> = List<T> Function([List<T> x1]) Function(); |
+typedef F16<T> = Function(int x, [Function x2]) Function(); |
+typedef F17<T> = Function(int y, {core.List<core.int> x}) Function(); |
+typedef F18<T> = void Function([Function x]) Function(); |
+typedef F19<T> = void Function(core.List<core.int> x0) Function(); |
+typedef F20<T> = int Function<A>(A x) Function(); |
+typedef F21<T> = core.List<core.int> Function<A>(List<A> x) Function(); |
+typedef F22<T> = List<A> Function<A>(int x) Function(); |
Function f0(int x) => null; |
List<Function> f1(List<int> x) => null; |
@@ -232,7 +204,7 @@ class U56<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 +256,7 @@ class U56<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); |
}); |
@@ -408,7 +380,7 @@ class U56<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); |
}); |
@@ -518,8 +490,8 @@ class U56<T> { |
} |
Expect.isTrue(m10 is F10); |
- Expect.isTrue(m10 is List<Function> Function(int y, |
- [core.List<core.int> x]) Function()); |
+ Expect.isTrue(m10 is List<Function> Function(int y, [core.List<core.int> x]) |
+ Function()); |
Expect.isTrue(confuse(m10) is F10); |
// In checked mode, verifies the type. |
x10 = m10; |
@@ -632,7 +604,7 @@ class U56<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); |
}); |
@@ -684,7 +656,7 @@ class U56<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); |
}); |