Index: tests/language/function_type/function_type33_test.dart |
diff --git a/tests/language/function_type/function_type33_test.dart b/tests/language/function_type/function_type33_test.dart |
index 729e0b561cf1c456f2c32f2c4972345ceb3278bc..d286186eb0bafc0f450e5b3add7ec241d25d96f4 100644 |
--- a/tests/language/function_type/function_type33_test.dart |
+++ b/tests/language/function_type/function_type33_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(core.List<core.int> x); |
-typedef F1<T> |
- = List<Function> Function(int y, {Function x}); |
-typedef F2<T> |
- = List<T> Function(int x0, {int x}); |
-typedef F3<T> |
- = Function(int x0, {List<T> x}); |
-typedef F4<T> |
- = Function<A>(Function x); |
-typedef F5<T> |
- = int Function(int x2, [Function x3]) Function(int x); |
-typedef F6<T> |
- = int Function(int x1, {core.List<core.int> x}) Function(int x); |
-typedef F7<T> |
- = Function Function(Function x) Function(int x); |
-typedef F8<T> |
- = Function Function(int y, [core.List<core.int> x]) Function(int x); |
-typedef F9<T> |
- = List<Function> Function([int x1]) Function(int x); |
-typedef F10<T> |
- = List<Function> Function({List<Function> x}) Function(int x); |
-typedef F11<T> |
- = List<Function> Function() Function(int x); |
-typedef F12<T> |
- = core.List<core.int> Function(int x1, [List<Function> x]) Function(int x); |
-typedef F13<T> |
- = core.List<core.int> Function([List<T> x1]) Function(int x); |
-typedef F14<T> |
- = List<T> Function(int x, [Function x1]) Function(int x); |
-typedef F15<T> |
- = List<T> Function(int y, {core.List<core.int> x}) Function(int x); |
-typedef F16<T> |
- = Function([Function x]) Function(int x); |
-typedef F17<T> |
- = Function(core.List<core.int> x1) Function(int x); |
-typedef F18<T> |
- = void Function(int x2, [int x3]) Function(int x); |
-typedef F19<T> |
- = void Function(int x1, {List<Function> x}) Function(int x); |
-typedef F20<T> |
- = int Function<A>(int x) Function(int x); |
-typedef F21<T> |
- = core.List<core.int> Function<A>(Function x) Function(int x); |
-typedef F22<T> |
- = A Function<A>(List<Function> x) Function(int x); |
-typedef F23<T> |
- = B Function(B x) Function<B extends core.int>(int x); |
+typedef F0<T> = int Function(core.List<core.int> x); |
+typedef F1<T> = List<Function> Function(int y, {Function x}); |
+typedef F2<T> = List<T> Function(int x0, {int x}); |
+typedef F3<T> = Function(int x0, {List<T> x}); |
+typedef F4<T> = Function<A>(Function x); |
+typedef F5<T> = int Function(int x2, [Function x3]) Function(int x); |
+typedef F6<T> = int Function(int x1, {core.List<core.int> x}) Function(int x); |
+typedef F7<T> = Function Function(Function x) Function(int x); |
+typedef F8<T> = Function Function(int y, [core.List<core.int> x]) Function( |
+ int x); |
+typedef F9<T> = List<Function> Function([int x1]) Function(int x); |
+typedef F10<T> = List<Function> Function({List<Function> x}) Function(int x); |
+typedef F11<T> = List<Function> Function() Function(int x); |
+typedef F12<T> = core.List<core.int> Function(int x1, [List<Function> x]) |
+ Function(int x); |
+typedef F13<T> = core.List<core.int> Function([List<T> x1]) Function(int x); |
+typedef F14<T> = List<T> Function(int x, [Function x1]) Function(int x); |
+typedef F15<T> = List<T> Function(int y, {core.List<core.int> x}) Function( |
+ int x); |
+typedef F16<T> = Function([Function x]) Function(int x); |
+typedef F17<T> = Function(core.List<core.int> x1) Function(int x); |
+typedef F18<T> = void Function(int x2, [int x3]) Function(int x); |
+typedef F19<T> = void Function(int x1, {List<Function> x}) Function(int x); |
+typedef F20<T> = int Function<A>(int x) Function(int x); |
+typedef F21<T> = core.List<core.int> Function<A>(Function x) Function(int x); |
+typedef F22<T> = A Function<A>(List<Function> x) Function(int x); |
+typedef F23<T> = B Function(B x) Function<B extends core.int>(int x); |
int f0(core.List<core.int> x) => null; |
List<Function> f1(int y, {Function x}) => null; |
@@ -262,7 +235,7 @@ class U33<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 U33<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); |
}); |
@@ -448,8 +421,8 @@ class U33<T> { |
} |
Expect.isTrue(m8 is F8); |
- Expect.isTrue(m8 is Function Function(int y, |
- [core.List<core.int> x]) Function(int x)); |
+ Expect.isTrue(m8 is Function Function(int y, [core.List<core.int> x]) |
+ Function(int x)); |
Expect.isTrue(confuse(m8) is F8); |
// In checked mode, verifies the type. |
x8 = m8; |
@@ -548,7 +521,8 @@ class U33<T> { |
Expect.isTrue(m12 is F12); |
Expect.isTrue(m12 is core.List<core.int> Function(int x1, |
- [List<Function> x]) Function(int x)); |
+ [List<Function> x]) |
+ Function(int x)); |
Expect.isTrue(confuse(m12) is F12); |
// In checked mode, verifies the type. |
x12 = m12; |
@@ -588,7 +562,7 @@ class U33<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); |
}); |
@@ -641,7 +615,7 @@ class U33<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); |
}); |
@@ -678,8 +652,8 @@ class U33<T> { |
} |
Expect.isTrue(m15 is F15); |
- Expect.isTrue(m15 is List<T> Function(int y, |
- {core.List<core.int> x}) Function(int x)); |
+ Expect.isTrue(m15 is List<T> Function(int y, {core.List<core.int> x}) |
+ Function(int x)); |
Expect.isTrue(confuse(m15) is F15); |
// In checked mode, verifies the type. |
x15 = m15; |
@@ -694,7 +668,7 @@ class U33<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); |
}); |