diff --git a/tests/language_2/language_2_analyzer.status b/tests/language_2/language_2_analyzer.status index 851c4d47a17..c15bd6e030a 100644 --- a/tests/language_2/language_2_analyzer.status +++ b/tests/language_2/language_2_analyzer.status @@ -74,11 +74,9 @@ issue31596_super_test/none: CompileTimeError issue31596_tearoff_test: CompileTimeError issue31596_test: CompileTimeError malformed2_test: Pass, MissingCompileTimeError # Issue 31056. -mixin_declaration/mixin_declaration_invalid_application_supertype_test/none: CompileTimeError # test issue: Expect.isNotType is not defined -mixin_declaration/mixin_declaration_invalid_override_test/none: CompileTimeError # test issue: A5Foo is abstract mixin_declaration/mixin_declaration_invalid_superinvocation_test/none: CompileTimeError # bug in analyzer? Exchange UnaryNum, UnaryOptionalNum, and it works. -mixin_declaration/mixin_declaration_subtype_test: CompileTimeError # test issue: missing formal parameters -mixin_declaration/mixin_declaration_superinvocation_application_test/none: CompileTimeError # test issue: class missing +mixin_declaration/mixin_declaration_subtype_test: CompileTimeError +mixin_declaration/mixin_declaration_superinvocation_application_test/05: MissingCompileTimeError mixin_declaration/mixin_declaration_supertype_compatible_test/04: MissingCompileTimeError # no most specific signature mixin_declaration/mixin_declaration_syntax_test: CompileTimeError # test issue: many of them mixin_forwarding_constructor4_test/01: CompileTimeError # See issue 15101 diff --git a/tests/language_2/mixin_declaration/mixin_declaration_invalid_application_supertype_test.dart b/tests/language_2/mixin_declaration/mixin_declaration_invalid_application_supertype_test.dart index ae44baad1bd..584003c6293 100644 --- a/tests/language_2/mixin_declaration/mixin_declaration_invalid_application_supertype_test.dart +++ b/tests/language_2/mixin_declaration/mixin_declaration_invalid_application_supertype_test.dart @@ -28,6 +28,6 @@ class _ = UnaryNum with M2; //# 05: compile-time error main() { // M1 and M2 are valid types. - Expect.isNotType(null); - Expect.isNotType(null); + Expect.notType(null); + Expect.notType(null); } diff --git a/tests/language_2/mixin_declaration/mixin_declaration_invalid_override_test.dart b/tests/language_2/mixin_declaration/mixin_declaration_invalid_override_test.dart index 3b992310259..be0ace3bb72 100644 --- a/tests/language_2/mixin_declaration/mixin_declaration_invalid_override_test.dart +++ b/tests/language_2/mixin_declaration/mixin_declaration_invalid_override_test.dart @@ -59,6 +59,8 @@ abstract class A5Foo = C5Foo with M5; // Invalid since super-invocaton of foo does not hit concrete implementation. abstract class _ = C5Bar with M5; //# 08: compile-time error +class A5FooConcrete = A5Foo with C5Bar; + main() { - Expect.equals(42, A5Foo().baz(42)); + Expect.equals(42, A5FooConcrete().baz(42)); } \ No newline at end of file diff --git a/tests/language_2/mixin_declaration/mixin_declaration_invalid_type_test.dart b/tests/language_2/mixin_declaration/mixin_declaration_invalid_type_test.dart index 712538a7c6b..0fad558482d 100644 --- a/tests/language_2/mixin_declaration/mixin_declaration_invalid_type_test.dart +++ b/tests/language_2/mixin_declaration/mixin_declaration_invalid_type_test.dart @@ -46,4 +46,4 @@ main() {} // Just to have some types. class A {} class B {} -typedef FuntType = int Function(int); \ No newline at end of file +typedef FuntType = int Function(int); diff --git a/tests/language_2/mixin_declaration/mixin_declaration_subtype_test.dart b/tests/language_2/mixin_declaration/mixin_declaration_subtype_test.dart index 7322dabc0a9..ecc9347b7e4 100644 --- a/tests/language_2/mixin_declaration/mixin_declaration_subtype_test.dart +++ b/tests/language_2/mixin_declaration/mixin_declaration_subtype_test.dart @@ -30,13 +30,13 @@ class GC implements GA, GB> {} class GD = GC with GM; -bool expectSubtype { +bool expectSubtype() { if ([] is! List) { Expect.fail("$Sub is not a subtype of $Super"); } } -bool expectNotSubtype { +bool expectNotSubtype() { if ([] is List) { Expect.fail("$Sub is a subtype of $Super"); } diff --git a/tests/language_2/mixin_declaration/mixin_declaration_superinvocation_application_test.dart b/tests/language_2/mixin_declaration/mixin_declaration_superinvocation_application_test.dart index 52c67bbca18..1a0775961c7 100644 --- a/tests/language_2/mixin_declaration/mixin_declaration_superinvocation_application_test.dart +++ b/tests/language_2/mixin_declaration/mixin_declaration_superinvocation_application_test.dart @@ -37,7 +37,7 @@ class C1 { num foo(num x) => x; } -abstract C2 extends C1 implements UnaryOptionalNum { +abstract class C2 extends C1 implements UnaryOptionalNum { num foo([num x]); } @@ -57,6 +57,6 @@ class A2 extends C2 // } main() { - A1().bar(); - A2().bar(); + A1().bar(); //# 04: continued + A2().bar(); //# 05: continued } \ No newline at end of file