diff --git a/tests/language_2/const_list_test.dart b/tests/language_2/const_list_test.dart index b848c9eedcf..cdc0fb305f7 100644 --- a/tests/language_2/const_list_test.dart +++ b/tests/language_2/const_list_test.dart @@ -16,32 +16,32 @@ class ConstListTest { growableList.add(i); growableList2.add(i); } - Expect.equals(true, growableList == growableList); - Expect.equals(false, growableList == growableList2); - Expect.equals(true, fixedList == fixedList); - Expect.equals(false, fixedList == fixedList2); - Expect.equals(false, fixedList == growableList); + Expect.equals(growableList, growableList); + Expect.notEquals(growableList, growableList2); + Expect.equals(fixedList, fixedList); + Expect.notEquals(fixedList, fixedList2); + Expect.notEquals(fixedList, growableList); growableList.add(4); - Expect.equals(false, fixedList == growableList); + Expect.notEquals(fixedList, growableList); Expect.equals(4, growableList.removeLast()); - Expect.equals(false, fixedList == growableList); + Expect.notEquals(fixedList, growableList); fixedList[3] = 0; - Expect.equals(false, fixedList == growableList); + Expect.notEquals(fixedList, growableList); } static testLiterals() { dynamic a = [1, 2, 3.1]; dynamic b = [1, 2, 3.1]; - Expect.equals(false, a == b); + Expect.notEquals(a, b); a = const [1, 2, 3.1]; b = const [1, 2, 3.1]; - Expect.equals(true, a == b); + Expect.identical(a, b); a = const [1, 2, 3.1]; b = const [1, 2, 3.1]; - Expect.equals(false, a == b); + Expect.identical(a, b); a = const [1, 2, 3.1]; b = const [1, 2, 3.1]; - Expect.equals(true, a == b); + Expect.notEquals(a, b); } } diff --git a/tests/language_2/emit_const_fields_test.dart b/tests/language_2/emit_const_fields_test.dart index 1a3d7a54bd0..8264c50c180 100644 --- a/tests/language_2/emit_const_fields_test.dart +++ b/tests/language_2/emit_const_fields_test.dart @@ -17,5 +17,5 @@ class Guide { main() { Expect.isTrue(42 == Guide.LTUAE); - Expect.isTrue("1978-03-08" == Guide.EARTH["Status"][1]); + Expect.isTrue("1978-03-08" == (Guide.EARTH["Status"] as List)[1]); } diff --git a/tests/language_2/function_propagation_test.dart b/tests/language_2/function_propagation_test.dart index 83e37d62153..9c6f7e62fc3 100644 --- a/tests/language_2/function_propagation_test.dart +++ b/tests/language_2/function_propagation_test.dart @@ -12,14 +12,12 @@ typedef int F(String str); main() { var a = new A(); - Expect.isFalse(a is A); - - var a2 = new A(); - Expect.isFalse(a is F); + Expect.type(a); + Expect.notType(a); Function a3 = new A(); - Expect.isFalse(a3 is A); + Expect.notType(a3); F a4 = new A(); - Expect.isFalse(a4 is A); + Expect.notType(a4); } diff --git a/tests/language_2/function_subtype_inline2_test.dart b/tests/language_2/function_subtype_inline2_test.dart index 3a67be105ab..147bd4a56b8 100644 --- a/tests/language_2/function_subtype_inline2_test.dart +++ b/tests/language_2/function_subtype_inline2_test.dart @@ -27,8 +27,8 @@ void test(var f, String constructorName) { int m1() => null; String m2() => null; -m3() => null; -m4(int i) => null; +Null m3() => null; +Null m4(int i) => null; main() { test((m) => new C.c1(m), 'c1'); diff --git a/tests/language_2/language_2_analyzer.status b/tests/language_2/language_2_analyzer.status index d7c11158840..2a073ac52c1 100644 --- a/tests/language_2/language_2_analyzer.status +++ b/tests/language_2/language_2_analyzer.status @@ -17,7 +17,6 @@ const_cast2_test/01: CompileTimeError # failing-by-design: Not a const expressio const_cast2_test/none: CompileTimeError # failing-by-design: Not a const expression, see Issue #34334 covariant_subtyping_with_mixin_test: CompileTimeError # Issue 34329 dynamic_prefix_core_test/01: MissingCompileTimeError # failing-by-design: #34339 -emit_const_fields_test: CompileTimeError # failing-by-design: #34340 enum_syntax_test/05: Fail # Issue 34341 enum_syntax_test/06: Fail # Issue 34341 f_bounded_quantification2_test: CompileTimeError # Issue 34583 diff --git a/tests/language_2/language_2_dart2js.status b/tests/language_2/language_2_dart2js.status index ea930f772d3..ac6dbe2c344 100644 --- a/tests/language_2/language_2_dart2js.status +++ b/tests/language_2/language_2_dart2js.status @@ -480,7 +480,6 @@ deferred_not_loaded_check_test: RuntimeError # Test out of date. Issue 31933 deferred_redirecting_factory_test: RuntimeError double_int_to_string_test: RuntimeError, OK # non JS number semantics dynamic_prefix_core_test/none: CompileTimeError -emit_const_fields_test: CompileTimeError enum_mirror_test: RuntimeError example_constructor_test: RuntimeError expect_test: RuntimeError, OK # Issue 13080 diff --git a/tests/language_2/language_2_dartdevc.status b/tests/language_2/language_2_dartdevc.status index e1a059261f1..3047a9dc194 100644 --- a/tests/language_2/language_2_dartdevc.status +++ b/tests/language_2/language_2_dartdevc.status @@ -35,7 +35,6 @@ covariant_subtyping_with_mixin_test: CompileTimeError # Issue 34329 deferred_load_library_wrong_args_test/01: MissingRuntimeError, RuntimeError # Issue 29920 double_identical_test: RuntimeError # Negative and positive zero are distinct, but not in ddc dynamic_prefix_core_test/01: MissingCompileTimeError -emit_const_fields_test: CompileTimeError enum_syntax_test/05: MissingCompileTimeError enum_syntax_test/06: MissingCompileTimeError execute_finally6_test: RuntimeError # Issue 29920 @@ -179,7 +178,6 @@ covariant_subtyping_test: RuntimeError deferred_load_library_wrong_args_test/01: CompileTimeError double_identical_test: RuntimeError # Negative and positive zero are distinct, but not in ddk dynamic_prefix_core_test/none: CompileTimeError -emit_const_fields_test: CompileTimeError # Issue 31533 external_test/21: CompileTimeError external_test/24: CompileTimeError function_propagation_test: RuntimeError diff --git a/tests/language_2/language_2_kernel.status b/tests/language_2/language_2_kernel.status index e681ec8e397..8c244dd3116 100644 --- a/tests/language_2/language_2_kernel.status +++ b/tests/language_2/language_2_kernel.status @@ -48,7 +48,6 @@ deferred_not_loaded_check_test: RuntimeError deferred_redirecting_factory_test: RuntimeError deferred_static_seperate_test: RuntimeError dynamic_prefix_core_test/none: CompileTimeError -emit_const_fields_test: CompileTimeError example_constructor_test: RuntimeError external_test/10: MissingRuntimeError external_test/13: MissingRuntimeError @@ -713,7 +712,6 @@ deferred_redirecting_factory_test: CompileTimeError, Fail, Crash # Issue 23408, deferred_static_seperate_test: RuntimeError # KernelVM bug: Deferred loading kernel issue 30273. deopt_inlined_function_lazy_test: Skip # Incompatible flag: --deoptimize-alot dynamic_prefix_core_test/none: CompileTimeError -emit_const_fields_test: CompileTimeError # Issue 31533 enum_mirror_test: SkipByDesign example_constructor_test: Fail, OK export_ambiguous_main_test: Skip # Issue 29895 Fail Issue 14763 @@ -870,7 +868,6 @@ const_constructor3_test/04: MissingCompileTimeError constants_test/05: MissingCompileTimeError deferred_load_library_wrong_args_test/01: CompileTimeError dynamic_prefix_core_test/none: CompileTimeError -emit_const_fields_test: CompileTimeError external_test/21: CompileTimeError external_test/24: CompileTimeError generic_no_such_method_dispatcher_simple_test: CompileTimeError @@ -1260,7 +1257,6 @@ deferred_redirecting_factory_test: RuntimeError # KernelVM bug: Deferred loading deferred_static_seperate_test: RuntimeError # KernelVM bug: Deferred loading kernel issue 30273. disassemble_test: Pass, Slow, Crash # dartbug.com/34971 dynamic_prefix_core_test/none: CompileTimeError -emit_const_fields_test: CompileTimeError # Issue 31533 example_constructor_test: Fail, OK external_test/10: MissingRuntimeError # KernelVM bug: Unbound external. external_test/13: MissingRuntimeError # KernelVM bug: Unbound external. diff --git a/tests/language_2/super_test.dart b/tests/language_2/super_test.dart index 7394989aebf..f96f4fec957 100644 --- a/tests/language_2/super_test.dart +++ b/tests/language_2/super_test.dart @@ -17,10 +17,10 @@ main() { Expect.equals(3, sub.u); sub = new Sub.stat(); - Expect.equals(0, sub.x); - Expect.equals(1, sub.y); - Expect.equals(2, sub.v); - Expect.equals(3, sub.w); + Expect.equals(2, sub.x); + Expect.equals(3, sub.y); + Expect.equals(0, sub.v); + Expect.equals(1, sub.w); Expect.equals(4, sub.z); Expect.equals(5, sub.u); }