From f8086c81ae304520ac9c3ae1e8411e67bb26119b Mon Sep 17 00:00:00 2001 From: "Lasse R.H. Nielsen" Date: Fri, 11 Oct 2024 16:53:52 +0000 Subject: [PATCH] Collect all test-related files in `package:expect`. Collects files from `package:async_helper` and `tests/language` that are generally useful, so that all test-related helpers are in `package:expect`. Moves the two libraries from `package:async_helper` into `package:expect`, and the `tests/language/static_type_helper.dart` file too. Deprecates `async_minitest.dart`, to follow `minitest.dart`, expecting the Flutter use of it to have been fixed to not break on deprecation (I believe Flutter no longer breaks builds on deprecations at all). Patch 1 is the actual change. Patch 2+4+8 is changing all existing references to the files. Patch 6 ignores deprecation in files still using `async_minitest.dart`. 3+5+7+9 are updating this text to make the numbers match. Then it's just test-expectations and small tweaks from there. Change-Id: I1b665135b5fef9b9a0c3b340ffe9daf874d0174c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/373120 Reviewed-by: Nate Bosch Reviewed-by: Devon Carew Commit-Queue: Lasse Nielsen --- docs/Testing.md | 6 +- pkg/async_helper/lib/async_helper.dart | 154 +------- pkg/async_helper/lib/async_minitest.dart | 334 +---------------- pkg/compiler/pubspec.yaml | 1 - .../test/analyses/analysis_helper.dart | 2 +- .../test/analyses/api_dynamic_test.dart | 2 +- .../test/annotations/annotations_test.dart | 2 +- pkg/compiler/test/closure/closure_test.dart | 2 +- .../arithmetic_simplification_test.dart | 2 +- .../codegen/array_static_intercept_test.dart | 2 +- pkg/compiler/test/codegen/bitops1_test.dart | 2 +- pkg/compiler/test/codegen/bitops2_test.dart | 2 +- .../codegen/builtin_interceptor_test.dart | 2 +- .../test/codegen/class_codegen2_test.dart | 2 +- .../test/codegen/class_codegen_test.dart | 2 +- .../test/codegen/class_order_test.dart | 2 +- ...closure_call_of_static_reduction_test.dart | 2 +- .../test/codegen/closure_codegen_test.dart | 2 +- .../test/codegen/code_motion_test.dart | 2 +- .../test/codegen/codegen_test_helper.dart | 2 +- .../constant_folding_codeUnitAt_test.dart | 2 +- .../test/codegen/constant_folding_test.dart | 2 +- .../test/codegen/constant_namer_test.dart | 2 +- pkg/compiler/test/codegen/dead_code_test.dart | 2 +- .../codegen/dead_phi_eliminator_test.dart | 2 +- .../test/codegen/declare_once_test.dart | 2 +- .../codegen/elide_callthrough_stub_test.dart | 2 +- .../test/codegen/emit_const_fields_test.dart | 2 +- pkg/compiler/test/codegen/equals_test.dart | 2 +- .../codegen/expect_annotations2_test.dart | 2 +- .../test/codegen/expect_annotations_test.dart | 2 +- .../test/codegen/field_codegen_test.dart | 2 +- .../test/codegen/field_update_test.dart | 2 +- pkg/compiler/test/codegen/for_in_test.dart | 2 +- .../test/codegen/forloop_box_test.dart | 2 +- .../codegen/generate_at_use_site_test.dart | 2 +- .../test/codegen/generic_method_test.dart | 2 +- pkg/compiler/test/codegen/gvn_test.dart | 2 +- pkg/compiler/test/codegen/identity_test.dart | 2 +- .../test/codegen/if_do_while_test.dart | 2 +- .../interceptor_almost_constant_test.dart | 2 +- .../test/codegen/interceptor_test.dart | 2 +- .../codegen/interpolation_folding_test.dart | 2 +- .../test/codegen/inverse_operator_test.dart | 2 +- .../test/codegen/is_function_test.dart | 2 +- .../test/codegen/is_inference2_test.dart | 2 +- .../test/codegen/is_inference_test.dart | 2 +- .../test/codegen/jsarray_indexof_test.dart | 2 +- .../codegen/late_field_redundancy_test.dart | 2 +- .../test/codegen/late_field_test.dart | 2 +- pkg/compiler/test/codegen/licm_test.dart | 2 +- .../test/codegen/list_tracer_length_test.dart | 2 +- .../codegen/list_tracer_node_type_test.dart | 2 +- .../test/codegen/literal_list_test.dart | 2 +- .../test/codegen/literal_map_test.dart | 2 +- .../test/codegen/load_elimination_test.dart | 2 +- pkg/compiler/test/codegen/loop_test.dart | 2 +- .../test/codegen/minify_many_locals_test.dart | 2 +- pkg/compiler/test/codegen/model_test.dart | 2 +- .../test/codegen/modulo_remainder_test.dart | 2 +- .../negation_shift_regression_test.dart | 2 +- .../test/codegen/new_rti_is_test.dart | 2 +- .../codegen/no_constructor_body_test.dart | 2 +- .../no_duplicate_constructor_body2_test.dart | 2 +- .../no_duplicate_constructor_body_test.dart | 2 +- .../test/codegen/no_duplicate_stub_test.dart | 2 +- .../test/codegen/null_check_test.dart | 2 +- pkg/compiler/test/codegen/null_type_test.dart | 2 +- .../test/codegen/number_output_test.dart | 2 +- .../parameter_phi_elimination_test.dart | 2 +- .../test/codegen/pragma_annotations_test.dart | 2 +- .../test/codegen/pretty_parameter_test.dart | 2 +- .../redundant_phi_eliminator_test.dart | 2 +- .../test/codegen/regress_10231_test.dart | 2 +- .../codegen/shift_right_unsigned_test.dart | 2 +- .../side_effect_tdiv_regression_test.dart | 2 +- .../simple_inferrer_relations_test.dart | 2 +- .../test/codegen/ssa_phi_codegen_test.dart | 2 +- .../test/codegen/static_closure_test.dart | 2 +- .../test/codegen/strength_eq_test.dart | 2 +- .../test/codegen/string_add_test.dart | 2 +- .../test/codegen/string_escapes_test.dart | 2 +- .../codegen/string_interpolation_test.dart | 2 +- .../codegen/switch_empty_default_test.dart | 2 +- pkg/compiler/test/codegen/tdiv_test.dart | 2 +- .../top_level_closure_tree_shake_test.dart | 2 +- .../test/codegen/tree_shaking_test.dart | 2 +- .../codegen/trust_type_annotations2_test.dart | 2 +- .../codegen/trust_type_annotations_test.dart | 2 +- .../test/codegen/type_guard_unuser_test.dart | 2 +- .../test/codegen/type_inference2_test.dart | 2 +- .../test/codegen/type_inference3_test.dart | 2 +- .../test/codegen/type_inference4_test.dart | 2 +- .../test/codegen/type_inference5_test.dart | 2 +- .../test/codegen/type_inference8_test.dart | 2 +- .../types_of_captured_variables_test.dart | 2 +- .../test/codegen/unused_empty_map_test.dart | 2 +- .../test/codegen/use_checks_test.dart | 2 +- .../test/codegen/use_strict_test.dart | 2 +- .../test/codegen/value_range3_test.dart | 2 +- .../test/codegen/value_range_test.dart | 2 +- .../codegen/variance_subtype_cast_test.dart | 2 +- .../test/custom_split/custom_split_test.dart | 2 +- pkg/compiler/test/deferred/closures_test.dart | 2 +- .../deferred/deferred_constant3_test.dart | 2 +- .../dont_inline_deferred_constants_test.dart | 2 +- .../dont_inline_deferred_globals_test.dart | 2 +- .../test/deferred/emit_type_checks_test.dart | 2 +- .../follow_constant_dependencies_test.dart | 2 +- ...follow_implicit_super_regression_test.dart | 2 +- .../deferred/inline_restrictions_test.dart | 2 +- .../load_graph_segmentation2_test.dart | 2 +- .../load_graph_segmentation_test.dart | 2 +- .../test/deferred/load_mapping_test.dart | 2 +- .../test/deferred/not_in_main_test.dart | 2 +- .../test/deferred/unneeded_part_js_test.dart | 2 +- .../data/deferred_fail_and_retry/main.dart | 2 +- .../data/static_separate/main.dart | 2 +- .../deferred_load_id_map_helper.dart | 2 +- .../deferred_loading_test.dart | 2 +- .../dump_info_new_regression_test.dart | 2 +- .../test/dump_info/dump_info_new_test.dart | 2 +- .../test/dump_info/dump_info_test.dart | 2 +- .../test/end_to_end/all_native_test.dart | 2 +- .../test/end_to_end/command_line_test.dart | 2 +- .../test/end_to_end/dart2js_batch2_test.dart | 2 +- .../test/end_to_end/dart2js_batch_test.dart | 2 +- .../test/end_to_end/dill_loader_test.dart | 2 +- .../test/end_to_end/dump_info2_test.dart | 2 +- .../test/end_to_end/exit_code_test.dart | 2 +- .../test/end_to_end/modular_loader_test.dart | 2 +- .../test/end_to_end/no_platform_test.dart | 2 +- .../test/end_to_end/output_type_test.dart | 2 +- .../test/end_to_end/user_crash_test.dart | 2 +- .../test/equivalence/id_testing_test.dart | 2 +- .../field_analysis/jfield_analysis_test.dart | 2 +- .../field_analysis/kfield_analysis_test.dart | 2 +- .../function_type_variable_test.dart | 2 +- .../generic_methods/generic_method_test.dart | 2 +- .../generic_method_type_test.dart | 2 +- .../instantiation_stub_test.dart | 2 +- .../test/generic_methods/world_test.dart | 2 +- pkg/compiler/test/impact/impact_test.dart | 2 +- pkg/compiler/test/inference/callers_test.dart | 2 +- .../test/inference/inference_data_test.dart | 2 +- .../test/inference/inference_test_helper.dart | 2 +- .../test/inference/list_tracer_test.dart | 2 +- .../inference/load_deferred_library_test.dart | 2 +- .../test/inference/map_tracer_test.dart | 2 +- .../inference/null_flat_type_mask_test.dart | 2 +- .../test/inference/powerset_bits2_test.dart | 2 +- .../test/inference/powerset_bits3_test.dart | 2 +- .../test/inference/powerset_bits_test.dart | 2 +- .../test/inference/record_type_test.dart | 2 +- .../test/inference/side_effects_test.dart | 2 +- .../trivial_abstract_value_domain_test.dart | 2 +- .../test/inference/type_combination_test.dart | 2 +- .../test/inference/type_mask2_test.dart | 2 +- .../inference/type_mask_disjoint_test.dart | 2 +- .../test/inference/type_mask_test.dart | 2 +- .../test/inference/union_type_test.dart | 2 +- pkg/compiler/test/inlining/inlining_test.dart | 2 +- .../test/inlining/meta_annotations2_test.dart | 2 +- .../test/inlining/meta_annotations3_test.dart | 2 +- .../test/inlining/meta_annotations_test.dart | 2 +- pkg/compiler/test/js/js_constant_test.dart | 2 +- .../test/js/js_spec_optimization_test.dart | 2 +- .../test/jsinterop/declaration_test.dart | 2 +- .../jsinterop/internal_annotations_test.dart | 2 +- .../interop_anonymous_unreachable_test.dart | 2 +- pkg/compiler/test/jsinterop/world_test.dart | 2 +- pkg/compiler/test/jumps/jump_test.dart | 2 +- .../test/member_usage/member_usage_test.dart | 2 +- .../test/model/call_structure_namer_test.dart | 2 +- .../test/model/cfe_annotations_test.dart | 2 +- .../model/cfe_constant_evaluation_common.dart | 2 +- .../test/model/cfe_constant_swarm_test.dart | 2 +- .../test/model/cfe_constant_test.dart | 2 +- pkg/compiler/test/model/class_set_test.dart | 2 +- .../test/model/constant_value_test.dart | 2 +- pkg/compiler/test/model/enqueuer_test.dart | 2 +- .../test/model/forwarding_stub_test.dart | 2 +- pkg/compiler/test/model/future_or_test.dart | 2 +- .../test/model/instantiated_classes_test.dart | 2 +- .../test/model/mixin_typevariable_test.dart | 2 +- pkg/compiler/test/model/native_test.dart | 2 +- .../test/model/needs_no_such_method_test.dart | 2 +- .../model/no_such_method_enabled_test.dart | 2 +- .../model/no_such_method_forwarders_test.dart | 2 +- .../model/strong_mode_closed_world_test.dart | 2 +- .../test/model/strong_mode_impact_test.dart | 2 +- pkg/compiler/test/model/subtype_test.dart | 2 +- pkg/compiler/test/model/subtypeset_test.dart | 2 +- pkg/compiler/test/model/supermixin_test.dart | 2 +- .../test/model/type_substitution_test.dart | 2 +- pkg/compiler/test/model/world_test.dart | 2 +- .../test/optimization/optimization_test.dart | 2 +- .../test/rti/backend_type_helper_test.dart | 2 +- pkg/compiler/test/rti/bound_check_test.dart | 2 +- pkg/compiler/test/rti/disable_rti_test.dart | 2 +- pkg/compiler/test/rti/factory_call_test.dart | 2 +- pkg/compiler/test/rti/instance_call_test.dart | 2 +- .../test/rti/rti_emission_test_helper.dart | 2 +- .../test/rti/rti_need_test_helper.dart | 2 +- .../test/rti/runtime_type_hint_test.dart | 2 +- .../serialization/in_memory_split_test.dart | 2 +- .../serialization/on_disk_split_test.dart | 2 +- .../serialization_diff0_test.dart | 2 +- .../serialization_diff1_test.dart | 2 +- .../serialization_diff2_test.dart | 2 +- .../serialization_diff3_test.dart | 2 +- .../serialization/serialization_test.dart | 2 +- .../test/sourcemaps/mapping_test.dart | 2 +- .../test/sourcemaps/minified_names_test.dart | 2 +- pkg/compiler/test/sourcemaps/name_test.dart | 2 +- .../test/sourcemaps/nomapping_test.dart | 2 +- .../test/sourcemaps/source_map_test.dart | 2 +- .../test/sourcemaps/stacktrace_test.dart | 2 +- .../test/sourcemaps/stepping_test.dart | 2 +- .../tools/source_mapping_tester.dart | 2 +- .../test/info_visitor_test.dart | 2 +- pkg/dev_compiler/test/string_to_uri_test.dart | 8 +- pkg/dynamic_modules/pubspec.yaml | 1 - .../test/data/duplicate_library/main.dart | 2 +- .../test/data/load_twice/main.dart | 2 +- pkg/expect/lib/async_helper.dart | 169 +++++++++ pkg/expect/lib/expect.dart | 20 +- pkg/expect/lib/legacy/async_minitest.dart | 341 ++++++++++++++++++ pkg/expect/lib/legacy/minitest.dart | 212 +++++++++++ pkg/expect/lib/minitest.dart | 214 +---------- pkg/expect/lib/static_type_helper.dart | 90 +++++ pkg/expect/test/nnbd_mode_test.dart | 4 +- pkg/front_end/pubspec.yaml | 3 - pkg/front_end/test/desugar_test.dart | 2 +- .../expression_compilation_tools_test.dart | 3 +- .../test/fasta/ambiguous_export_test.dart | 2 +- .../test/fasta/assert_locations_test.dart | 2 +- pkg/front_end/test/fasta/bootstrap_test.dart | 2 +- .../test/fasta/incremental_hello_test.dart | 2 +- .../test/fasta/object_supertype_test.dart | 2 +- pkg/front_end/test/fasta/reexport_test.dart | 2 +- .../test/fasta/super_mixins_test.dart | 2 +- .../test/fasta/types/dill_hierarchy_test.dart | 2 +- .../test/fasta/types/fasta_types_test.dart | 2 +- .../types/legacy_upper_bound_helper.dart | 2 +- pkg/front_end/test/hot_reload_e2e_test.dart | 2 +- pkg/front_end/test/issue_34856_test.dart | 2 +- pkg/front_end/test/mixin_export_test.dart | 2 +- .../test/packages_format_error_test.dart | 2 +- .../_fasta/compile_platform_legacy_test.dart | 2 +- .../tool/_fasta/compile_platform_test.dart | 2 +- pkg/js_ast/test/string_escape_test.dart | 2 +- pkg/kernel/test/class_hierarchy_test.dart | 2 +- pkg/modular_test/lib/src/loader.dart | 2 - pkg/modular_test/pubspec.yaml | 1 - .../test/find_sdk_root1_test.dart | 2 +- .../expectation.txt | 4 + .../loader/valid_packages/expectation.txt | 4 + .../test/src/find_sdk_root2_test.dart | 2 +- pkg/smith/test/builder_test.dart | 2 +- pkg/smith/test/configuration_test.dart | 2 +- pkg/smith/test/test_helpers.dart | 2 +- pkg/smith/test/test_matrix_test.dart | 2 +- .../lib/src/stepping_helper.dart | 2 +- pkg/test_runner/lib/src/browser.dart | 12 +- pkg/test_runner/lib/src/utils.dart | 1 - pkg/testing/README.md | 2 +- pkg/testing/lib/src/run.dart | 2 +- .../tests/vm/dart/data_uri_spawn_test.dart | 2 +- .../vm/dart/isolate_exit_unsendable_test.dart | 2 +- .../isolate_send_function_types_test.dart | 2 +- ...long_regexp_process_oob_messages_test.dart | 2 +- .../one_regexp_many_workers_test.dart | 2 +- .../send_list_typed_data_spawn_uri_test.dart | 2 +- .../send_unsupported_objects_deep_test.dart | 2 +- .../send_unsupported_objects_exit_test.dart | 2 +- ...unsupported_objects_init_isolate_test.dart | 2 +- .../send_unsupported_objects_test.dart | 2 +- .../shared_fail_without_flag_test.dart | 2 +- .../dart/isolates/shared_primitives_test.dart | 2 +- .../tests/vm/dart/isolates/shared_test.dart | 2 +- .../vm/dart/isolates/shared_test_body.dart | 2 +- .../tests/vm/dart/issue_31959_31960_test.dart | 2 +- .../vm/dart/send_instantiated_fun_test.dart | 2 +- runtime/tests/vm/dart/sendport_api_test.dart | 2 +- .../dart/spawn_uri_from_kernel_blob_test.dart | 3 +- sdk/lib/html/doc/WORKAROUNDS.md | 4 +- tests/corelib/error_stacktrace_test.dart | 2 +- .../error_throw_with_stacktrace_test.dart | 2 +- tests/corelib/finalizer_test.dart | 2 +- tests/corelib/iterable_extension_test.dart | 2 +- tests/corelib/reg_exp_all_matches_test.dart | 3 +- tests/corelib/reg_exp_receive_port_test.dart | 2 +- tests/corelib/stacktrace_fromstring_test.dart | 2 +- tests/corelib/weak_reference_test.dart | 2 +- tests/dartdevc/debugger/debugger_test.dart | 5 +- tests/dartdevc/developer_events_test.dart | 2 +- tests/dartdevc/hot_restart_timer_test.dart | 2 +- .../js_interop_non_external_test.dart | 2 +- .../dartdevc/no_such_method_errors_test.dart | 2 +- tests/ffi/ffi_induce_a_crash_test.dart | 2 +- tests/language/assert/message_test.dart | 2 +- tests/language/async/and_or_test.dart | 4 +- tests/language/async/async_test.dart | 2 +- .../async/await_catch_regression_test.dart | 4 +- tests/language/async/await_flatten_test.dart | 2 +- tests/language/async/await_foreign_test.dart | 2 +- tests/language/async/await_test.dart | 4 +- .../language/async/await_type_check_test.dart | 2 +- .../language/async/break_in_finally_test.dart | 4 +- tests/language/async/call_test.dart | 2 +- tests/language/async/continue_label_test.dart | 4 +- .../async/derive_future_type_test.dart | 2 +- .../async/divergent_flatten_test.dart | 4 +- tests/language/async/error_timing_test.dart | 2 +- tests/language/async/nested_test.dart | 4 +- .../language/async/regression_23058_test.dart | 2 +- .../async/return_types_runtime_test.dart | 16 +- tests/language/async/return_types_test.dart | 18 +- tests/language/async/switch_test.dart | 4 +- tests/language/async/this_bound_test.dart | 4 +- tests/language/async/throw_in_catch_test.dart | 4 +- .../async_star/async_star_await_for_test.dart | 2 +- .../async_star/async_star_cancel_test.dart | 2 +- .../async_star/async_star_invalid_test.dart | 2 +- .../language/async_star/async_star_test.dart | 2 +- tests/language/async_star/await_for_test.dart | 2 +- .../async_star/await_pauses_test.dart | 2 +- tests/language/async_star/basic_test.dart | 2 +- .../cancel_and_throw_in_finally_test.dart | 4 +- tests/language/async_star/cancel_test.dart | 2 +- .../cancel_while_paused_at_yield_test.dart | 2 +- .../async_star/cancel_while_paused_test.dart | 2 +- tests/language/async_star/concat_test.dart | 4 +- tests/language/async_star/error_test.dart | 2 +- tests/language/async_star/loops_test.dart | 2 +- .../language/async_star/no_cancel2_test.dart | 2 +- tests/language/async_star/no_cancel_test.dart | 2 +- tests/language/async_star/pause2_test.dart | 2 +- tests/language/async_star/pause_test.dart | 2 +- .../async_star/regression_2238_test.dart | 2 +- .../async_star/regression_23116_test.dart | 4 +- .../async_star/regression_47610_test.dart | 4 +- .../async_star/regression_fisk_test.dart | 2 +- .../language/async_star/stream_take_test.dart | 2 +- .../async_star/take_reyield_test.dart | 2 +- .../async_star/throw_in_catch_test.dart | 6 +- tests/language/async_star/utils.dart | 2 +- .../async_star/yield_expressions_test.dart | 2 +- .../async_star/yield_from_catch_test.dart | 4 +- .../yield_statement_context_test.dart | 6 +- tests/language/async_star/yield_test.dart | 4 +- tests/language/async_star/yieldstar_test.dart | 4 +- tests/language/await/await_test.dart | 16 +- .../await_with_dynamic_context_test.dart | 2 +- .../await/await_with_no_context_test.dart | 2 +- tests/language/await/exceptions_test.dart | 4 +- tests/language/await/for_cancel_test.dart | 4 +- tests/language/await/for_test.dart | 2 +- tests/language/await/for_use_local_test.dart | 4 +- tests/language/await/future_test.dart | 4 +- tests/language/await/nonfuture_test.dart | 2 +- tests/language/await/postfix_expr_test.dart | 4 +- .../await/started_immediately_test.dart | 2 +- tests/language/await_type_error_test.dart | 2 +- tests/language/await_type_test.dart | 2 +- .../implicit_tearoff_assignment_test.dart | 2 +- .../call/implicit_tearoff_error_test.dart | 2 +- .../implicit_tearoff_exceptions_test.dart | 2 +- ...mplicit_tearoff_local_assignment_test.dart | 2 +- .../language/call/implicit_tearoff_test.dart | 2 +- ...icit_tearoff_type_variable_error_test.dart | 2 +- .../implicit_tearoff_type_variable_test.dart | 2 +- tests/language/constructor/tear_off_test.dart | 2 +- .../await_for_dynamic_null_test.dart | 2 +- .../await_for_inference_test.dart | 29 +- .../await_for_test.dart | 2 +- .../for_await_test.dart | 50 ++- .../if_await_test.dart | 2 +- .../deferred/closurize_load_library_test.dart | 2 +- .../language/deferred/constant_list_test.dart | 2 +- .../constraints_type_annotation_test.dart | 2 +- tests/language/deferred/global_test.dart | 2 +- .../deferred/load_constants_runtime_test.dart | 7 +- .../deferred/load_constants_test.dart | 2 +- tests/language/deferred/mixin_test.dart | 2 +- .../deferred/no_such_method_test.dart | 2 +- .../deferred/not_loaded_check_test.dart | 2 +- .../deferred/redirecting_factory_test.dart | 4 +- .../deferred/shadow_load_library_test.dart | 2 +- .../shared_and_unshared_classes_test.dart | 2 +- .../deferred/static_separate_test.dart | 2 +- .../static_extension_method_context_test.dart | 2 +- ...c_extension_property_set_context_test.dart | 2 +- .../field_promotion_implements_test.dart | 2 +- ...representation_cascaded_nullable_test.dart | 2 +- ...romotion_representation_cascaded_test.dart | 2 +- ...omotion_representation_conflicts_test.dart | 2 +- ...on_independent_of_extension_type_test.dart | 2 +- ...tion_representation_interference_test.dart | 2 +- ...romotion_representation_nullable_test.dart | 2 +- ...promotion_representation_private_test.dart | 2 +- ..._promotion_representation_public_test.dart | 2 +- .../extension_type/fully_covers_test.dart | 2 +- ...non_extension_types_in_inference_test.dart | 2 +- .../function_subtype/inline2_test.dart | 3 +- .../language/function_subtype/not2_test.dart | 3 +- .../language/function_subtype/not3_test.dart | 3 +- .../generic_function_type_argument_test.dart | 3 +- tests/language/generic/instanceof_test.dart | 3 + .../generic/many_generic_instanceof_test.dart | 3 + .../language/generic/regress_45767_test.dart | 11 +- .../explicit_instantiated_tearoff_test.dart | 2 +- .../tearoff_of_promoted_variable_test.dart | 2 +- .../if_null_with_dynamic_context_test.dart | 2 +- .../conditional_import_string_test.dart | 2 +- .../import/conditional_import_test.dart | 2 +- .../inference/throw_operand_test.dart | 2 +- ...erence_preferred_over_horizontal_test.dart | 2 +- .../horizontal_inference_disabled_test.dart | 2 +- .../horizontal_inference_enabled_test.dart | 2 +- ...ontal_inference_extension_method_test.dart | 2 +- ...ontal_inference_invocation_types_test.dart | 2 +- .../write_capture_deferral_disabled_test.dart | 2 +- .../write_capture_deferral_enabled_test.dart | 2 +- ...tract_field_in_mixin_implemented_test.dart | 2 +- .../abstract_field_in_mixin_test.dart | 2 +- .../abstract_field_test.dart | 2 +- .../basic_field_promotion_test.dart | 2 +- ...caded_field_promotion_null_aware_test.dart | 2 +- .../cascaded_field_promotion_test.dart | 2 +- ...ion_unnecessary_null_aware_error_test.dart | 2 +- ..._field_promotion_unstable_target_test.dart | 2 +- .../condition_variable_test.dart | 2 +- .../inference_update_2/disabled_test.dart | 2 +- .../do_not_promote_methods_test.dart | 2 +- .../do_promote_abstract_getters_test.dart | 2 +- .../external_field_test.dart | 2 +- .../field_in_mixin_test.dart | 2 +- .../field_invocation_promotion_test.dart | 2 +- ...nd_no_such_method_abstract_field_test.dart | 2 +- ..._method_inherited_abstract_field_test.dart | 2 +- ...and_no_such_method_library_cycle_test.dart | 2 +- ...ion_and_no_such_method_on_clause_test.dart | 2 +- ...eld_promotion_and_no_such_method_test.dart | 2 +- ...eld_promotion_and_object_pattern_test.dart | 2 +- ...d_promotion_name_conflicts_mixin_test.dart | 2 +- .../field_promotion_name_conflicts_test.dart | 2 +- .../inference_update_2/late_field_test.dart | 2 +- .../preserved_by_join_test.dart | 2 +- ...on_makes_new_extension_available_test.dart | 2 +- ...on_available_via_non_nullability_test.dart | 2 +- ...on_makes_new_interface_available_test.dart | 2 +- .../promotion_narrows_interface_test.dart | 2 +- .../scrutinee_promotion_if_case_test.dart | 2 +- .../scrutinee_promotion_switch_test.dart | 2 +- .../super_this_distinction_generic_test.dart | 2 +- .../super_this_distinction_test.dart | 2 +- .../top_level_type_inference_test.dart | 2 +- .../inference_update_2/try_finally_test.dart | 2 +- .../conditional_expression_disabled_test.dart | 2 +- .../conditional_expression_test.dart | 2 +- ...ension_index_expression_disabled_test.dart | 2 +- ...licit_extension_index_expression_test.dart | 2 +- ..._aware_index_expression_disabled_test.dart | 2 +- ...sion_null_aware_index_expression_test.dart | 2 +- ...ion_null_aware_property_disabled_test.dart | 2 +- ...it_extension_null_aware_property_test.dart | 2 +- ...icit_extension_property_disabled_test.dart | 2 +- ...ment_explicit_extension_property_test.dart | 2 +- ...extension_this_property_disabled_test.dart | 2 +- ...explicit_extension_this_property_test.dart | 2 +- ..._explicit_this_property_disabled_test.dart | 2 +- ...ssignment_explicit_this_property_test.dart | 2 +- ..._explicit_this_property_disabled_test.dart | 2 +- ...extension_explicit_this_property_test.dart | 2 +- ..._implicit_this_property_disabled_test.dart | 2 +- ...extension_implicit_this_property_test.dart | 2 +- ...ension_index_expression_disabled_test.dart | 2 +- ...licit_extension_index_expression_test.dart | 2 +- ..._aware_index_expression_disabled_test.dart | 2 +- ...sion_null_aware_index_expression_test.dart | 2 +- ...ion_null_aware_property_disabled_test.dart | 2 +- ...it_extension_null_aware_property_test.dart | 2 +- ...icit_extension_property_disabled_test.dart | 2 +- ...ment_implicit_extension_property_test.dart | 2 +- ..._implicit_this_property_disabled_test.dart | 2 +- ...ssignment_implicit_this_property_test.dart | 2 +- ...gnment_index_expression_disabled_test.dart | 2 +- ...null_assignment_index_expression_test.dart | 2 +- ...f_null_assignment_local_disabled_test.dart | 2 +- .../if_null_assignment_local_test.dart | 2 +- ..._aware_index_expression_disabled_test.dart | 2 +- ...ment_null_aware_index_expression_test.dart | 2 +- ...ent_null_aware_property_disabled_test.dart | 2 +- ...l_assignment_null_aware_property_test.dart | 2 +- ...ull_assignment_property_disabled_test.dart | 2 +- .../if_null_assignment_property_test.dart | 2 +- ...ignment_static_property_disabled_test.dart | 2 +- ..._null_assignment_static_property_test.dart | 2 +- ..._super_index_expression_disabled_test.dart | 2 +- ...ssignment_super_index_expression_test.dart | 2 +- ...signment_super_property_disabled_test.dart | 2 +- ...f_null_assignment_super_property_test.dart | 2 +- ...t_this_index_expression_disabled_test.dart | 2 +- ...assignment_this_index_expression_test.dart | 2 +- ...ment_top_level_property_disabled_test.dart | 2 +- ...ll_assignment_top_level_property_test.dart | 2 +- .../if_null_disabled_test.dart | 2 +- .../inference_update_3/if_null_test.dart | 2 +- .../switch_expression_disabled_test.dart | 2 +- .../switch_expression_test.dart | 2 +- .../least_upper_bound_fbound_test.dart | 2 +- .../least_upper_bound_function_test.dart | 2 +- .../least_upper_bound_futureor_test.dart | 2 +- ...t_upper_bound_greatest_closure_1_test.dart | 2 +- ...t_upper_bound_greatest_closure_2_test.dart | 2 +- .../nnbd/constant_null_safety_mode_test.dart | 3 +- .../flow_analysis/boolean_parameter_test.dart | 2 +- .../expr_property_not_promoted_test.dart | 2 +- ...ocal_boolean_compound_assignment_test.dart | 2 +- ...l_boolean_defeated_by_assignment_test.dart | 2 +- ...ocal_boolean_defeated_by_capture_test.dart | 2 +- ..._boolean_does_not_detect_aliases_test.dart | 2 +- .../local_boolean_expression_types_test.dart | 2 +- ...cal_boolean_implicitly_typed_new_test.dart | 2 +- .../local_boolean_implicitly_typed_test.dart | 2 +- .../local_boolean_join_equivalent_test.dart | 2 +- .../local_boolean_logical_op_test.dart | 2 +- .../local_boolean_null_test.dart | 2 +- ...l_boolean_promoted_on_assignment_test.dart | 2 +- .../local_boolean_promoted_test.dart | 2 +- .../flow_analysis/local_boolean_test.dart | 2 +- .../local_boolean_try_finally_test.dart | 2 +- ...boolean_undefeated_by_assignment_test.dart | 2 +- .../flow_analysis/this_not_promoted_test.dart | 2 +- .../this_property_not_promoted_test.dart | 2 +- .../unreachable_via_expr_property_test.dart | 2 +- .../unreachable_via_never_test.dart | 2 +- .../unreachable_via_this_property_test.dart | 2 +- .../unreachable_via_this_test.dart | 2 +- ...nreachable_via_variable_property_test.dart | 2 +- .../variable_property_not_promoted_test.dart | 2 +- ...late_variable_type_for_promotion_test.dart | 2 +- ...ariable_initialization_promotion_test.dart | 2 +- .../unchecked_use_of_nullable_test.dart | 6 +- .../private_name_static_methods_test.dart | 3 +- tests/language/null/null_test.dart | 9 +- .../null_aware/null_shortening_test.dart | 2 +- .../number_operator_context_test.dart | 2 +- .../operator/number_operator_error_test.dart | 2 +- .../operator/number_operator_typing_test.dart | 2 +- .../operator/unsigned_right_shift_test.dart | 3 +- .../empty_switch_expression_test.dart | 6 +- .../exhaustiveness/nullable_cast_test.dart | 11 +- .../flow_analysis/boolean_condition_test.dart | 2 +- .../cast_pattern_error_test.dart | 2 +- .../constant_pattern_error_test.dart | 2 +- .../for_in_collection_element_error_test.dart | 2 +- .../for_in_statement_error_test.dart | 2 +- .../if_case_element_error_test.dart | 2 +- .../if_case_statement_error_test.dart | 2 +- .../list_pattern_error_test.dart | 2 +- ...ern_with_nullable_list_scrutinee_test.dart | 2 +- .../logical_and_pattern_error_test.dart | 2 +- .../logical_or_pattern_error_test.dart | 2 +- .../flow_analysis/map_pattern_error_test.dart | 2 +- .../null_assert_pattern_error_test.dart | 2 +- .../null_check_in_guard_test.dart | 2 +- .../null_check_pattern_error_test.dart | 2 +- .../object_pattern_error_test.dart | 2 +- .../pattern_assignment_error_test.dart | 2 +- .../pattern_inside_guard_error_test.dart | 2 +- ...ttern_variable_declaration_error_test.dart | 2 +- .../record_pattern_error_test.dart | 2 +- .../relational_pattern_error_test.dart | 2 +- .../flow_analysis/split_point_test.dart | 2 +- .../switch_expression_error_test.dart | 2 +- .../switch_statement_error_test.dart | 2 +- .../variable_pattern_error_test.dart | 2 +- .../wildcard_pattern_error_test.dart | 2 +- tests/language/patterns/issue52409_test.dart | 2 +- .../object_pattern_inference_test.dart | 2 +- tests/language/patterns/schema_test.dart | 2 +- ...tch_trivial_exhaustiveness_error_test.dart | 2 +- .../type_question_before_when_test.dart | 2 +- .../assign_to_promoted_record_test.dart | 2 +- .../records/simple/type_checks2_test.dart | 9 +- .../records/simple/type_checks3_test.dart | 5 +- .../records/simple/type_checks_test.dart | 5 +- .../records/type_inference_error_test.dart | 2 +- ...pe_inference_field_name_mismatch_test.dart | 2 +- ...type_inference_named_field_order_test.dart | 2 +- .../language/records/type_inference_test.dart | 2 +- tests/language/regress/regress22777_test.dart | 4 +- tests/language/regress/regress23244_test.dart | 2 +- tests/language/regress/regress23996_test.dart | 2 +- tests/language/regress/regress24935_test.dart | 2 +- tests/language/regress/regress26175_test.dart | 2 +- tests/language/regress/regress28498_test.dart | 4 +- tests/language/regress/regress41890_test.dart | 3 +- tests/language/regress/regress52243_test.dart | 3 +- .../spread_collections/await_test.dart | 2 +- .../spread_collections/bind_test.dart | 2 +- .../null_spread_context_test.dart | 2 +- tests/language/static_type_helper.dart | 89 +---- .../case_null_legacy_flow_analysis_test.dart | 2 +- .../sync_star/yield_star_pause_test.dart | 2 +- ...plicit_instantiated_type_literal_test.dart | 2 +- .../aliased_constructor_tear_off_test.dart | 2 +- .../vm/async_await_catch_stacktrace_test.dart | 2 +- .../vm/await_synchronous_future_test.dart | 2 +- .../vm/bool_check_stack_traces_test.dart | 13 +- .../vm/lazy_async_exception_stack2_test.dart | 2 +- .../vm/lazy_async_exception_stack_test.dart | 2 +- ...optimized_guarded_field_isolates_test.dart | 2 +- tests/language/void/regress_54800_test.dart | 2 +- ..._declaration_catch_rethrow_async_test.dart | 2 +- .../local_declaration_for_loop_test.dart | 2 +- .../async_await_sync_completer_test.dart | 2 +- tests/lib/async/async_await_zones_test.dart | 2 +- .../lib/async/async_no_await_zones_test.dart | 2 +- tests/lib/async/catch_errors11_test.dart | 2 +- tests/lib/async/catch_errors12_test.dart | 2 +- tests/lib/async/catch_errors13_test.dart | 2 +- tests/lib/async/catch_errors14_test.dart | 2 +- tests/lib/async/catch_errors15_test.dart | 2 +- tests/lib/async/catch_errors16_test.dart | 2 +- tests/lib/async/catch_errors17_test.dart | 2 +- tests/lib/async/catch_errors18_test.dart | 2 +- tests/lib/async/catch_errors19_test.dart | 2 +- tests/lib/async/catch_errors20_test.dart | 2 +- tests/lib/async/catch_errors21_test.dart | 2 +- tests/lib/async/catch_errors22_test.dart | 2 +- tests/lib/async/catch_errors23_test.dart | 2 +- tests/lib/async/catch_errors24_test.dart | 2 +- tests/lib/async/catch_errors25_test.dart | 2 +- tests/lib/async/catch_errors26_test.dart | 2 +- tests/lib/async/catch_errors27_test.dart | 2 +- tests/lib/async/catch_errors28_test.dart | 2 +- tests/lib/async/catch_errors2_test.dart | 2 +- tests/lib/async/catch_errors3_test.dart | 2 +- tests/lib/async/catch_errors4_test.dart | 2 +- tests/lib/async/catch_errors5_test.dart | 2 +- tests/lib/async/catch_errors6_test.dart | 2 +- tests/lib/async/catch_errors7_test.dart | 2 +- tests/lib/async/catch_errors8_test.dart | 2 +- tests/lib/async/catch_errors_test.dart | 2 +- .../async/dart2js_uncaught_error_test.dart | 2 +- tests/lib/async/error_stack_test.dart | 2 +- tests/lib/async/future_constructor2_test.dart | 2 +- .../lib/async/future_delayed_error_test.dart | 2 +- tests/lib/async/future_extension_test.dart | 4 +- tests/lib/async/future_foreach_test.dart | 2 +- tests/lib/async/future_future_test.dart | 2 +- .../async/future_iterable_extension_test.dart | 2 +- tests/lib/async/future_microtask_test.dart | 2 +- tests/lib/async/future_onerror_test.dart | 2 +- .../async/future_record_extension_test.dart | 2 +- .../async/future_regression_48493_test.dart | 2 +- .../lib/async/future_self_complete_test.dart | 2 +- tests/lib/async/future_test.dart | 2 +- tests/lib/async/future_timeout_test.dart | 6 +- tests/lib/async/future_value_chain2_test.dart | 2 +- tests/lib/async/future_value_chain3_test.dart | 2 +- tests/lib/async/future_value_chain4_test.dart | 2 +- tests/lib/async/future_value_chain_test.dart | 2 +- tests/lib/async/futures_test.dart | 2 +- .../intercept_schedule_microtask3_test.dart | 2 +- .../intercept_schedule_microtask4_test.dart | 2 +- .../intercept_schedule_microtask5_test.dart | 2 +- .../intercept_schedule_microtask6_test.dart | 2 +- tests/lib/async/multiple_timer_test.dart | 2 +- tests/lib/async/null_future_zone_test.dart | 2 +- tests/lib/async/periodic_timer2_test.dart | 2 +- tests/lib/async/periodic_timer3_test.dart | 2 +- tests/lib/async/periodic_timer4_test.dart | 2 +- tests/lib/async/run_zoned5_test.dart | 2 +- tests/lib/async/run_zoned6_test.dart | 7 +- tests/lib/async/run_zoned7_test.dart | 2 +- tests/lib/async/run_zoned8_test.dart | 2 +- tests/lib/async/run_zoned9_test.dart | 7 +- tests/lib/async/schedule_microtask2_test.dart | 2 +- tests/lib/async/schedule_microtask3_test.dart | 2 +- tests/lib/async/schedule_microtask5_test.dart | 2 +- tests/lib/async/schedule_microtask_test.dart | 2 +- tests/lib/async/slow_consumer2_test.dart | 2 +- tests/lib/async/slow_consumer3_test.dart | 2 +- tests/lib/async/slow_consumer_test.dart | 2 +- tests/lib/async/stack_trace01_test.dart | 2 +- tests/lib/async/stack_trace02_test.dart | 2 +- tests/lib/async/stack_trace03_test.dart | 2 +- tests/lib/async/stack_trace04_test.dart | 2 +- tests/lib/async/stack_trace05_test.dart | 2 +- tests/lib/async/stack_trace06_test.dart | 2 +- tests/lib/async/stack_trace07_test.dart | 2 +- tests/lib/async/stack_trace08_test.dart | 2 +- tests/lib/async/stack_trace09_test.dart | 2 +- tests/lib/async/stack_trace10_test.dart | 2 +- tests/lib/async/stack_trace11_test.dart | 2 +- tests/lib/async/stack_trace12_test.dart | 2 +- tests/lib/async/stack_trace13_test.dart | 2 +- tests/lib/async/stack_trace14_test.dart | 2 +- tests/lib/async/stack_trace15_test.dart | 2 +- tests/lib/async/stack_trace16_test.dart | 2 +- tests/lib/async/stack_trace17_test.dart | 2 +- tests/lib/async/stack_trace18_test.dart | 2 +- tests/lib/async/stack_trace19_test.dart | 2 +- tests/lib/async/stack_trace20_test.dart | 2 +- tests/lib/async/stack_trace21_test.dart | 2 +- tests/lib/async/stack_trace22_test.dart | 2 +- tests/lib/async/stack_trace23_test.dart | 2 +- tests/lib/async/stack_trace24_test.dart | 2 +- tests/lib/async/stack_trace25_test.dart | 2 +- .../async/stream_controller_async_test.dart | 2 +- tests/lib/async/stream_controller_test.dart | 8 +- tests/lib/async/stream_distinct_test.dart | 2 +- tests/lib/async/stream_empty_test.dart | 2 +- tests/lib/async/stream_error_test.dart | 2 +- .../async/stream_event_transformed_test.dart | 2 +- tests/lib/async/stream_first_where_test.dart | 2 +- tests/lib/async/stream_from_futures_test.dart | 2 +- .../lib/async/stream_from_iterable_test.dart | 4 +- .../stream_iterator_double_cancel_test.dart | 2 +- tests/lib/async/stream_iterator_test.dart | 2 +- tests/lib/async/stream_join_test.dart | 2 +- tests/lib/async/stream_last_where_test.dart | 2 +- tests/lib/async/stream_listen_zone_test.dart | 4 +- tests/lib/async/stream_multi_test.dart | 2 +- tests/lib/async/stream_periodic2_test.dart | 2 +- tests/lib/async/stream_periodic3_test.dart | 2 +- tests/lib/async/stream_periodic4_test.dart | 2 +- tests/lib/async/stream_periodic5_test.dart | 2 +- tests/lib/async/stream_periodic6_test.dart | 2 +- tests/lib/async/stream_periodic_test.dart | 2 +- tests/lib/async/stream_single_test.dart | 2 +- ...tream_single_to_multi_subscriber_test.dart | 2 +- tests/lib/async/stream_state_helper.dart | 2 +- .../stream_state_nonzero_timer_test.dart | 2 +- tests/lib/async/stream_state_test.dart | 2 +- .../stream_subscription_as_future_test.dart | 4 +- .../stream_subscription_cancel_test.dart | 2 +- tests/lib/async/stream_take_test.dart | 2 +- tests/lib/async/stream_timeout_test.dart | 6 +- tests/lib/async/stream_transform_test.dart | 2 +- .../stream_transformation_broadcast_test.dart | 2 +- .../stream_transformer_from_bind_test.dart | 2 +- ...stream_transformer_from_handlers_test.dart | 2 +- tests/lib/async/stream_value_test.dart | 2 +- tests/lib/async/stream_view_test.dart | 2 +- tests/lib/async/stream_zones_test.dart | 2 +- tests/lib/async/timer_cancel1_test.dart | 2 +- tests/lib/async/timer_cancel_test.dart | 2 +- tests/lib/async/timer_isActive_test.dart | 2 +- tests/lib/async/timer_test.dart | 2 +- tests/lib/async/unawaited_test.dart | 4 +- .../uncaught_error_handler_throws_test.dart | 2 +- tests/lib/async/wait_for_cancel_test.dart | 2 +- tests/lib/async/zone_bind_callback_test.dart | 2 +- .../async/zone_bind_callback_unary_test.dart | 2 +- tests/lib/async/zone_bind_test.dart | 2 +- .../zone_create_periodic_timer_test.dart | 2 +- tests/lib/async/zone_create_timer2_test.dart | 2 +- tests/lib/async/zone_create_timer_test.dart | 2 +- tests/lib/async/zone_debug_test.dart | 8 +- .../async/zone_empty_description2_test.dart | 2 +- .../async/zone_empty_description_test.dart | 2 +- tests/lib/async/zone_error_callback_test.dart | 2 +- tests/lib/async/zone_fork_test.dart | 9 +- .../zone_future_schedule_microtask_test.dart | 2 +- .../async/zone_register_callback_test.dart | 2 +- .../zone_register_callback_unary_test.dart | 2 +- tests/lib/async/zone_root_bind_test.dart | 2 +- tests/lib/async/zone_run_guarded_test.dart | 2 +- tests/lib/async/zone_run_test.dart | 2 +- tests/lib/async/zone_run_unary_test.dart | 2 +- tests/lib/async/zone_value_test.dart | 2 +- tests/lib/convert/encoding_test.dart | 2 +- ...streamed_conversion_json_decode1_test.dart | 2 +- ...streamed_conversion_json_encode1_test.dart | 2 +- ...amed_conversion_json_utf8_decode_test.dart | 2 +- ...amed_conversion_json_utf8_encode_test.dart | 2 +- .../streamed_conversion_utf8_decode_test.dart | 2 +- .../streamed_conversion_utf8_encode_test.dart | 2 +- .../lib/html/audiobuffersourcenode_test.dart | 2 +- tests/lib/html/audiocontext_test.dart | 4 +- tests/lib/html/audioelement_test.dart | 2 +- tests/lib/html/blob_constructor_test.dart | 2 +- tests/lib/html/callback_list_test.dart | 2 +- .../canvas_pixel_array_type_alias_test.dart | 2 +- tests/lib/html/canvas_test.dart | 2 +- tests/lib/html/canvasrendering/arc_test.dart | 2 +- .../canvas_rendering_util.dart | 2 +- .../draw_image_canvas_element_test.dart | 2 +- .../draw_image_video_element_test.dart | 2 +- .../html/canvasrendering/fill_text_test.dart | 2 +- .../canvasrendering/image_element_test.dart | 2 +- .../pixel_manipulation_test.dart | 2 +- tests/lib/html/cdata_test.dart | 2 +- tests/lib/html/client_rect_test.dart | 2 +- ...onvert_native_to_dart_dictionary_test.dart | 2 +- tests/lib/html/cross_domain_iframe_test.dart | 2 +- tests/lib/html/cross_frame_test.dart | 2 +- tests/lib/html/crypto_test.dart | 2 +- tests/lib/html/css_rule_list_test.dart | 2 +- tests/lib/html/css_test.dart | 2 +- tests/lib/html/cssstyledeclaration_test.dart | 2 +- tests/lib/html/custom_tags_test.dart | 2 +- .../html/dart_object_local_storage_test.dart | 2 +- tests/lib/html/datalistelement_test.dart | 2 +- tests/lib/html/document_test.dart | 2 +- tests/lib/html/documentfragment_test.dart | 2 +- tests/lib/html/dom_constructors_test.dart | 2 +- tests/lib/html/domparser_test.dart | 2 +- tests/lib/html/element_add_test.dart | 2 +- .../element_animate_simple_timing_test.dart | 2 +- .../html/element_animate_supported_test.dart | 2 +- .../element_animate_timing_dict_test.dart | 2 +- tests/lib/html/element_classes_svg_test.dart | 2 +- tests/lib/html/element_classes_test.dart | 2 +- .../lib/html/element_constructor_1_test.dart | 2 +- tests/lib/html/element_dimensions_test.dart | 2 +- tests/lib/html/element_offset_test.dart | 6 +- tests/lib/html/element_test.dart | 2 +- .../element_types_constructors1_test.dart | 2 +- .../element_types_constructors2_test.dart | 2 +- .../element_types_constructors3_test.dart | 2 +- .../element_types_constructors4_test.dart | 2 +- .../element_types_constructors5_test.dart | 2 +- .../element_types_constructors6_test.dart | 2 +- .../lib/html/element_types_content_test.dart | 2 +- .../lib/html/element_types_datalist_test.dart | 2 +- .../lib/html/element_types_details_test.dart | 2 +- tests/lib/html/element_types_embed_test.dart | 2 +- tests/lib/html/element_types_meter_test.dart | 2 +- tests/lib/html/element_types_object_test.dart | 2 +- tests/lib/html/element_types_output_test.dart | 2 +- .../lib/html/element_types_progress_test.dart | 2 +- tests/lib/html/element_types_shadow_test.dart | 2 +- .../lib/html/element_types_template_test.dart | 2 +- tests/lib/html/element_types_track_test.dart | 2 +- tests/lib/html/event_customevent_test.dart | 2 +- tests/lib/html/event_test.dart | 2 +- tests/lib/html/events_test.dart | 2 +- tests/lib/html/exceptions_test.dart | 2 +- .../html/fileapi_directory_reader_test.dart | 2 +- tests/lib/html/fileapi_directory_test.dart | 2 +- tests/lib/html/fileapi_entry_test.dart | 2 +- tests/lib/html/fileapi_file_entry_test.dart | 2 +- tests/lib/html/fileapi_file_test.dart | 2 +- tests/lib/html/fileapi_supported_test.dart | 2 +- .../html/fileapi_supported_throws_test.dart | 2 +- tests/lib/html/filereader_test.dart | 2 +- tests/lib/html/filteredelementlist_test.dart | 2 +- tests/lib/html/fontface_loaded_test.dart | 2 +- tests/lib/html/fontface_test.dart | 2 +- tests/lib/html/form_data_test.dart | 2 +- tests/lib/html/form_element_test.dart | 2 +- tests/lib/html/gamepad_test.dart | 2 +- tests/lib/html/geolocation_test.dart | 2 +- tests/lib/html/hidden_dom_1_test.dart | 2 +- tests/lib/html/hidden_dom_2_test.dart | 2 +- tests/lib/html/history_hash_change_test.dart | 2 +- tests/lib/html/history_supported_test.dart | 2 +- tests/lib/html/history_test.dart | 2 +- tests/lib/html/html_mock_test.dart | 2 +- tests/lib/html/htmlcollection_test.dart | 2 +- tests/lib/html/htmlelement_test.dart | 2 +- .../lib/html/htmloptionscollection_test.dart | 2 +- tests/lib/html/http_test.dart | 2 +- tests/lib/html/indexeddb_1_test.dart | 2 +- tests/lib/html/indexeddb_2_test.dart | 4 +- tests/lib/html/indexeddb_3_test.dart | 4 +- tests/lib/html/indexeddb_4_test.dart | 2 +- tests/lib/html/indexeddb_5_test.dart | 4 +- .../html/input_element_attributes_test.dart | 2 +- .../html/input_element_constructor_test.dart | 2 +- tests/lib/html/input_element_date_test.dart | 2 +- .../lib/html/input_element_datetime_test.dart | 2 +- tests/lib/html/input_element_email_test.dart | 2 +- tests/lib/html/input_element_month_test.dart | 2 +- tests/lib/html/input_element_number_test.dart | 2 +- tests/lib/html/input_element_range_test.dart | 2 +- tests/lib/html/input_element_search_test.dart | 2 +- tests/lib/html/input_element_tel_test.dart | 2 +- tests/lib/html/input_element_time_test.dart | 2 +- tests/lib/html/input_element_url_test.dart | 2 +- tests/lib/html/input_element_week_test.dart | 2 +- tests/lib/html/instance_of_test.dart | 2 +- .../html/interactive_geolocation_test.dart | 2 +- tests/lib/html/interactive_media_test.dart | 4 +- tests/lib/html/interactive_test.dart | 2 +- tests/lib/html/isolates_test.dart | 2 +- tests/lib/html/js_array_test.dart | 2 +- tests/lib/html/js_browser_test.dart | 2 +- tests/lib/html/js_caching_test.dart | 2 +- tests/lib/html/js_context_test.dart | 2 +- tests/lib/html/js_dart_functions_test.dart | 2 +- tests/lib/html/js_dart_js_test.dart | 2 +- tests/lib/html/js_dart_to_string_test.dart | 2 +- tests/lib/html/js_dispatch_property_test.dart | 2 +- tests/lib/html/js_function_getter_test.dart | 2 +- tests/lib/html/js_identity_test.dart | 2 +- tests/lib/html/js_interop_1_test.dart | 2 +- .../js_interop_constructor_name/div_test.dart | 2 +- .../error1_test.dart | 2 +- .../error2_test.dart | 2 +- .../method_test.dart | 2 +- .../lib/html/js_javascript_function_test.dart | 2 +- tests/lib/html/js_jsarray_test.dart | 2 +- tests/lib/html/js_jsfunc_callmethod_test.dart | 2 +- tests/lib/html/js_jsify_test.dart | 2 +- tests/lib/html/js_jsobject_test.dart | 2 +- tests/lib/html/js_methods_test.dart | 2 +- tests/lib/html/js_test_util.dart | 2 +- tests/lib/html/js_transferrables_test.dart | 2 +- .../js_typed_interop_anonymous2_test.dart | 2 +- .../html/js_typed_interop_anonymous_test.dart | 2 +- ...ed_interop_anonymous_unreachable_test.dart | 2 +- .../html/js_typed_interop_bind_this_test.dart | 2 +- ...js_typed_interop_callable_object_test.dart | 2 +- ...typed_interop_default_arg_static_test.dart | 2 +- .../js_typed_interop_default_arg_test.dart | 2 +- .../html/js_typed_interop_dynamic_test.dart | 2 +- .../lib/html/js_typed_interop_lazy_test.dart | 2 +- .../js_typed_interop_rename_static_test.dart | 2 +- .../html/js_typed_interop_side_cast_test.dart | 2 +- tests/lib/html/js_typed_interop_test.dart | 2 +- tests/lib/html/js_util_test.dart | 2 +- tests/lib/html/keyboard_event_test.dart | 2 +- tests/lib/html/localstorage_test.dart | 2 +- tests/lib/html/location_test.dart | 2 +- tests/lib/html/media_stream_test.dart | 2 +- tests/lib/html/mediadevices_test.dart | 4 +- tests/lib/html/mediasource_test.dart | 2 +- tests/lib/html/message_channel_test.dart | 2 +- tests/lib/html/messageevent_test.dart | 2 +- tests/lib/html/mouse_event_test.dart | 2 +- tests/lib/html/mutationobserver_test.dart | 2 +- tests/lib/html/node_test.dart | 2 +- ...u_suppress_make_the_bug_critical_test.dart | 2 +- tests/lib/html/notification_test.dart | 2 +- tests/lib/html/performance_api_test.dart | 2 +- .../lib/html/postmessage_structured_test.dart | 2 +- tests/lib/html/query_test.dart | 2 +- tests/lib/html/queryall_test.dart | 2 +- tests/lib/html/range_test.dart | 2 +- .../html/request_animation_frame_test.dart | 2 +- tests/lib/html/rtc_test.dart | 2 +- tests/lib/html/selectelement_test.dart | 2 +- .../html/serialized_script_value_test.dart | 2 +- tests/lib/html/shadow_dom_test.dart | 2 +- tests/lib/html/shadowroot_test.dart | 2 +- tests/lib/html/speechrecognition_test.dart | 2 +- tests/lib/html/storage_promise_test.dart | 4 +- tests/lib/html/storage_test.dart | 2 +- tests/lib/html/streams_test.dart | 2 +- tests/lib/html/svg_test.dart | 2 +- tests/lib/html/svgelement_test.dart | 2 +- tests/lib/html/table_test.dart | 2 +- tests/lib/html/text_event_test.dart | 2 +- tests/lib/html/touchevent_test.dart | 2 +- .../html/track_element_constructor_test.dart | 2 +- tests/lib/html/transferables_test.dart | 2 +- tests/lib/html/transition_event_test.dart | 4 +- .../trusted_html_tree_sanitizer_test.dart | 2 +- tests/lib/html/typed_arrays_1_test.dart | 2 +- tests/lib/html/typed_arrays_2_test.dart | 2 +- tests/lib/html/typed_arrays_3_test.dart | 2 +- tests/lib/html/typed_arrays_4_test.dart | 2 +- tests/lib/html/typed_arrays_5_test.dart | 2 +- .../html/typed_arrays_arraybuffer_test.dart | 2 +- .../lib/html/typed_arrays_dataview_test.dart | 2 +- .../html/typed_arrays_range_checks_test.dart | 2 +- tests/lib/html/typed_arrays_simd_test.dart | 2 +- tests/lib/html/typing_test.dart | 2 +- tests/lib/html/unknownelement_test.dart | 2 +- tests/lib/html/uri_test.dart | 2 +- tests/lib/html/url_test.dart | 2 +- tests/lib/html/utils.dart | 2 +- tests/lib/html/webgl_1_test.dart | 2 +- tests/lib/html/webgl_extensions_test.dart | 2 +- tests/lib/html/websocket_test.dart | 2 +- tests/lib/html/wheelevent_test.dart | 2 +- tests/lib/html/window_eq_test.dart | 2 +- tests/lib/html/window_mangling_test.dart | 2 +- tests/lib/html/window_nosuchmethod_test.dart | 2 +- tests/lib/html/window_test.dart | 2 +- tests/lib/html/worker_api_test.dart | 2 +- tests/lib/html/worker_functional_test.dart | 2 +- tests/lib/html/worker_supported_test.dart | 2 +- tests/lib/html/wrapping_collections_test.dart | 2 +- tests/lib/html/xhr_cross_origin_test.dart | 4 +- tests/lib/html/xhr_test.dart | 4 +- tests/lib/html/xsltprocessor_test.dart | 2 +- tests/lib/isolate/capability_test.dart | 2 +- .../lib/isolate/compile_time_error_test.dart | 2 +- tests/lib/isolate/count_test.dart | 2 +- .../isolate/cross_isolate_message_test.dart | 2 +- .../isolate/deferred_in_isolate2_test.dart | 2 +- tests/lib/isolate/error_at_spawn_test.dart | 2 +- tests/lib/isolate/error_at_spawnuri_test.dart | 2 +- .../error_exit_at_spawning_shared.dart | 2 +- tests/lib/isolate/exit_at_spawn_test.dart | 2 +- tests/lib/isolate/exit_at_spawnuri_test.dart | 2 +- ...fast_copy_during_initial_message_test.dart | 2 +- tests/lib/isolate/function_send1_test.dart | 2 +- tests/lib/isolate/function_send_test.dart | 2 +- tests/lib/isolate/handle_error2_test.dart | 2 +- tests/lib/isolate/handle_error3_test.dart | 2 +- tests/lib/isolate/handle_error_test.dart | 2 +- .../lib/isolate/illegal_msg_mirror_test.dart | 2 +- ...t_from_environment_default_value_test.dart | 2 +- .../isolate_complex_messages_test.dart | 2 +- tests/lib/isolate/isolate_current_test.dart | 2 +- tests/lib/isolate/isolate_import_test.dart | 2 +- tests/lib/isolate/isolate_run_test.dart | 2 +- .../issue_21398_parent_isolate1_test.dart | 2 +- .../issue_21398_parent_isolate2_test.dart | 2 +- .../issue_21398_parent_isolate_test.dart | 2 +- tests/lib/isolate/kill2_test.dart | 2 +- ...ill_infinite_loop_in_initializer_test.dart | 2 +- tests/lib/isolate/kill_self_test.dart | 2 +- tests/lib/isolate/kill_test.dart | 2 +- tests/lib/isolate/mandel_isolate_test.dart | 2 +- tests/lib/isolate/message2_test.dart | 2 +- tests/lib/isolate/message3_test.dart | 2 +- tests/lib/isolate/message4_test.dart | 2 +- tests/lib/isolate/message_enum_test.dart | 2 +- tests/lib/isolate/message_test.dart | 2 +- tests/lib/isolate/mint_maker_test.dart | 2 +- .../isolate/native_wrapper_message_test.dart | 2 +- tests/lib/isolate/nested_spawn2_test.dart | 2 +- tests/lib/isolate/nested_spawn_test.dart | 2 +- tests/lib/isolate/no_package_test.dart | 2 +- tests/lib/isolate/object_leak_test.dart | 2 +- tests/lib/isolate/ondone_test.dart | 2 +- tests/lib/isolate/pause_test.dart | 2 +- tests/lib/isolate/ping_pause_test.dart | 2 +- tests/lib/isolate/ping_test.dart | 2 +- tests/lib/isolate/raw_port_test.dart | 2 +- tests/lib/isolate/request_reply_test.dart | 2 +- .../isolate/simd_vectors_message_test.dart | 3 +- tests/lib/isolate/simple_message_test.dart | 2 +- tests/lib/isolate/spawn_function_test.dart | 2 +- tests/lib/isolate/spawn_generic_test.dart | 2 +- .../spawn_uri_missing_from_isolate_test.dart | 2 +- tests/lib/isolate/spawn_uri_missing_test.dart | 2 +- tests/lib/isolate/spawn_uri_multi_test.dart | 2 +- .../lib/isolate/spawn_uri_nested_vm_test.dart | 2 +- tests/lib/isolate/spawn_uri_test.dart | 2 +- tests/lib/isolate/spawn_uri_vm_test.dart | 2 +- tests/lib/isolate/start_paused_test.dart | 2 +- tests/lib/isolate/static_function_test.dart | 2 +- tests/lib/isolate/timer_isolate_test.dart | 2 +- tests/lib/isolate/type_ref_message_test.dart | 7 +- tests/lib/isolate/typed_message_test.dart | 2 +- ...difiable_typed_data_pass_by_copy_test.dart | 2 +- tests/lib/isolate/unresolved_ports_test.dart | 2 +- .../isolate/weak_property_message_1_test.dart | 2 +- .../isolate/weak_property_message_2_test.dart | 2 +- tests/lib/js/export/functional_test.dart | 2 +- .../functional_test_lib.dart | 2 +- .../static_interop_mock/inheritance_test.dart | 2 +- .../static_interop_mock/mockito_test.dart | 2 +- .../static_interop_mock/proto_test.dart | 2 +- .../js/extends_test/extends_test_util.dart | 2 +- tests/lib/js/is_check_and_as_cast_test.dart | 2 +- tests/lib/js/js_util/async_test.dart | 4 +- tests/lib/js/js_util/bigint_test.dart | 2 +- tests/lib/js/js_util/dartify_test.dart | 2 +- .../js/js_util/implicit_downcast_test.dart | 2 +- tests/lib/js/js_util/js_prefix_test.dart | 2 +- tests/lib/js/js_util/jsify_test.dart | 2 +- tests/lib/js/js_util/operator_test.dart | 2 +- .../js/js_util/promise_reject_null_test.dart | 4 +- .../properties_implicit_checks_test.dart | 2 +- tests/lib/js/js_util/properties_test.dart | 2 +- tests/lib/js/mock_test.dart | 2 +- .../external_extension_member_test.dart | 2 +- .../extension_type/external_member_test.dart | 2 +- .../external_static_member_test.dart | 2 +- .../object_literal_constructor_test.dart | 2 +- .../external_extension_members_test.dart | 2 +- ...external_static_member_lowerings_test.dart | 2 +- ...atic_member_lowerings_trusttypes_test.dart | 2 +- .../futurevaluetype_test.dart | 2 +- .../generic_factory_test.dart | 2 +- .../import/import_test.dart | 2 +- .../import/import_trustedscripturl_test.dart | 2 +- .../js_array_proxy_or_ref_test.dart | 2 +- .../static_interop_test/js_default_test.dart | 2 +- .../js_function_conversions_test.dart | 2 +- .../js/static_interop_test/js_types_test.dart | 4 +- .../jsobject_type_test.dart | 2 +- .../js/static_interop_test/number_test.dart | 2 +- .../js/static_interop_test/operator_test.dart | 2 +- .../subtyping_test/subtyping_test_util.dart | 2 +- .../deferred_constraints_constants_test.dart | 2 +- .../deferred_mirrors_metadata_test.dart | 2 +- .../deferred_mirrors_metatarget_test.dart | 2 +- .../invoke_private_wrong_library_test.dart | 2 +- ...ary_enumeration_deferred_loading_test.dart | 2 +- .../library_import_deferred_loading_test.dart | 2 +- tests/lib/mirrors/library_uri_io_test.dart | 2 +- .../lib/mirrors/library_uri_package_test.dart | 2 +- tests/lib/mirrors/load_library_test.dart | 2 +- tests/lib/mirrors/mirrors_test.dart | 2 +- tests/lib/mirrors/null_test.dart | 7 +- .../typedef_deferred_library_test.dart | 2 +- tests/macro_build/ddc_lt_test.dart | 1 - tests/standalone/io/address_lookup_test.dart | 2 +- .../io/async_catch_errors_test.dart | 2 +- .../client_socket_add_close_error_test.dart | 2 +- ...client_socket_add_close_no_error_test.dart | 2 +- ...nt_socket_add_close_result_error_test.dart | 2 +- ...ient_socket_add_destroy_no_error_test.dart | 2 +- ...nt_socket_destroy_and_add_stream_test.dart | 2 +- .../client_socket_destroy_no_error_test.dart | 2 +- .../io/client_socket_exception_test.dart | 2 +- .../standalone/io/create_recursive_test.dart | 2 +- tests/standalone/io/delete_symlink_test.dart | 2 +- tests/standalone/io/directory_chdir_test.dart | 2 +- .../io/directory_create_race_test.dart | 2 +- tests/standalone/io/directory_error_test.dart | 2 +- tests/standalone/io/directory_fuzz_test.dart | 8 +- .../io/directory_list_nonexistent_test.dart | 2 +- .../io/directory_list_pause_test.dart | 2 +- .../io/directory_non_ascii_test.dart | 2 +- tests/standalone/io/directory_test.dart | 2 +- tests/standalone/io/directory_uri_test.dart | 2 +- .../io/echo_server_stream_test.dart | 2 +- .../io/file_blocking_lock_test.dart | 2 +- tests/standalone/io/file_copy_test.dart | 2 +- tests/standalone/io/file_error_test.dart | 2 +- tests/standalone/io/file_fuzz_test.dart | 2 +- .../standalone/io/file_input_stream_test.dart | 2 +- tests/standalone/io/file_leak_test.dart | 2 +- tests/standalone/io/file_lock_test.dart | 2 +- tests/standalone/io/file_non_ascii_test.dart | 2 +- .../io/file_output_stream_test.dart | 2 +- tests/standalone/io/file_pipe_test.dart | 2 +- .../standalone/io/file_read_encoded_test.dart | 2 +- tests/standalone/io/file_stat_test.dart | 2 +- tests/standalone/io/file_stream_test.dart | 2 +- .../io/file_system_async_links_test.dart | 2 +- .../standalone/io/file_system_links_test.dart | 2 +- .../io/file_system_watcher_test.dart | 2 +- tests/standalone/io/file_test.dart | 2 +- tests/standalone/io/file_typed_data_test.dart | 2 +- tests/standalone/io/file_uri_test.dart | 2 +- tests/standalone/io/file_write_as_test.dart | 2 +- tests/standalone/io/file_write_only_test.dart | 2 +- tests/standalone/io/http_bind_test.dart | 2 +- .../io/http_client_connect_test.dart | 2 +- .../io/http_client_exception_test.dart | 2 +- ...ttp_client_parser_crlfs_tolerant_test.dart | 2 +- .../io/http_client_request_test.dart | 2 +- .../io/http_client_stays_alive_test.dart | 2 +- .../io/http_detach_socket_test.dart | 2 +- ...http_force_staggered_ipv6_lookup_test.dart | 2 +- tests/standalone/io/http_ipv6_test.dart | 2 +- tests/standalone/io/http_key_log_test.dart | 2 +- .../io/http_linklocal_ipv6_test.dart | 2 +- .../io/http_parser_connect_method_test.dart | 2 +- .../io/http_parser_header_add_test.dart | 2 +- .../io/http_requested_uri_test.dart | 2 +- .../io/http_reuse_server_port_test.dart | 2 +- tests/standalone/io/http_server_test.dart | 2 +- .../io/https_client_certificate_test.dart | 2 +- .../io/https_client_exception_test.dart | 2 +- ...nnection_closed_during_handshake_test.dart | 2 +- ...tps_nonblocking_trust_evaluation_test.dart | 2 +- tests/standalone/io/io_override_test.dart | 2 +- tests/standalone/io/io_sink_test.dart | 2 +- tests/standalone/io/issue_22636_test.dart | 2 +- tests/standalone/io/issue_22637_test.dart | 2 +- tests/standalone/io/link_async_test.dart | 2 +- tests/standalone/io/link_test.dart | 2 +- tests/standalone/io/link_uri_test.dart | 2 +- .../io/named_pipe_operations_test.dart | 2 +- .../standalone/io/named_pipe_script_test.dart | 2 +- tests/standalone/io/named_pipe_type_test.dart | 2 +- tests/standalone/io/parent_test.dart | 2 +- tests/standalone/io/pipe_server_test.dart | 2 +- tests/standalone/io/platform_test.dart | 2 +- tests/standalone/io/print_sync_test.dart | 2 +- .../standalone/io/process_detached_test.dart | 2 +- .../io/process_environment_test.dart | 2 +- .../io/process_inherit_stdio_script.dart | 2 +- .../io/process_inherit_stdio_test.dart | 9 +- tests/standalone/io/process_kill_test.dart | 2 +- .../standalone/io/process_non_ascii_test.dart | 2 +- tests/standalone/io/process_pid_test.dart | 2 +- tests/standalone/io/process_shell_test.dart | 2 +- .../io/raw_datagram_read_all_test.dart | 2 +- .../io/raw_datagram_socket_test.dart | 2 +- .../io/raw_datagram_zero_length_test.dart | 2 +- .../io/raw_secure_server_closing_test.dart | 2 +- .../io/raw_secure_server_socket_test.dart | 2 +- ...raw_secure_socket_ssl_read_error_test.dart | 2 +- .../io/raw_server_socket_cancel_test.dart | 2 +- tests/standalone/io/raw_socket_test.dart | 2 +- .../io/raw_socket_typed_data_test.dart | 2 +- .../io/raw_synchronous_socket_test.dart | 3 +- tests/standalone/io/regress_10026_test.dart | 2 +- tests/standalone/io/regress_21160_test.dart | 2 +- tests/standalone/io/regress_21987_test.dart | 2 +- tests/standalone/io/regress_34885_test.dart | 2 +- tests/standalone/io/regress_55886_test.dart | 2 +- tests/standalone/io/regress_7191_test.dart | 2 +- .../io/resolve_symbolic_links_test.dart | 2 +- .../io/secure_builtin_roots_test.dart | 2 +- .../io/secure_client_raw_server_test.dart | 2 +- .../io/secure_client_server_test.dart | 2 +- tests/standalone/io/secure_key_log_test.dart | 2 +- .../secure_multiple_client_server_test.dart | 2 +- ...secure_server_client_certificate_test.dart | 2 +- .../io/secure_server_closing_test.dart | 2 +- .../io/secure_server_socket_test.dart | 2 +- .../io/secure_session_resume_test.dart | 2 +- ...ecure_socket_allow_renegotiation_test.dart | 2 +- .../io/secure_socket_alpn_test.dart | 2 +- .../io/secure_socket_error_test.dart | 2 +- ...ket_minimum_tls_protocol_version_test.dart | 2 +- tests/standalone/io/secure_socket_test.dart | 2 +- .../io/server_socket_close_listen_test.dart | 2 +- .../io/server_socket_exception_test.dart | 2 +- .../io/server_socket_listen_close_test.dart | 2 +- tests/standalone/io/signals_test.dart | 2 +- .../standalone/io/socket_arguments_test.dart | 2 +- .../standalone/io/socket_big_chunk_test.dart | 2 +- .../io/socket_cancel_connect_test.dart | 2 +- tests/standalone/io/socket_close_test.dart | 2 +- .../io/socket_connect_consume_close_test.dart | 2 +- ...cket_connect_consume_write_close_test.dart | 2 +- .../socket_connect_dwarf_stacktrace_test.dart | 2 +- ...socket_connect_immediate_destroy_test.dart | 2 +- .../io/socket_connect_stacktrace_test.dart | 2 +- .../io/socket_connect_stream_close_test.dart | 2 +- ...connect_stream_data_close_cancel_test.dart | 2 +- ...socket_connect_stream_data_close_test.dart | 2 +- .../io/socket_connect_timeout_test.dart | 2 +- .../standalone/io/socket_finalizer_test.dart | 2 +- .../io/socket_invalid_arguments_test.dart | 2 +- .../io/socket_invalid_bind_test.dart | 2 +- tests/standalone/io/socket_ipv6_test.dart | 2 +- .../io/socket_many_connections_test.dart | 2 +- tests/standalone/io/socket_sigpipe_test.dart | 2 +- .../io/socket_simple_bind_test.dart | 2 +- .../io/socket_upgrade_to_secure_test.dart | 2 +- .../io/stdio_implicit_close_test.dart | 2 +- .../io/stdio_socket_finalizer_test.dart | 2 +- tests/standalone/io/stream_pipe_test.dart | 2 +- tests/standalone/io/unknown_host_test.dart | 2 +- .../io/web_socket_compression_test.dart | 2 +- .../standalone/io/web_socket_error_test.dart | 2 +- .../web_socket_protocol_processor_test.dart | 2 +- tests/standalone/io/web_socket_test.dart | 2 +- .../windows_file_system_async_links_test.dart | 2 +- tests/standalone/io/zlib_test.dart | 2 +- .../package/.dart_tool/package_config.json | 6 - .../package/package_isolate_test.dart | 5 +- .../typed_array_int64_uint64_test.dart | 2 +- tests/standalone/typed_array_test.dart | 2 +- tests/standalone/typed_data_isolate_test.dart | 2 +- tests/web/async_stacktrace_test.dart | 4 +- tests/web/deferred/deferred_class_test.dart | 2 +- .../web/deferred/deferred_constant2_test.dart | 2 +- .../web/deferred/deferred_constant3_test.dart | 2 +- .../web/deferred/deferred_constant4_test.dart | 2 +- .../web/deferred/deferred_function_test.dart | 2 +- .../deferred/multiple_default_arg_test.dart | 2 +- tests/web/deferred_fail_and_retry_test.dart | 2 +- tests/web/deferred_function_types1_test.dart | 2 +- tests/web/deferred_function_types2_test.dart | 2 +- tests/web/deferred_function_types3_test.dart | 2 +- tests/web/deferred_function_types4_test.dart | 2 +- tests/web/deferred_function_types5_test.dart | 2 +- tests/web/deferred_function_types6_test.dart | 2 +- tests/web/deferred_function_types7_test.dart | 2 +- tests/web/deferred_function_types8_test.dart | 2 +- .../deferred_tearoff_load_library_test.dart | 2 +- .../web/deferred_with_cross_origin_test.dart | 2 +- tests/web/deferred_with_csp_nonce2_test.dart | 2 +- tests/web/deferred_with_csp_nonce_test.dart | 2 +- .../deferred/deferred_custom_loader_test.dart | 2 +- .../deferred/load_in_correct_order_test.dart | 2 +- .../load_multiple_in_correct_order_test.dart | 2 +- .../deferred/load_with_priority_test.dart | 2 +- .../javascriptobject_extensions_test.dart | 2 +- tests/web/internal/object_members_test.dart | 2 +- tests/web/internal/rti/subtype_test.dart | 5 +- tests/web/native/event_loop_test.dart | 2 +- .../static_interop_erasure/type_test.dart | 2 +- .../use_erased_type_members_test.dart | 2 +- tests/web/regress/issue/54419_test.dart | 3 +- tests/web/wasm/js_exceptions_test.dart | 2 +- tests/web/wasm/js_util_test.dart | 2 +- .../weak_reference_polyfill_test.dart | 2 +- tools/bots/test_matrix.json | 1 - utils/ddc/BUILD.gn | 81 +---- 1302 files changed, 2339 insertions(+), 2343 deletions(-) create mode 100644 pkg/expect/lib/async_helper.dart create mode 100644 pkg/expect/lib/legacy/async_minitest.dart create mode 100644 pkg/expect/lib/legacy/minitest.dart create mode 100644 pkg/expect/lib/static_type_helper.dart diff --git a/docs/Testing.md b/docs/Testing.md index 26d9e2002c0..a84cccc70c5 100644 --- a/docs/Testing.md +++ b/docs/Testing.md @@ -495,12 +495,12 @@ some failed way that the test runner can detect and determine that a runtime error occurred. If you are writing asynchronous tests, there is a separate tiny -["async_helper"][async pkg] package that talks to the test runner to ensure all +["async_helper"][async helper] library that talks to the test runner to ensure all asynchronous operations performed by the test have a chance to complete. -[async pkg]: https://github.com/dart-lang/sdk/tree/main/pkg/async_helper +[async helper]: https://github.com/dart-lang/sdk/tree/main/pkg/expect/lib/async_helper.dart -With these two packages, it's straightforward to write tests of expected correct +With these two libraries, it's straightforward to write tests of expected correct runtime behavior. You can also write tests for validating runtime *failures* by using the helper functions for checking that certain exceptions are thrown: diff --git a/pkg/async_helper/lib/async_helper.dart b/pkg/async_helper/lib/async_helper.dart index d2cd87fe73d..6092dce2b8b 100644 --- a/pkg/async_helper/lib/async_helper.dart +++ b/pkg/async_helper/lib/async_helper.dart @@ -2,156 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -/// This library is used for testing asynchronous tests. -/// If a test is asynchronous, it needs to notify the testing driver -/// about this (otherwise tests may get reported as passing after main() -/// finished even if the asynchronous operations fail). -/// -/// This library provides four methods -/// - asyncStart(): Needs to be called before an asynchronous operation is -/// scheduled. -/// - asyncEnd(): Needs to be called as soon as the asynchronous operation -/// ended. -/// - asyncSuccess(_): Variant of asyncEnd useful together with Future.then. -/// - asyncTest(f()): Helper method that wraps a computation that returns a -/// Future with matching calls to asyncStart() and -/// asyncSuccess(_). -/// After every asyncStart() called is matched with a corresponding -/// asyncEnd() or asyncSuccess(_) call, the testing driver will be notified that -/// the tests is done. +// Will be deprecated or removed when possible +// TODO: @Deprecated('Use this library directly from package:expect instead') library; -import 'dart:async'; - -import 'package:expect/expect.dart'; - -bool _initialized = false; -int _asyncLevel = 0; - -Exception _buildException(String msg) { - return Exception('Fatal: $msg. This is most likely a bug in your test.'); -} - -/// Call this method before an asynchronous test is created. -/// -/// If [count] is provided, expect [count] [asyncEnd] calls instead of just one. -void asyncStart([int count = 1]) { - if (count <= 0) return; - if (_initialized && _asyncLevel == 0) { - throw _buildException('asyncStart() was called even though we are done ' - 'with testing.'); - } - if (!_initialized) { - print('unittest-suite-wait-for-done'); - _initialized = true; - } - _asyncLevel += count; -} - -/// Call this after an asynchronous test has ended successfully. -void asyncEnd() { - if (_asyncLevel <= 0) { - if (!_initialized) { - throw _buildException('asyncEnd() was called before asyncStart().'); - } else { - throw _buildException('asyncEnd() was called more often than ' - 'asyncStart().'); - } - } - _asyncLevel--; - if (_asyncLevel == 0) { - print('unittest-suite-success'); - } -} - -/// Call this after an asynchronous test has ended successfully. This is a helper -/// for calling [asyncEnd]. -/// -/// This method intentionally has a signature that matches `Future.then` as a -/// convenience for calling [asyncEnd] when a `Future` completes without error, -/// like this: -/// ```dart -/// asyncStart(); -/// Future result = test(); -/// result.then(asyncSuccess); -/// ``` -void asyncSuccess(void _) { - asyncEnd(); -} - -/// Helper method for performing asynchronous tests involving `Future`. -/// -/// The function [test] must return a `Future` which completes without error -/// when the test is successful. -Future asyncTest(Function() test) { - asyncStart(); - return test().then(asyncSuccess); -} - -/// Verifies that the asynchronous [result] throws a [T]. -/// -/// Fails if [result] completes with a value, or it completes with -/// an error which is not a [T]. -/// -/// Returns the accepted thrown object. -/// For example, to check the content of the thrown object, -/// you could write this: -/// ``` -/// var e = await asyncExpectThrows(asyncExpression) -/// Expect.isTrue(e.myMessage.contains("WARNING")); -/// ``` -/// If `result` completes with an [ExpectException] error from another -/// failed test expectation, that error cannot be caught and accepted. -Future asyncExpectThrows(Future result, - [String reason = ""]) { - // Delay computing the header text until the test has failed. - // The header computation uses complicated language features, - // and language tests should avoid doing complicated things - // until after the actual test has had a chance to succeed. - String header() { - // Handle null being passed in from legacy code - // while also avoiding producing an unnecessary null check warning here. - if ((reason as dynamic) == null) reason = ""; - // Only include the type in the message if it's not `Object`. - var type = Object() is! T ? "<$T>" : ""; - return "asyncExpectThrows$type($reason):"; - } - - // Unsound null-safety check. - if ((result as dynamic) == null) { - Expect.testError("${header()} result Future must not be null."); - } - - // TODO(rnystrom): It might useful to validate that T is not bound to - // ExpectException since that won't work. - - asyncStart(); - return result.then((_) { - throw ExpectException("${header()} Did not throw."); - }, onError: (error, stack) { - // A test failure doesn't count as throwing. Rethrow it. - if (error is ExpectException) throw error; - - if (error is! T) { - // Throws something unexpected. - throw ExpectException( - "${header()} Unexpected '${Error.safeToString(error)}'\n$stack"); - } - - asyncEnd(); - return error; - }); -} - -/// Checks that the asynchronous [result] throws a [T] if and only if -/// [condition] is `true`. -/// -/// When [condition] is `false`, [result] is expected to complete without -/// errors. -Future asyncExpectThrowsWhen( - bool condition, Future result, - [String reason = ""]) { - return condition - ? asyncExpectThrows(result, reason) - : result.then((_) => null); -} +export 'package:expect/async_helper.dart'; diff --git a/pkg/async_helper/lib/async_minitest.dart b/pkg/async_helper/lib/async_minitest.dart index 88bc9476b86..baa0deeae26 100644 --- a/pkg/async_helper/lib/async_minitest.dart +++ b/pkg/async_helper/lib/async_minitest.dart @@ -2,337 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -/// A minimal, dependency-free emulation layer for a subset of the -/// unittest/test API used by the language and core library. -/// -/// Compared with `minitest.dart`, this library supports and expects -/// asynchronous tests. It uses a `Zone` per test to associate a test name with -/// the failure. -/// -/// It does not support `setUp` or `tearDown` methods, -/// and matchers are severely restricted. -/// -/// A number of our language and core library tests were written against the -/// unittest package, which is now deprecated in favor of the new test package. -/// The latter is much better feature-wise, but is also quite complex and has -/// many dependencies. For low-level language and core library tests, we don't -/// want to have to pull in a large number of dependencies and be able to run -/// them correctly in order to run a test, so we want to test them against -/// something simpler. -/// -/// When possible, we just use the tiny expect library. But to avoid rewriting -/// all of the existing tests that use unittest, they can instead use this, -/// which shims the unittest API with as little code as possible and calls into -/// expect. -/// -/// Eventually, it would be good to refactor those tests to use the expect -/// package directly and remove this. +@Deprecated('Use expect.dart and async_helper.dart directly') library; -import 'dart:async'; - -import 'package:async_helper/async_helper.dart'; -import 'package:expect/expect.dart'; - -void group(String name, Function() body) { - var oldName = _pushName(name); - try { - body(); - } finally { - _popName(oldName); - } -} - -void test(String name, Function() body) { - var oldName = _pushName(name); - - asyncStart(); - var result = runZoned(body, zoneValues: {_testToken: _currentName}); - if (result is Future) { - result.then((_) { - asyncEnd(); - }); - } else { - // Ensure all tests get to be set up first. - scheduleMicrotask(asyncEnd); - } - - _popName(oldName); -} - -void expect(dynamic value, dynamic matcher, {String reason = ""}) { - Matcher m; - if (matcher is _Matcher) { - m = matcher.call; - } else if (matcher is! Matcher) { - m = equals(matcher); - } else { - m = matcher; - } - m(value); -} - -R Function() expectAsync0(R Function() f, {int count = 1}) { - asyncStart(count); - return () { - var result = f(); - asyncEnd(); - return result; - }; -} - -R Function(A) expectAsync1(R Function(A) f, {int count = 1}) { - asyncStart(count); - return (A a) { - var result = f(a); - asyncEnd(); - return result; - }; -} - -R Function(A, B) expectAsync2(R Function(A, B) f, {int count = 1}) { - asyncStart(count); - return (A a, B b) { - var result = f(a, b); - asyncEnd(); - return result; - }; -} - -dynamic expectAsync(Function f, {int count = 1}) { - var f2 = f; // Avoid type-promoting f, we want dynamic invocations. - if (f2 is Function(Never, Never, Never, Never, Never)) { - asyncStart(count); - return ([a, b, c, d, e]) { - var result = f(a, b, c, d, e); - asyncEnd(); - return result; - }; - } - if (f2 is Function(Never, Never, Never, Never)) { - asyncStart(count); - return ([a, b, c, d]) { - var result = f(a, b, c, d); - asyncEnd(); - return result; - }; - } - if (f2 is Function(Never, Never, Never)) { - asyncStart(count); - return ([a, b, c]) { - var result = f(a, b, c); - asyncEnd(); - return result; - }; - } - if (f2 is Function(Never, Never)) { - asyncStart(count); - return ([a, b]) { - var result = f(a, b); - asyncEnd(); - return result; - }; - } - if (f2 is Function(Never)) { - asyncStart(count); - return ([a]) { - var result = f(a); - asyncEnd(); - return result; - }; - } - if (f2 is Function()) { - asyncStart(count); - return () { - var result = f(); - asyncEnd(); - return result; - }; - } - throw UnsupportedError( - "expectAsync only accepts up to five argument functions"); -} - -// Matchers -typedef Matcher = void Function(dynamic); - -Matcher same(dynamic o) => (v) { - Expect.identical(o, v); - }; - -Matcher equals(dynamic o) => (v) { - Expect.deepEquals(o, v); - }; - -Matcher greaterThan(num n) => (dynamic v) { - Expect.type(v); - num value = v; - if (value > n) return; - Expect.fail("$v is not greater than $n"); - }; - -Matcher greaterThanOrEqualTo(num n) => (dynamic v) { - Expect.type(v); - num value = v; - if (value >= n) return; - Expect.fail("$v is not greater than $n"); - }; - -Matcher lessThan(num n) => (dynamic v) { - Expect.type(v); - num value = v; - if (value < n) return; - Expect.fail("$v is not less than $n"); - }; - -Matcher lessThanOrEqualTo(num n) => (dynamic v) { - Expect.type(v); - num value = v; - if (value <= n) return; - Expect.fail("$v is not less than $n"); - }; - -Matcher predicate(bool Function(dynamic value) fn, [String description = ""]) => - (dynamic v) { - Expect.isTrue(fn(v), description); - }; - -Matcher anyOf(List expected) => (dynamic actual) { - for (var string in expected) { - if (actual == string) return; - } - - Expect.fail("Expected $actual to be one of $expected."); - }; - -void isTrue(dynamic v) { - Expect.isTrue(v); -} - -void isFalse(dynamic v) { - Expect.isFalse(v); -} - -void isNull(dynamic o) { - Expect.isNull(o); -} - -void _checkThrow( - dynamic v, void Function(dynamic error) onError) { - if (v is Future) { - asyncStart(); - v.then((_) { - Expect.fail("Did not throw"); - }, onError: (e, s) { - if (e is! T) throw e; - onError(e); - asyncEnd(); - }); - return; - } - Expect.throws(v, (e) { - onError(e); - return true; - }); -} - -void returnsNormally(dynamic o) { - try { - Expect.type(o); - o(); - } catch (error, trace) { - Expect.fail( - "Expected function to return normally, but threw:\n$error\n\n$trace"); - } -} - -void throws(dynamic v) { - _checkThrow(v, (_) {}); -} - -Matcher throwsA(matcher) => (dynamic o) { - _checkThrow(o, (error) { - expect(error, matcher); - }); - }; - -Matcher completion(matcher) => (dynamic o) { - Expect.type(o); - Future future = o; - asyncStart(); - future.then((value) { - expect(value, matcher); - asyncEnd(); - }); - }; - -void completes(dynamic o) { - Expect.type(o); - Future future = o; - asyncStart(); - future.then(asyncSuccess); -} - -void isMap(dynamic o) { - Expect.type(o); -} - -void isList(dynamic o) { - Expect.type(o); -} - -void isNotNull(dynamic o) { - Expect.isNotNull(o); -} - -abstract class _Matcher { - void call(dynamic o); -} - -// ignore: camel_case_types -class isInstanceOf implements _Matcher { - @override - void call(dynamic o) { - Expect.type(o); - } -} - -void throwsArgumentError(dynamic v) { - _checkThrow(v, (_) {}); -} - -void throwsStateError(dynamic v) { - _checkThrow(v, (_) {}); -} - -void fail(String message) { - Expect.fail(message); -} - -/// Key for zone value holding current test name. -final _testToken = Object(); - -bool _initializedTestNameCallback = false; - -/// The current combined name of the nesting [group] or [test]. -String _currentName = ""; - -String _pushName(String newName) { - // Look up the current test name from the zone created for the test. - if (!_initializedTestNameCallback) { - ExpectException.setTestNameCallback(() => Zone.current[_testToken]); - _initializedTestNameCallback = true; - } - - var oldName = _currentName; - if (oldName == "") { - _currentName = newName; - } else { - _currentName = "$oldName $newName"; - } - return oldName; -} - -void _popName(String oldName) { - _currentName = oldName; -} +export 'package:expect/legacy/async_minitest.dart'; diff --git a/pkg/compiler/pubspec.yaml b/pkg/compiler/pubspec.yaml index 288535b2276..cbd0c11a792 100644 --- a/pkg/compiler/pubspec.yaml +++ b/pkg/compiler/pubspec.yaml @@ -30,7 +30,6 @@ dev_dependencies: js: any path: any source_maps: any - async_helper: any dart2js_tools: any expect: any modular_test: any diff --git a/pkg/compiler/test/analyses/analysis_helper.dart b/pkg/compiler/test/analyses/analysis_helper.dart index f9f6eb34b6b..1affa0d29ca 100644 --- a/pkg/compiler/test/analyses/analysis_helper.dart +++ b/pkg/compiler/test/analyses/analysis_helper.dart @@ -7,12 +7,12 @@ import 'dart:convert' as json; import 'dart:io'; import 'package:args/args.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/ir/util.dart'; import 'package:compiler/src/util/memory_compiler.dart'; import 'package:compiler/src/phase/load_kernel.dart' as load_kernel; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:front_end/src/api_unstable/dart2js.dart' show relativizeUri; import 'package:kernel/ast.dart' as ir; diff --git a/pkg/compiler/test/analyses/api_dynamic_test.dart b/pkg/compiler/test/analyses/api_dynamic_test.dart index 6237e8a0369..8c2947a8ad8 100644 --- a/pkg/compiler/test/analyses/api_dynamic_test.dart +++ b/pkg/compiler/test/analyses/api_dynamic_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'analysis_helper.dart'; // TODO(johnniwinther): Remove unneeded dynamic accesses from platform source diff --git a/pkg/compiler/test/annotations/annotations_test.dart b/pkg/compiler/test/annotations/annotations_test.dart index b04d6e0fc26..a1552a1d1a9 100644 --- a/pkg/compiler/test/annotations/annotations_test.dart +++ b/pkg/compiler/test/annotations/annotations_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/closure/closure_test.dart b/pkg/compiler/test/closure/closure_test.dart index a7eb744edc7..723f3fd3957 100644 --- a/pkg/compiler/test/closure/closure_test.dart +++ b/pkg/compiler/test/closure/closure_test.dart @@ -5,7 +5,6 @@ import 'dart:io' hide Link; import 'package:_fe_analyzer_shared/src/testing/features.dart'; import 'package:_fe_analyzer_shared/src/util/link.dart' show Link; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; @@ -13,6 +12,7 @@ import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/js_model/element_map.dart'; import 'package:compiler/src/js_model/js_world.dart'; import 'package:compiler/src/js_model/locals.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:kernel/ast.dart' as ir; import '../equivalence/id_equivalence.dart'; diff --git a/pkg/compiler/test/codegen/arithmetic_simplification_test.dart b/pkg/compiler/test/codegen/arithmetic_simplification_test.dart index f25d7e354b8..1af5b8ef55b 100644 --- a/pkg/compiler/test/codegen/arithmetic_simplification_test.dart +++ b/pkg/compiler/test/codegen/arithmetic_simplification_test.dart @@ -4,7 +4,7 @@ // Test constant folding on numbers. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String INT_PLUS_ZERO = """ diff --git a/pkg/compiler/test/codegen/array_static_intercept_test.dart b/pkg/compiler/test/codegen/array_static_intercept_test.dart index ee3c87a9b2c..87dcc71e91c 100644 --- a/pkg/compiler/test/codegen/array_static_intercept_test.dart +++ b/pkg/compiler/test/codegen/array_static_intercept_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/bitops1_test.dart b/pkg/compiler/test/codegen/bitops1_test.dart index 5d88aa05eda..4bc55d0c52c 100644 --- a/pkg/compiler/test/codegen/bitops1_test.dart +++ b/pkg/compiler/test/codegen/bitops1_test.dart @@ -5,7 +5,7 @@ library bitops1_test; import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const COMMON = r""" diff --git a/pkg/compiler/test/codegen/bitops2_test.dart b/pkg/compiler/test/codegen/bitops2_test.dart index c4d4279960e..215bad574f2 100644 --- a/pkg/compiler/test/codegen/bitops2_test.dart +++ b/pkg/compiler/test/codegen/bitops2_test.dart @@ -5,7 +5,7 @@ library bitops2_test; import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const COMMON = r""" diff --git a/pkg/compiler/test/codegen/builtin_interceptor_test.dart b/pkg/compiler/test/codegen/builtin_interceptor_test.dart index c5f67fddfff..0f59c2dea93 100644 --- a/pkg/compiler/test/codegen/builtin_interceptor_test.dart +++ b/pkg/compiler/test/codegen/builtin_interceptor_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/class_codegen2_test.dart b/pkg/compiler/test/codegen/class_codegen2_test.dart index 91f29e9d24f..ca303e8252d 100644 --- a/pkg/compiler/test/codegen/class_codegen2_test.dart +++ b/pkg/compiler/test/codegen/class_codegen2_test.dart @@ -5,8 +5,8 @@ // Test that parameters keep their names in the output. import 'dart:async'; +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/class_codegen_test.dart b/pkg/compiler/test/codegen/class_codegen_test.dart index 31af6dfad1f..2ac766c372d 100644 --- a/pkg/compiler/test/codegen/class_codegen_test.dart +++ b/pkg/compiler/test/codegen/class_codegen_test.dart @@ -4,8 +4,8 @@ // Test that parameters keep their names in the output. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/class_order_test.dart b/pkg/compiler/test/codegen/class_order_test.dart index 63c0ae44e67..5a719acd1a0 100644 --- a/pkg/compiler/test/codegen/class_order_test.dart +++ b/pkg/compiler/test/codegen/class_order_test.dart @@ -4,8 +4,8 @@ // Test that parameters keep their names in the output. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/closure_call_of_static_reduction_test.dart b/pkg/compiler/test/codegen/closure_call_of_static_reduction_test.dart index 74d86f69045..14a5b499ca9 100644 --- a/pkg/compiler/test/codegen/closure_call_of_static_reduction_test.dart +++ b/pkg/compiler/test/codegen/closure_call_of_static_reduction_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST1 = r""" diff --git a/pkg/compiler/test/codegen/closure_codegen_test.dart b/pkg/compiler/test/codegen/closure_codegen_test.dart index 64a05598dbe..0c26a9f4256 100644 --- a/pkg/compiler/test/codegen/closure_codegen_test.dart +++ b/pkg/compiler/test/codegen/closure_codegen_test.dart @@ -5,8 +5,8 @@ // Test that parameters keep their names in the output. import 'dart:async'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_INVOCATION0 = r""" diff --git a/pkg/compiler/test/codegen/code_motion_test.dart b/pkg/compiler/test/codegen/code_motion_test.dart index a7fe67ff517..40ee1a83df7 100644 --- a/pkg/compiler/test/codegen/code_motion_test.dart +++ b/pkg/compiler/test/codegen/code_motion_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/codegen_test_helper.dart b/pkg/compiler/test/codegen/codegen_test_helper.dart index 0df6ea40359..40ab312de1a 100644 --- a/pkg/compiler/test/codegen/codegen_test_helper.dart +++ b/pkg/compiler/test/codegen/codegen_test_helper.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/codegen/constant_folding_codeUnitAt_test.dart b/pkg/compiler/test/codegen/constant_folding_codeUnitAt_test.dart index c67f8e751df..50acf0647aa 100644 --- a/pkg/compiler/test/codegen/constant_folding_codeUnitAt_test.dart +++ b/pkg/compiler/test/codegen/constant_folding_codeUnitAt_test.dart @@ -4,7 +4,7 @@ // Test constant folding on numbers. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_1 = """ diff --git a/pkg/compiler/test/codegen/constant_folding_test.dart b/pkg/compiler/test/codegen/constant_folding_test.dart index 583e1b02126..3a8a5413770 100644 --- a/pkg/compiler/test/codegen/constant_folding_test.dart +++ b/pkg/compiler/test/codegen/constant_folding_test.dart @@ -4,8 +4,8 @@ // Test constant folding on numbers. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String NUMBER_FOLDING = """ diff --git a/pkg/compiler/test/codegen/constant_namer_test.dart b/pkg/compiler/test/codegen/constant_namer_test.dart index 8893422c96e..da967e459b4 100644 --- a/pkg/compiler/test/codegen/constant_namer_test.dart +++ b/pkg/compiler/test/codegen/constant_namer_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/dead_code_test.dart b/pkg/compiler/test/codegen/dead_code_test.dart index c7ffd88ed50..cbd0111e973 100644 --- a/pkg/compiler/test/codegen/dead_code_test.dart +++ b/pkg/compiler/test/codegen/dead_code_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; String TEST = r''' diff --git a/pkg/compiler/test/codegen/dead_phi_eliminator_test.dart b/pkg/compiler/test/codegen/dead_phi_eliminator_test.dart index dbb2b797d81..a2a6dfe6e54 100644 --- a/pkg/compiler/test/codegen/dead_phi_eliminator_test.dart +++ b/pkg/compiler/test/codegen/dead_phi_eliminator_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/declare_once_test.dart b/pkg/compiler/test/codegen/declare_once_test.dart index afd684177ae..dbe06b2ef67 100644 --- a/pkg/compiler/test/codegen/declare_once_test.dart +++ b/pkg/compiler/test/codegen/declare_once_test.dart @@ -4,7 +4,7 @@ // Test that parameters keep their names in the output. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/elide_callthrough_stub_test.dart b/pkg/compiler/test/codegen/elide_callthrough_stub_test.dart index 5d46a5370ec..71774cd5080 100644 --- a/pkg/compiler/test/codegen/elide_callthrough_stub_test.dart +++ b/pkg/compiler/test/codegen/elide_callthrough_stub_test.dart @@ -6,7 +6,7 @@ // optimization is done by the simplifier, so inlining does not need to be // enabled. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/emit_const_fields_test.dart b/pkg/compiler/test/codegen/emit_const_fields_test.dart index 9b0828fec93..0bd427c77fe 100644 --- a/pkg/compiler/test/codegen/emit_const_fields_test.dart +++ b/pkg/compiler/test/codegen/emit_const_fields_test.dart @@ -4,8 +4,8 @@ // Test that unused static consts are not emitted. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST_GUIDE = r""" diff --git a/pkg/compiler/test/codegen/equals_test.dart b/pkg/compiler/test/codegen/equals_test.dart index aae543dc6ee..e9be736ae96 100644 --- a/pkg/compiler/test/codegen/equals_test.dart +++ b/pkg/compiler/test/codegen/equals_test.dart @@ -5,7 +5,7 @@ library equals_test; import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST1 = r""" diff --git a/pkg/compiler/test/codegen/expect_annotations2_test.dart b/pkg/compiler/test/codegen/expect_annotations2_test.dart index 8b1780f0b72..f0829e25c93 100644 --- a/pkg/compiler/test/codegen/expect_annotations2_test.dart +++ b/pkg/compiler/test/codegen/expect_annotations2_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import 'package:compiler/compiler_api.dart' as api; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/codegen/expect_annotations_test.dart b/pkg/compiler/test/codegen/expect_annotations_test.dart index cd1420ede6b..ec253df0145 100644 --- a/pkg/compiler/test/codegen/expect_annotations_test.dart +++ b/pkg/compiler/test/codegen/expect_annotations_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/elements/entities.dart'; diff --git a/pkg/compiler/test/codegen/field_codegen_test.dart b/pkg/compiler/test/codegen/field_codegen_test.dart index fc28ef22b19..325f3313d82 100644 --- a/pkg/compiler/test/codegen/field_codegen_test.dart +++ b/pkg/compiler/test/codegen/field_codegen_test.dart @@ -4,8 +4,8 @@ // Test that parameters keep their names in the output. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST_NULL0 = r""" diff --git a/pkg/compiler/test/codegen/field_update_test.dart b/pkg/compiler/test/codegen/field_update_test.dart index a2ae29a07fe..3758123cf48 100644 --- a/pkg/compiler/test/codegen/field_update_test.dart +++ b/pkg/compiler/test/codegen/field_update_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; // Test for emitting JavaScript pre- and post-increment and assignment ops. diff --git a/pkg/compiler/test/codegen/for_in_test.dart b/pkg/compiler/test/codegen/for_in_test.dart index 6c5cb0e2a0a..a9fe38982d4 100644 --- a/pkg/compiler/test/codegen/for_in_test.dart +++ b/pkg/compiler/test/codegen/for_in_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/forloop_box_test.dart b/pkg/compiler/test/codegen/forloop_box_test.dart index aa901539489..298309770ee 100644 --- a/pkg/compiler/test/codegen/forloop_box_test.dart +++ b/pkg/compiler/test/codegen/forloop_box_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; String SHOULD_NOT_BE_BOXED_TEST = r''' diff --git a/pkg/compiler/test/codegen/generate_at_use_site_test.dart b/pkg/compiler/test/codegen/generate_at_use_site_test.dart index 6226876890a..b501c63ddc2 100644 --- a/pkg/compiler/test/codegen/generate_at_use_site_test.dart +++ b/pkg/compiler/test/codegen/generate_at_use_site_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String FIB = r""" diff --git a/pkg/compiler/test/codegen/generic_method_test.dart b/pkg/compiler/test/codegen/generic_method_test.dart index 2e3ea0fa6ce..b28a83b26b8 100644 --- a/pkg/compiler/test/codegen/generic_method_test.dart +++ b/pkg/compiler/test/codegen/generic_method_test.dart @@ -7,8 +7,8 @@ // unused. This resulted in `null` being added to a list that wouldn't otherwise // need to support null. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST = r""" diff --git a/pkg/compiler/test/codegen/gvn_test.dart b/pkg/compiler/test/codegen/gvn_test.dart index a04dc03925e..97fa3cbd180 100644 --- a/pkg/compiler/test/codegen/gvn_test.dart +++ b/pkg/compiler/test/codegen/gvn_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/identity_test.dart b/pkg/compiler/test/codegen/identity_test.dart index db43a57f97b..c6810b3aa6c 100644 --- a/pkg/compiler/test/codegen/identity_test.dart +++ b/pkg/compiler/test/codegen/identity_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/if_do_while_test.dart b/pkg/compiler/test/codegen/if_do_while_test.dart index cc8957e9200..b8aa4472d93 100644 --- a/pkg/compiler/test/codegen/if_do_while_test.dart +++ b/pkg/compiler/test/codegen/if_do_while_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST = r""" diff --git a/pkg/compiler/test/codegen/interceptor_almost_constant_test.dart b/pkg/compiler/test/codegen/interceptor_almost_constant_test.dart index b09addb2932..ad3677e118a 100644 --- a/pkg/compiler/test/codegen/interceptor_almost_constant_test.dart +++ b/pkg/compiler/test/codegen/interceptor_almost_constant_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/interceptor_test.dart b/pkg/compiler/test/codegen/interceptor_test.dart index d3958305533..f110de32973 100644 --- a/pkg/compiler/test/codegen/interceptor_test.dart +++ b/pkg/compiler/test/codegen/interceptor_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/interpolation_folding_test.dart b/pkg/compiler/test/codegen/interpolation_folding_test.dart index 4b88d9d142f..f4c68ff2e91 100644 --- a/pkg/compiler/test/codegen/interpolation_folding_test.dart +++ b/pkg/compiler/test/codegen/interpolation_folding_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/inverse_operator_test.dart b/pkg/compiler/test/codegen/inverse_operator_test.dart index 5d5e1d24540..cef2d2876fc 100644 --- a/pkg/compiler/test/codegen/inverse_operator_test.dart +++ b/pkg/compiler/test/codegen/inverse_operator_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String MAIN = r""" diff --git a/pkg/compiler/test/codegen/is_function_test.dart b/pkg/compiler/test/codegen/is_function_test.dart index 6018a8a7f5c..f3c4a826982 100644 --- a/pkg/compiler/test/codegen/is_function_test.dart +++ b/pkg/compiler/test/codegen/is_function_test.dart @@ -5,11 +5,11 @@ /// Test that checks that we are not added $isFunction properties on closure /// classes. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/js_emitter/model.dart'; import 'package:compiler/src/js_model/js_strategy.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/codegen/is_inference2_test.dart b/pkg/compiler/test/codegen/is_inference2_test.dart index 4117a993260..2a301723452 100644 --- a/pkg/compiler/test/codegen/is_inference2_test.dart +++ b/pkg/compiler/test/codegen/is_inference2_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_IF_BOOL_FIRST_INSTRUCTION = r""" diff --git a/pkg/compiler/test/codegen/is_inference_test.dart b/pkg/compiler/test/codegen/is_inference_test.dart index 886b5e44fc9..4c62c0d346a 100644 --- a/pkg/compiler/test/codegen/is_inference_test.dart +++ b/pkg/compiler/test/codegen/is_inference_test.dart @@ -3,8 +3,8 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:async'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_IF = r""" diff --git a/pkg/compiler/test/codegen/jsarray_indexof_test.dart b/pkg/compiler/test/codegen/jsarray_indexof_test.dart index dc91f38be2c..66e6f1a027c 100644 --- a/pkg/compiler/test/codegen/jsarray_indexof_test.dart +++ b/pkg/compiler/test/codegen/jsarray_indexof_test.dart @@ -5,7 +5,6 @@ // Test that `length` access in JSArray.indexOf is encoding using `.length` and // not `.get$length()`. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/elements/entities.dart'; @@ -15,6 +14,7 @@ import 'package:compiler/src/js_emitter/model.dart'; import 'package:compiler/src/js_model/js_strategy.dart'; import 'package:compiler/src/js/js.dart' as js; import 'package:compiler/src/universe/selector.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; import '../helpers/element_lookup.dart'; diff --git a/pkg/compiler/test/codegen/late_field_redundancy_test.dart b/pkg/compiler/test/codegen/late_field_redundancy_test.dart index 6ed177fb45f..7bd25597c4f 100644 --- a/pkg/compiler/test/codegen/late_field_redundancy_test.dart +++ b/pkg/compiler/test/codegen/late_field_redundancy_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/late_field_test.dart b/pkg/compiler/test/codegen/late_field_test.dart index f9132a48c01..d127e43fc65 100644 --- a/pkg/compiler/test/codegen/late_field_test.dart +++ b/pkg/compiler/test/codegen/late_field_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_DIRECT = r""" diff --git a/pkg/compiler/test/codegen/licm_test.dart b/pkg/compiler/test/codegen/licm_test.dart index a9815186975..83ac051a9a5 100644 --- a/pkg/compiler/test/codegen/licm_test.dart +++ b/pkg/compiler/test/codegen/licm_test.dart @@ -5,7 +5,7 @@ // Check that we hoist instructions in a loop condition, even if that // condition involves control flow. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST = ''' diff --git a/pkg/compiler/test/codegen/list_tracer_length_test.dart b/pkg/compiler/test/codegen/list_tracer_length_test.dart index 738731c3a53..5f41e347f96 100644 --- a/pkg/compiler/test/codegen/list_tracer_length_test.dart +++ b/pkg/compiler/test/codegen/list_tracer_length_test.dart @@ -4,8 +4,8 @@ /// TODO(johnniwinther): Currently this only works with the mock compiler. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST1 = r""" diff --git a/pkg/compiler/test/codegen/list_tracer_node_type_test.dart b/pkg/compiler/test/codegen/list_tracer_node_type_test.dart index 49645bc8b21..dfc29ce6a3e 100644 --- a/pkg/compiler/test/codegen/list_tracer_node_type_test.dart +++ b/pkg/compiler/test/codegen/list_tracer_node_type_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST1 = r""" diff --git a/pkg/compiler/test/codegen/literal_list_test.dart b/pkg/compiler/test/codegen/literal_list_test.dart index 96eb94005e4..b4c15e2abce 100644 --- a/pkg/compiler/test/codegen/literal_list_test.dart +++ b/pkg/compiler/test/codegen/literal_list_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/literal_map_test.dart b/pkg/compiler/test/codegen/literal_map_test.dart index b5db2aafaa1..f0aaebaaa11 100644 --- a/pkg/compiler/test/codegen/literal_map_test.dart +++ b/pkg/compiler/test/codegen/literal_map_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST = """ diff --git a/pkg/compiler/test/codegen/load_elimination_test.dart b/pkg/compiler/test/codegen/load_elimination_test.dart index d0d3f173b5a..3730b95e6f9 100644 --- a/pkg/compiler/test/codegen/load_elimination_test.dart +++ b/pkg/compiler/test/codegen/load_elimination_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST_1 = """ diff --git a/pkg/compiler/test/codegen/loop_test.dart b/pkg/compiler/test/codegen/loop_test.dart index acd1d88363a..6fd987e63bd 100644 --- a/pkg/compiler/test/codegen/loop_test.dart +++ b/pkg/compiler/test/codegen/loop_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/minify_many_locals_test.dart b/pkg/compiler/test/codegen/minify_many_locals_test.dart index 58b0c82be47..66daef2708b 100644 --- a/pkg/compiler/test/codegen/minify_many_locals_test.dart +++ b/pkg/compiler/test/codegen/minify_many_locals_test.dart @@ -4,7 +4,7 @@ // Test that parameters keep their names in the output. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/model_test.dart b/pkg/compiler/test/codegen/model_test.dart index 48e98f21150..69924ac6aa5 100644 --- a/pkg/compiler/test/codegen/model_test.dart +++ b/pkg/compiler/test/codegen/model_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/common/codegen.dart'; diff --git a/pkg/compiler/test/codegen/modulo_remainder_test.dart b/pkg/compiler/test/codegen/modulo_remainder_test.dart index 1698c4e102d..b92677bbe57 100644 --- a/pkg/compiler/test/codegen/modulo_remainder_test.dart +++ b/pkg/compiler/test/codegen/modulo_remainder_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String MOD1 = r""" diff --git a/pkg/compiler/test/codegen/negation_shift_regression_test.dart b/pkg/compiler/test/codegen/negation_shift_regression_test.dart index f3ac6fd32a6..8c5ed5fe0b8 100644 --- a/pkg/compiler/test/codegen/negation_shift_regression_test.dart +++ b/pkg/compiler/test/codegen/negation_shift_regression_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; // A bug in UnaryNegateSpecializer left '-a' labelled as 'positive', allowing diff --git a/pkg/compiler/test/codegen/new_rti_is_test.dart b/pkg/compiler/test/codegen/new_rti_is_test.dart index 53925b896cd..277d4f19381 100644 --- a/pkg/compiler/test/codegen/new_rti_is_test.dart +++ b/pkg/compiler/test/codegen/new_rti_is_test.dart @@ -5,7 +5,7 @@ library new_rti_is_test; import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; // 'N' tests all have a nullable input so should not reduce is-test. diff --git a/pkg/compiler/test/codegen/no_constructor_body_test.dart b/pkg/compiler/test/codegen/no_constructor_body_test.dart index 29e6f8d5782..4ed04523a74 100644 --- a/pkg/compiler/test/codegen/no_constructor_body_test.dart +++ b/pkg/compiler/test/codegen/no_constructor_body_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST = r""" diff --git a/pkg/compiler/test/codegen/no_duplicate_constructor_body2_test.dart b/pkg/compiler/test/codegen/no_duplicate_constructor_body2_test.dart index d3ac4fe5d7c..04cb990eaee 100644 --- a/pkg/compiler/test/codegen/no_duplicate_constructor_body2_test.dart +++ b/pkg/compiler/test/codegen/no_duplicate_constructor_body2_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import '../helpers/compiler_helper.dart'; -import "package:async_helper/async_helper.dart"; +import "package:expect/async_helper.dart"; const String CODE = """ var x = 0; diff --git a/pkg/compiler/test/codegen/no_duplicate_constructor_body_test.dart b/pkg/compiler/test/codegen/no_duplicate_constructor_body_test.dart index ebf842dd4c4..76c7bf41285 100644 --- a/pkg/compiler/test/codegen/no_duplicate_constructor_body_test.dart +++ b/pkg/compiler/test/codegen/no_duplicate_constructor_body_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import "package:async_helper/async_helper.dart"; +import "package:expect/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String CODE = """ diff --git a/pkg/compiler/test/codegen/no_duplicate_stub_test.dart b/pkg/compiler/test/codegen/no_duplicate_stub_test.dart index fbbf2f5877d..bf67a15a3ca 100644 --- a/pkg/compiler/test/codegen/no_duplicate_stub_test.dart +++ b/pkg/compiler/test/codegen/no_duplicate_stub_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import "package:async_helper/async_helper.dart"; +import "package:expect/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST = r""" diff --git a/pkg/compiler/test/codegen/null_check_test.dart b/pkg/compiler/test/codegen/null_check_test.dart index 63d226e4040..9b7af4f69d8 100644 --- a/pkg/compiler/test/codegen/null_check_test.dart +++ b/pkg/compiler/test/codegen/null_check_test.dart @@ -4,7 +4,7 @@ import "package:expect/expect.dart"; import '../helpers/compiler_helper.dart'; -import "package:async_helper/async_helper.dart"; +import "package:expect/async_helper.dart"; const String TEST1 = r""" main() { diff --git a/pkg/compiler/test/codegen/null_type_test.dart b/pkg/compiler/test/codegen/null_type_test.dart index 0a23eaf9194..e34598354c2 100644 --- a/pkg/compiler/test/codegen/null_type_test.dart +++ b/pkg/compiler/test/codegen/null_type_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/number_output_test.dart b/pkg/compiler/test/codegen/number_output_test.dart index 2114ea06dc4..626a7726332 100644 --- a/pkg/compiler/test/codegen/number_output_test.dart +++ b/pkg/compiler/test/codegen/number_output_test.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:expect/expect.dart'; import 'package:compiler/compiler_api.dart' as api; import 'package:compiler/src/commandline_options.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/util/memory_compiler.dart'; const MEMORY_SOURCE_FILES = const { diff --git a/pkg/compiler/test/codegen/parameter_phi_elimination_test.dart b/pkg/compiler/test/codegen/parameter_phi_elimination_test.dart index 5c9aa95e64d..5f3a062dd17 100644 --- a/pkg/compiler/test/codegen/parameter_phi_elimination_test.dart +++ b/pkg/compiler/test/codegen/parameter_phi_elimination_test.dart @@ -6,7 +6,7 @@ // VMOptions=--enable_asserts -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String SOURCE = r""" diff --git a/pkg/compiler/test/codegen/pragma_annotations_test.dart b/pkg/compiler/test/codegen/pragma_annotations_test.dart index b3d3d82ea68..40775d04a79 100644 --- a/pkg/compiler/test/codegen/pragma_annotations_test.dart +++ b/pkg/compiler/test/codegen/pragma_annotations_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; diff --git a/pkg/compiler/test/codegen/pretty_parameter_test.dart b/pkg/compiler/test/codegen/pretty_parameter_test.dart index fa7039078ce..61430fb055c 100644 --- a/pkg/compiler/test/codegen/pretty_parameter_test.dart +++ b/pkg/compiler/test/codegen/pretty_parameter_test.dart @@ -4,8 +4,8 @@ // Test that parameters keep their names in the output. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String FOO = r""" diff --git a/pkg/compiler/test/codegen/redundant_phi_eliminator_test.dart b/pkg/compiler/test/codegen/redundant_phi_eliminator_test.dart index 6ecc83009c5..b210fbbcd7e 100644 --- a/pkg/compiler/test/codegen/redundant_phi_eliminator_test.dart +++ b/pkg/compiler/test/codegen/redundant_phi_eliminator_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/regress_10231_test.dart b/pkg/compiler/test/codegen/regress_10231_test.dart index 95a9865ba8f..1054d164b35 100644 --- a/pkg/compiler/test/codegen/regress_10231_test.dart +++ b/pkg/compiler/test/codegen/regress_10231_test.dart @@ -4,8 +4,8 @@ // Regression test for http://dartbug.com/10231. +import "package:expect/async_helper.dart"; import 'package:expect/expect.dart'; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String SOURCE = """ diff --git a/pkg/compiler/test/codegen/shift_right_unsigned_test.dart b/pkg/compiler/test/codegen/shift_right_unsigned_test.dart index 90c2dc93778..68c1cc1f770 100644 --- a/pkg/compiler/test/codegen/shift_right_unsigned_test.dart +++ b/pkg/compiler/test/codegen/shift_right_unsigned_test.dart @@ -5,7 +5,7 @@ library shru_test; import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const COMMON = r""" diff --git a/pkg/compiler/test/codegen/side_effect_tdiv_regression_test.dart b/pkg/compiler/test/codegen/side_effect_tdiv_regression_test.dart index 0aa528fb3f8..0ab51e373e2 100644 --- a/pkg/compiler/test/codegen/side_effect_tdiv_regression_test.dart +++ b/pkg/compiler/test/codegen/side_effect_tdiv_regression_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import 'package:expect/expect.dart'; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/simple_inferrer_relations_test.dart b/pkg/compiler/test/codegen/simple_inferrer_relations_test.dart index cd5b3cbe5eb..54add89a5a8 100644 --- a/pkg/compiler/test/codegen/simple_inferrer_relations_test.dart +++ b/pkg/compiler/test/codegen/simple_inferrer_relations_test.dart @@ -4,7 +4,7 @@ /// TODO(johnniwinther): Port this test to use the equivalence framework. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/ssa_phi_codegen_test.dart b/pkg/compiler/test/codegen/ssa_phi_codegen_test.dart index 9b0e47be379..fd522961503 100644 --- a/pkg/compiler/test/codegen/ssa_phi_codegen_test.dart +++ b/pkg/compiler/test/codegen/ssa_phi_codegen_test.dart @@ -4,7 +4,7 @@ // Test that parameters keep their names in the output. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/static_closure_test.dart b/pkg/compiler/test/codegen/static_closure_test.dart index 9a15fb60c75..36b66dc159c 100644 --- a/pkg/compiler/test/codegen/static_closure_test.dart +++ b/pkg/compiler/test/codegen/static_closure_test.dart @@ -4,8 +4,8 @@ // Test that static functions are closurized as expected. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; main() { diff --git a/pkg/compiler/test/codegen/strength_eq_test.dart b/pkg/compiler/test/codegen/strength_eq_test.dart index 92bb57228cc..baf6d03fbbf 100644 --- a/pkg/compiler/test/codegen/strength_eq_test.dart +++ b/pkg/compiler/test/codegen/strength_eq_test.dart @@ -4,7 +4,7 @@ // Test constant folding on numbers. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String CODE = """ diff --git a/pkg/compiler/test/codegen/string_add_test.dart b/pkg/compiler/test/codegen/string_add_test.dart index 2b64f359c80..685ecce3ab8 100644 --- a/pkg/compiler/test/codegen/string_add_test.dart +++ b/pkg/compiler/test/codegen/string_add_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; main() { diff --git a/pkg/compiler/test/codegen/string_escapes_test.dart b/pkg/compiler/test/codegen/string_escapes_test.dart index 9e774d2a15a..df451f4f2d0 100644 --- a/pkg/compiler/test/codegen/string_escapes_test.dart +++ b/pkg/compiler/test/codegen/string_escapes_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/string_interpolation_test.dart b/pkg/compiler/test/codegen/string_interpolation_test.dart index c36f45e628d..c51775dd030 100644 --- a/pkg/compiler/test/codegen/string_interpolation_test.dart +++ b/pkg/compiler/test/codegen/string_interpolation_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; main() { diff --git a/pkg/compiler/test/codegen/switch_empty_default_test.dart b/pkg/compiler/test/codegen/switch_empty_default_test.dart index ce8ff13e401..d935b88898f 100644 --- a/pkg/compiler/test/codegen/switch_empty_default_test.dart +++ b/pkg/compiler/test/codegen/switch_empty_default_test.dart @@ -4,7 +4,7 @@ // Test constant folding on numbers. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String SIMPLY_EMPTY = """ diff --git a/pkg/compiler/test/codegen/tdiv_test.dart b/pkg/compiler/test/codegen/tdiv_test.dart index 2a212c713ad..c49b1d8bf32 100644 --- a/pkg/compiler/test/codegen/tdiv_test.dart +++ b/pkg/compiler/test/codegen/tdiv_test.dart @@ -5,7 +5,7 @@ library tdiv_test; import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST1 = r""" diff --git a/pkg/compiler/test/codegen/top_level_closure_tree_shake_test.dart b/pkg/compiler/test/codegen/top_level_closure_tree_shake_test.dart index 5868d23cba3..1098293a752 100644 --- a/pkg/compiler/test/codegen/top_level_closure_tree_shake_test.dart +++ b/pkg/compiler/test/codegen/top_level_closure_tree_shake_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/tree_shaking_test.dart b/pkg/compiler/test/codegen/tree_shaking_test.dart index 2beab1409e8..8b7745c34bb 100644 --- a/pkg/compiler/test/codegen/tree_shaking_test.dart +++ b/pkg/compiler/test/codegen/tree_shaking_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST = r""" diff --git a/pkg/compiler/test/codegen/trust_type_annotations2_test.dart b/pkg/compiler/test/codegen/trust_type_annotations2_test.dart index 3bfaaa05c12..c45408d6e5b 100644 --- a/pkg/compiler/test/codegen/trust_type_annotations2_test.dart +++ b/pkg/compiler/test/codegen/trust_type_annotations2_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import 'package:expect/expect.dart'; -import "package:async_helper/async_helper.dart"; import 'package:compiler/src/util/memory_compiler.dart'; const MEMORY_SOURCE_FILES = const { diff --git a/pkg/compiler/test/codegen/trust_type_annotations_test.dart b/pkg/compiler/test/codegen/trust_type_annotations_test.dart index 663145d275c..a55debc6508 100644 --- a/pkg/compiler/test/codegen/trust_type_annotations_test.dart +++ b/pkg/compiler/test/codegen/trust_type_annotations_test.dart @@ -4,8 +4,8 @@ import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/names.dart'; +import "package:expect/async_helper.dart"; import 'package:expect/expect.dart'; -import "package:async_helper/async_helper.dart"; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/inferrer/typemasks/masks.dart'; diff --git a/pkg/compiler/test/codegen/type_guard_unuser_test.dart b/pkg/compiler/test/codegen/type_guard_unuser_test.dart index b04604f0f25..58e4d982b1a 100644 --- a/pkg/compiler/test/codegen/type_guard_unuser_test.dart +++ b/pkg/compiler/test/codegen/type_guard_unuser_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/type_inference2_test.dart b/pkg/compiler/test/codegen/type_inference2_test.dart index c9ca3f39772..442bd236609 100644 --- a/pkg/compiler/test/codegen/type_inference2_test.dart +++ b/pkg/compiler/test/codegen/type_inference2_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/type_inference3_test.dart b/pkg/compiler/test/codegen/type_inference3_test.dart index f50aec32b40..8be223368a7 100644 --- a/pkg/compiler/test/codegen/type_inference3_test.dart +++ b/pkg/compiler/test/codegen/type_inference3_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/type_inference4_test.dart b/pkg/compiler/test/codegen/type_inference4_test.dart index 5628021a296..d7026733854 100644 --- a/pkg/compiler/test/codegen/type_inference4_test.dart +++ b/pkg/compiler/test/codegen/type_inference4_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/type_inference5_test.dart b/pkg/compiler/test/codegen/type_inference5_test.dart index d2a43504977..52df97566e8 100644 --- a/pkg/compiler/test/codegen/type_inference5_test.dart +++ b/pkg/compiler/test/codegen/type_inference5_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String TEST_ONE = r""" diff --git a/pkg/compiler/test/codegen/type_inference8_test.dart b/pkg/compiler/test/codegen/type_inference8_test.dart index 4445f217fdf..284c488bf08 100644 --- a/pkg/compiler/test/codegen/type_inference8_test.dart +++ b/pkg/compiler/test/codegen/type_inference8_test.dart @@ -4,7 +4,6 @@ /// TODO(johnniwinther): Move this test to the codegen folder. -import "package:async_helper/async_helper.dart"; import "package:compiler/src/commandline_options.dart"; import "package:compiler/src/common/elements.dart"; import "package:compiler/src/compiler.dart"; @@ -15,6 +14,7 @@ import "package:compiler/src/inferrer/types.dart"; import 'package:compiler/src/inferrer/typemasks/masks.dart'; import 'package:compiler/src/js_model/js_strategy.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/codegen/types_of_captured_variables_test.dart b/pkg/compiler/test/codegen/types_of_captured_variables_test.dart index d327223f8f0..538e20eeede 100644 --- a/pkg/compiler/test/codegen/types_of_captured_variables_test.dart +++ b/pkg/compiler/test/codegen/types_of_captured_variables_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import "package:expect/async_helper.dart"; import 'package:expect/expect.dart'; -import "package:async_helper/async_helper.dart"; import '../helpers/compiler_helper.dart'; const String TEST1 = r""" diff --git a/pkg/compiler/test/codegen/unused_empty_map_test.dart b/pkg/compiler/test/codegen/unused_empty_map_test.dart index c2659737144..1e323f26790 100644 --- a/pkg/compiler/test/codegen/unused_empty_map_test.dart +++ b/pkg/compiler/test/codegen/unused_empty_map_test.dart @@ -4,8 +4,8 @@ // Ensure that unused empty HashMap nodes are dropped from the output. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/codegen/use_checks_test.dart b/pkg/compiler/test/codegen/use_checks_test.dart index 817a37b1b81..6e2955ce2d5 100644 --- a/pkg/compiler/test/codegen/use_checks_test.dart +++ b/pkg/compiler/test/codegen/use_checks_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/codegen/use_strict_test.dart b/pkg/compiler/test/codegen/use_strict_test.dart index 0b816c3faa7..89e6d8d282e 100644 --- a/pkg/compiler/test/codegen/use_strict_test.dart +++ b/pkg/compiler/test/codegen/use_strict_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/codegen/value_range3_test.dart b/pkg/compiler/test/codegen/value_range3_test.dart index b81b2efbc60..bd6107a2937 100644 --- a/pkg/compiler/test/codegen/value_range3_test.dart +++ b/pkg/compiler/test/codegen/value_range3_test.dart @@ -4,7 +4,7 @@ // Test that global analysis in dart2js propagates positive integers. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/codegen/value_range_test.dart b/pkg/compiler/test/codegen/value_range_test.dart index d91ce71a82f..3935a995c28 100644 --- a/pkg/compiler/test/codegen/value_range_test.dart +++ b/pkg/compiler/test/codegen/value_range_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/codegen/variance_subtype_cast_test.dart b/pkg/compiler/test/codegen/variance_subtype_cast_test.dart index dddbafc199c..fcb3f1f25b3 100644 --- a/pkg/compiler/test/codegen/variance_subtype_cast_test.dart +++ b/pkg/compiler/test/codegen/variance_subtype_cast_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/compiler_helper.dart'; const String LEGACY_COV_CAST = r""" diff --git a/pkg/compiler/test/custom_split/custom_split_test.dart b/pkg/compiler/test/custom_split/custom_split_test.dart index fed669c8f80..28181640491 100644 --- a/pkg/compiler/test/custom_split/custom_split_test.dart +++ b/pkg/compiler/test/custom_split/custom_split_test.dart @@ -5,8 +5,8 @@ import 'dart:io' hide Link; import 'dart:isolate'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:kernel/ast.dart' as ir; diff --git a/pkg/compiler/test/deferred/closures_test.dart b/pkg/compiler/test/deferred/closures_test.dart index 0606b802bfb..a8f340b549f 100644 --- a/pkg/compiler/test/deferred/closures_test.dart +++ b/pkg/compiler/test/deferred/closures_test.dart @@ -4,8 +4,8 @@ // Ensures that closures are in the output unit of their enclosing element. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred/deferred_constant3_test.dart b/pkg/compiler/test/deferred/deferred_constant3_test.dart index 7dda9709071..e7767c2cdb7 100644 --- a/pkg/compiler/test/deferred/deferred_constant3_test.dart +++ b/pkg/compiler/test/deferred/deferred_constant3_test.dart @@ -5,7 +5,7 @@ // Test that the additional runtime type support is output to the right // Files when using deferred loading. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'constant_emission_test_helper.dart'; void main() { diff --git a/pkg/compiler/test/deferred/dont_inline_deferred_constants_test.dart b/pkg/compiler/test/deferred/dont_inline_deferred_constants_test.dart index 842b8b3b0c1..deb16f4eb35 100644 --- a/pkg/compiler/test/deferred/dont_inline_deferred_constants_test.dart +++ b/pkg/compiler/test/deferred/dont_inline_deferred_constants_test.dart @@ -5,7 +5,7 @@ // Test that the additional runtime type support is output to the right // Files when using deferred loading. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'constant_emission_test_helper.dart'; void main() { diff --git a/pkg/compiler/test/deferred/dont_inline_deferred_globals_test.dart b/pkg/compiler/test/deferred/dont_inline_deferred_globals_test.dart index 39487479cb0..14b5912d48b 100644 --- a/pkg/compiler/test/deferred/dont_inline_deferred_globals_test.dart +++ b/pkg/compiler/test/deferred/dont_inline_deferred_globals_test.dart @@ -5,7 +5,7 @@ // Test that the additional runtime type support is output to the right // Files when using deferred loading. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'constant_emission_test_helper.dart'; void main() { diff --git a/pkg/compiler/test/deferred/emit_type_checks_test.dart b/pkg/compiler/test/deferred/emit_type_checks_test.dart index be3a8058515..a3a60515d9c 100644 --- a/pkg/compiler/test/deferred/emit_type_checks_test.dart +++ b/pkg/compiler/test/deferred/emit_type_checks_test.dart @@ -5,10 +5,10 @@ // Test that the additional runtime type support is output to the right // Files when using deferred loading. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/js_model/js_strategy.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred/follow_constant_dependencies_test.dart b/pkg/compiler/test/deferred/follow_constant_dependencies_test.dart index aaaf0b55c6d..932fc26335f 100644 --- a/pkg/compiler/test/deferred/follow_constant_dependencies_test.dart +++ b/pkg/compiler/test/deferred/follow_constant_dependencies_test.dart @@ -4,10 +4,10 @@ // Test that constants depended on by other constants are correctly deferred. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/constants/values.dart'; import 'package:compiler/src/elements/types.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred/follow_implicit_super_regression_test.dart b/pkg/compiler/test/deferred/follow_implicit_super_regression_test.dart index 8ed8e834c3f..6a91f7db2ae 100644 --- a/pkg/compiler/test/deferred/follow_implicit_super_regression_test.dart +++ b/pkg/compiler/test/deferred/follow_implicit_super_regression_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart' as dart2js; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred/inline_restrictions_test.dart b/pkg/compiler/test/deferred/inline_restrictions_test.dart index b029abeada3..caa0e566fbe 100644 --- a/pkg/compiler/test/deferred/inline_restrictions_test.dart +++ b/pkg/compiler/test/deferred/inline_restrictions_test.dart @@ -5,9 +5,9 @@ // Test that we do not accidentally leak code from deferred libraries but do // allow inlining of empty functions and from main. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; import 'package:compiler/src/compiler.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred/load_graph_segmentation2_test.dart b/pkg/compiler/test/deferred/load_graph_segmentation2_test.dart index 78c0e744eef..ca7a21713a3 100644 --- a/pkg/compiler/test/deferred/load_graph_segmentation2_test.dart +++ b/pkg/compiler/test/deferred/load_graph_segmentation2_test.dart @@ -6,8 +6,8 @@ // to determine which elements can be deferred and which libraries // much be included in the initial download (loaded eagerly). -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred/load_graph_segmentation_test.dart b/pkg/compiler/test/deferred/load_graph_segmentation_test.dart index 7dc9d359eaf..854de35d35b 100644 --- a/pkg/compiler/test/deferred/load_graph_segmentation_test.dart +++ b/pkg/compiler/test/deferred/load_graph_segmentation_test.dart @@ -6,10 +6,10 @@ // to determine which elements can be deferred and which libraries // much be included in the initial download (loaded eagerly). -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/deferred_load/output_unit.dart' show OutputUnit; import 'package:compiler/src/js_emitter/startup_emitter/fragment_merger.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred/load_mapping_test.dart b/pkg/compiler/test/deferred/load_mapping_test.dart index 4916008333e..572d400ad7b 100644 --- a/pkg/compiler/test/deferred/load_mapping_test.dart +++ b/pkg/compiler/test/deferred/load_mapping_test.dart @@ -3,8 +3,8 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:convert'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred/not_in_main_test.dart b/pkg/compiler/test/deferred/not_in_main_test.dart index cb6770108db..a6174c776e8 100644 --- a/pkg/compiler/test/deferred/not_in_main_test.dart +++ b/pkg/compiler/test/deferred/not_in_main_test.dart @@ -6,8 +6,8 @@ // to determine which elements can be deferred and which libraries // much be included in the initial download (loaded eagerly). -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred/unneeded_part_js_test.dart b/pkg/compiler/test/deferred/unneeded_part_js_test.dart index e3edca569e7..7048dc724d6 100644 --- a/pkg/compiler/test/deferred/unneeded_part_js_test.dart +++ b/pkg/compiler/test/deferred/unneeded_part_js_test.dart @@ -4,7 +4,7 @@ // Test that no parts are emitted when deferred loading isn't used. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/deferred_loading/data/deferred_fail_and_retry/main.dart b/pkg/compiler/test/deferred_loading/data/deferred_fail_and_retry/main.dart index ef67689e5fb..65b3e091462 100644 --- a/pkg/compiler/test/deferred_loading/data/deferred_fail_and_retry/main.dart +++ b/pkg/compiler/test/deferred_loading/data/deferred_fail_and_retry/main.dart @@ -11,8 +11,8 @@ // Test that when a deferred import fails to load, it is possible to retry. import 'lib.dart' deferred as lib; +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import "dart:js" as js; /*member: main:member_unit=main{}*/ diff --git a/pkg/compiler/test/deferred_loading/data/static_separate/main.dart b/pkg/compiler/test/deferred_loading/data/static_separate/main.dart index 9d41e102832..da4b0c7295f 100644 --- a/pkg/compiler/test/deferred_loading/data/static_separate/main.dart +++ b/pkg/compiler/test/deferred_loading/data/static_separate/main.dart @@ -35,8 +35,8 @@ // Dart2js will put them in separate hunks. // Similarly for C2, ..., C5. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import 'lib1.dart' deferred as lib1; import 'lib2.dart' deferred as lib2; diff --git a/pkg/compiler/test/deferred_loading/deferred_load_id_map_helper.dart b/pkg/compiler/test/deferred_loading/deferred_load_id_map_helper.dart index 6d37a5dfdc8..2c580363bda 100644 --- a/pkg/compiler/test/deferred_loading/deferred_load_id_map_helper.dart +++ b/pkg/compiler/test/deferred_loading/deferred_load_id_map_helper.dart @@ -5,11 +5,11 @@ import 'dart:io' hide Link; import 'dart:typed_data'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/util/memory_compiler.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; const resultFilename = 'deferred.data'; diff --git a/pkg/compiler/test/deferred_loading/deferred_loading_test.dart b/pkg/compiler/test/deferred_loading/deferred_loading_test.dart index d2b9ba84418..6920271c24d 100644 --- a/pkg/compiler/test/deferred_loading/deferred_loading_test.dart +++ b/pkg/compiler/test/deferred_loading/deferred_loading_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io' hide Link; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../equivalence/id_equivalence_helper.dart'; import 'deferred_loading_test_helper.dart'; diff --git a/pkg/compiler/test/dump_info/dump_info_new_regression_test.dart b/pkg/compiler/test/dump_info/dump_info_new_regression_test.dart index e1ab714d724..e2ab3ec52fe 100644 --- a/pkg/compiler/test/dump_info/dump_info_new_regression_test.dart +++ b/pkg/compiler/test/dump_info/dump_info_new_regression_test.dart @@ -8,7 +8,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/dump_info.dart'; import 'package:compiler/src/elements/entities.dart'; diff --git a/pkg/compiler/test/dump_info/dump_info_new_test.dart b/pkg/compiler/test/dump_info/dump_info_new_test.dart index e491c447499..e3c50dad410 100644 --- a/pkg/compiler/test/dump_info/dump_info_new_test.dart +++ b/pkg/compiler/test/dump_info/dump_info_new_test.dart @@ -5,7 +5,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/dump_info.dart'; import 'package:compiler/src/elements/entities.dart'; diff --git a/pkg/compiler/test/dump_info/dump_info_test.dart b/pkg/compiler/test/dump_info/dump_info_test.dart index 262babe4458..f5aad5bdf21 100644 --- a/pkg/compiler/test/dump_info/dump_info_test.dart +++ b/pkg/compiler/test/dump_info/dump_info_test.dart @@ -5,7 +5,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/dump_info.dart'; import 'package:compiler/src/elements/entities.dart'; diff --git a/pkg/compiler/test/end_to_end/all_native_test.dart b/pkg/compiler/test/end_to_end/all_native_test.dart index 1ee89f1af1d..57650a2215f 100644 --- a/pkg/compiler/test/end_to_end/all_native_test.dart +++ b/pkg/compiler/test/end_to_end/all_native_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/end_to_end/command_line_test.dart b/pkg/compiler/test/end_to_end/command_line_test.dart index b9c2ddf5f9f..adcf288c44f 100644 --- a/pkg/compiler/test/end_to_end/command_line_test.dart +++ b/pkg/compiler/test/end_to_end/command_line_test.dart @@ -6,7 +6,7 @@ import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/compiler_api.dart' as api; diff --git a/pkg/compiler/test/end_to_end/dart2js_batch2_test.dart b/pkg/compiler/test/end_to_end/dart2js_batch2_test.dart index c1f061c6105..aefd8e781e8 100644 --- a/pkg/compiler/test/end_to_end/dart2js_batch2_test.dart +++ b/pkg/compiler/test/end_to_end/dart2js_batch2_test.dart @@ -7,7 +7,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:path/path.dart' as path; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; var tmpDir; diff --git a/pkg/compiler/test/end_to_end/dart2js_batch_test.dart b/pkg/compiler/test/end_to_end/dart2js_batch_test.dart index f2cce0f24ce..e64f8391412 100644 --- a/pkg/compiler/test/end_to_end/dart2js_batch_test.dart +++ b/pkg/compiler/test/end_to_end/dart2js_batch_test.dart @@ -7,7 +7,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:path/path.dart' as path; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'launch_helper.dart' show dart2JsCommand; diff --git a/pkg/compiler/test/end_to_end/dill_loader_test.dart b/pkg/compiler/test/end_to_end/dill_loader_test.dart index f85139d4d2f..3f88005f245 100644 --- a/pkg/compiler/test/end_to_end/dill_loader_test.dart +++ b/pkg/compiler/test/end_to_end/dill_loader_test.dart @@ -7,7 +7,7 @@ import 'dart:typed_data'; import 'package:compiler/src/elements/names.dart'; import 'package:compiler/src/util/memory_compiler.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/elements/entities.dart' show LibraryEntity, ClassEntity; diff --git a/pkg/compiler/test/end_to_end/dump_info2_test.dart b/pkg/compiler/test/end_to_end/dump_info2_test.dart index 116eac73fa7..9ac22e707cc 100644 --- a/pkg/compiler/test/end_to_end/dump_info2_test.dart +++ b/pkg/compiler/test/end_to_end/dump_info2_test.dart @@ -8,8 +8,8 @@ import 'package:compiler/compiler_api.dart' as api; import 'package:dart2js_info/info.dart'; import 'package:dart2js_info/json_info_codec.dart'; import 'package:dart2js_info/binary_serialization.dart' as binary; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/end_to_end/exit_code_test.dart b/pkg/compiler/test/end_to_end/exit_code_test.dart index 2f5b0268cb6..f0550863beb 100644 --- a/pkg/compiler/test/end_to_end/exit_code_test.dart +++ b/pkg/compiler/test/end_to_end/exit_code_test.dart @@ -6,8 +6,8 @@ import 'dart:async'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/io/source_information.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/compiler_api.dart' as api; diff --git a/pkg/compiler/test/end_to_end/modular_loader_test.dart b/pkg/compiler/test/end_to_end/modular_loader_test.dart index 8e73444a54d..8fe3445bd73 100644 --- a/pkg/compiler/test/end_to_end/modular_loader_test.dart +++ b/pkg/compiler/test/end_to_end/modular_loader_test.dart @@ -7,7 +7,7 @@ import 'dart:typed_data'; import 'package:compiler/src/elements/names.dart'; import 'package:compiler/src/util/memory_compiler.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/elements/entities.dart' show LibraryEntity, ClassEntity; diff --git a/pkg/compiler/test/end_to_end/no_platform_test.dart b/pkg/compiler/test/end_to_end/no_platform_test.dart index a4e7cb9e532..671636d55f2 100644 --- a/pkg/compiler/test/end_to_end/no_platform_test.dart +++ b/pkg/compiler/test/end_to_end/no_platform_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/kernel/dart2js_target.dart' show Dart2jsTarget; import 'package:kernel/ast.dart' as ir; diff --git a/pkg/compiler/test/end_to_end/output_type_test.dart b/pkg/compiler/test/end_to_end/output_type_test.dart index 7362d33a990..71791327b71 100644 --- a/pkg/compiler/test/end_to_end/output_type_test.dart +++ b/pkg/compiler/test/end_to_end/output_type_test.dart @@ -8,7 +8,6 @@ import 'dart:async'; import 'dart:io'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; import 'package:compiler/src/dart2js.dart'; import 'package:compiler/src/commandline_options.dart'; @@ -18,6 +17,7 @@ import 'package:compiler/src/source_file_provider.dart'; import 'package:front_end/src/api_unstable/dart2js.dart' as fe; import 'package:compiler/src/inferrer/debug.dart' show PRINT_GRAPH; import 'package:compiler/src/tracer.dart' show TRACE_FILTER_PATTERN_FOR_TEST; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/end_to_end/user_crash_test.dart b/pkg/compiler/test/end_to_end/user_crash_test.dart index 88580dfedef..7f58329f5a7 100644 --- a/pkg/compiler/test/end_to_end/user_crash_test.dart +++ b/pkg/compiler/test/end_to_end/user_crash_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:front_end/src/api_prototype/codes.dart' show templateCantReadFile, messageMissingMain; diff --git a/pkg/compiler/test/equivalence/id_testing_test.dart b/pkg/compiler/test/equivalence/id_testing_test.dart index fc07ca380f1..ec16781db00 100644 --- a/pkg/compiler/test/equivalence/id_testing_test.dart +++ b/pkg/compiler/test/equivalence/id_testing_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/diagnostics/diagnostic_listener.dart'; import 'package:compiler/src/elements/entities.dart'; diff --git a/pkg/compiler/test/field_analysis/jfield_analysis_test.dart b/pkg/compiler/test/field_analysis/jfield_analysis_test.dart index b182ec322d3..c2a98a1f61a 100644 --- a/pkg/compiler/test/field_analysis/jfield_analysis_test.dart +++ b/pkg/compiler/test/field_analysis/jfield_analysis_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/types.dart'; diff --git a/pkg/compiler/test/field_analysis/kfield_analysis_test.dart b/pkg/compiler/test/field_analysis/kfield_analysis_test.dart index ac8b3751885..c53d6140997 100644 --- a/pkg/compiler/test/field_analysis/kfield_analysis_test.dart +++ b/pkg/compiler/test/field_analysis/kfield_analysis_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/types.dart'; diff --git a/pkg/compiler/test/generic_methods/function_type_variable_test.dart b/pkg/compiler/test/generic_methods/function_type_variable_test.dart index 35486d877ad..95ce1cd0e60 100644 --- a/pkg/compiler/test/generic_methods/function_type_variable_test.dart +++ b/pkg/compiler/test/generic_methods/function_type_variable_test.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/types.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/type_test_helper.dart'; diff --git a/pkg/compiler/test/generic_methods/generic_method_test.dart b/pkg/compiler/test/generic_methods/generic_method_test.dart index 07e631d6a7a..4e64a3810e3 100644 --- a/pkg/compiler/test/generic_methods/generic_method_test.dart +++ b/pkg/compiler/test/generic_methods/generic_method_test.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; @@ -11,6 +10,7 @@ import 'package:compiler/src/elements/names.dart'; import 'package:compiler/src/js/js.dart' as js; import 'package:compiler/src/js_model/js_strategy.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/d8_helper.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/generic_methods/generic_method_type_test.dart b/pkg/compiler/test/generic_methods/generic_method_type_test.dart index 8a7be65701f..b50aac86506 100644 --- a/pkg/compiler/test/generic_methods/generic_method_type_test.dart +++ b/pkg/compiler/test/generic_methods/generic_method_type_test.dart @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/types.dart'; import 'package:compiler/src/universe/call_structure.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/type_test_helper.dart'; diff --git a/pkg/compiler/test/generic_methods/instantiation_stub_test.dart b/pkg/compiler/test/generic_methods/instantiation_stub_test.dart index d457db20b69..3b6e803f3f0 100644 --- a/pkg/compiler/test/generic_methods/instantiation_stub_test.dart +++ b/pkg/compiler/test/generic_methods/instantiation_stub_test.dart @@ -2,12 +2,12 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/js_emitter/model.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/program_lookup.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/generic_methods/world_test.dart b/pkg/compiler/test/generic_methods/world_test.dart index 7eb8097dca7..3167d140eef 100644 --- a/pkg/compiler/test/generic_methods/world_test.dart +++ b/pkg/compiler/test/generic_methods/world_test.dart @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/universe/call_structure.dart'; import 'package:compiler/src/universe/codegen_world_builder.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/impact/impact_test.dart b/pkg/compiler/test/impact/impact_test.dart index f7a8bc29b43..f1cd41a3609 100644 --- a/pkg/compiler/test/impact/impact_test.dart +++ b/pkg/compiler/test/impact/impact_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/kernel/element_map.dart'; diff --git a/pkg/compiler/test/inference/callers_test.dart b/pkg/compiler/test/inference/callers_test.dart index 32f3e001f25..c86d2a6ff3f 100644 --- a/pkg/compiler/test/inference/callers_test.dart +++ b/pkg/compiler/test/inference/callers_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/inference/inference_data_test.dart b/pkg/compiler/test/inference/inference_data_test.dart index d3925a8ef75..d1791ce85d2 100644 --- a/pkg/compiler/test/inference/inference_data_test.dart +++ b/pkg/compiler/test/inference/inference_data_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/inference/inference_test_helper.dart b/pkg/compiler/test/inference/inference_test_helper.dart index 36b379accb1..90cf19e909b 100644 --- a/pkg/compiler/test/inference/inference_test_helper.dart +++ b/pkg/compiler/test/inference/inference_test_helper.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/inference/list_tracer_test.dart b/pkg/compiler/test/inference/list_tracer_test.dart index 439a4bc42b2..9be9fe8b2f5 100644 --- a/pkg/compiler/test/inference/list_tracer_test.dart +++ b/pkg/compiler/test/inference/list_tracer_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/inferrer/typemasks/masks.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'type_mask_test_helper.dart'; diff --git a/pkg/compiler/test/inference/load_deferred_library_test.dart b/pkg/compiler/test/inference/load_deferred_library_test.dart index 7ac5f4c8d53..380314da8f6 100644 --- a/pkg/compiler/test/inference/load_deferred_library_test.dart +++ b/pkg/compiler/test/inference/load_deferred_library_test.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/common/names.dart'; @@ -12,6 +11,7 @@ import 'package:compiler/src/inferrer/abstract_value_domain.dart'; import 'package:compiler/src/inferrer/typemasks/masks.dart'; import 'package:compiler/src/js_model/element_map.dart'; import 'package:compiler/src/js_model/js_world.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:kernel/ast.dart' as ir; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/inference/map_tracer_test.dart b/pkg/compiler/test/inference/map_tracer_test.dart index 15f6d91c4a9..b9e3bb60f6e 100644 --- a/pkg/compiler/test/inference/map_tracer_test.dart +++ b/pkg/compiler/test/inference/map_tracer_test.dart @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/inferrer/typemasks/masks.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'type_mask_test_helper.dart'; diff --git a/pkg/compiler/test/inference/null_flat_type_mask_test.dart b/pkg/compiler/test/inference/null_flat_type_mask_test.dart index 0b46d41d765..119539aee33 100644 --- a/pkg/compiler/test/inference/null_flat_type_mask_test.dart +++ b/pkg/compiler/test/inference/null_flat_type_mask_test.dart @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/inferrer/typemasks/masks.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/type_test_helper.dart'; diff --git a/pkg/compiler/test/inference/powerset_bits2_test.dart b/pkg/compiler/test/inference/powerset_bits2_test.dart index bc16c0e6427..fe8ee343121 100644 --- a/pkg/compiler/test/inference/powerset_bits2_test.dart +++ b/pkg/compiler/test/inference/powerset_bits2_test.dart @@ -2,13 +2,13 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/inferrer/powersets/powersets.dart'; import 'package:compiler/src/inferrer/powersets/powerset_bits.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/inference/powerset_bits3_test.dart b/pkg/compiler/test/inference/powerset_bits3_test.dart index d427915e2e8..b21f3929790 100644 --- a/pkg/compiler/test/inference/powerset_bits3_test.dart +++ b/pkg/compiler/test/inference/powerset_bits3_test.dart @@ -2,12 +2,12 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/inferrer/abstract_value_domain.dart'; import 'package:compiler/src/inferrer/powersets/powersets.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/element_lookup.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/inference/powerset_bits_test.dart b/pkg/compiler/test/inference/powerset_bits_test.dart index a7c40495491..2fd95fea37a 100644 --- a/pkg/compiler/test/inference/powerset_bits_test.dart +++ b/pkg/compiler/test/inference/powerset_bits_test.dart @@ -2,12 +2,12 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/inferrer/powersets/powersets.dart'; import 'package:compiler/src/inferrer/powersets/powerset_bits.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/element_lookup.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/inference/record_type_test.dart b/pkg/compiler/test/inference/record_type_test.dart index 395e3d261dc..98ceb84fdf9 100644 --- a/pkg/compiler/test/inference/record_type_test.dart +++ b/pkg/compiler/test/inference/record_type_test.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/names.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/names.dart'; @@ -12,6 +11,7 @@ import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; import 'package:compiler/src/universe/call_structure.dart'; import 'package:compiler/src/universe/record_shape.dart'; import 'package:compiler/src/universe/selector.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/type_test_helper.dart'; diff --git a/pkg/compiler/test/inference/side_effects_test.dart b/pkg/compiler/test/inference/side_effects_test.dart index f0f0a599ac7..d6baff98e9f 100644 --- a/pkg/compiler/test/inference/side_effects_test.dart +++ b/pkg/compiler/test/inference/side_effects_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/inference/trivial_abstract_value_domain_test.dart b/pkg/compiler/test/inference/trivial_abstract_value_domain_test.dart index 8acf57d18c2..093c6eea66d 100644 --- a/pkg/compiler/test/inference/trivial_abstract_value_domain_test.dart +++ b/pkg/compiler/test/inference/trivial_abstract_value_domain_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:args/args.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import '../helpers/args_helper.dart'; diff --git a/pkg/compiler/test/inference/type_combination_test.dart b/pkg/compiler/test/inference/type_combination_test.dart index d5e43530752..3fedae1c842 100644 --- a/pkg/compiler/test/inference/type_combination_test.dart +++ b/pkg/compiler/test/inference/type_combination_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/inference/type_mask2_test.dart b/pkg/compiler/test/inference/type_mask2_test.dart index e01fdefdbc3..ba2f902f2cf 100644 --- a/pkg/compiler/test/inference/type_mask2_test.dart +++ b/pkg/compiler/test/inference/type_mask2_test.dart @@ -5,8 +5,8 @@ library type_mask2_test; import 'dart:async'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/inferrer/typemasks/masks.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; diff --git a/pkg/compiler/test/inference/type_mask_disjoint_test.dart b/pkg/compiler/test/inference/type_mask_disjoint_test.dart index cc583263cd6..975e589d367 100644 --- a/pkg/compiler/test/inference/type_mask_disjoint_test.dart +++ b/pkg/compiler/test/inference/type_mask_disjoint_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/inference/type_mask_test.dart b/pkg/compiler/test/inference/type_mask_test.dart index ffa19a6b8d7..16cf99dc475 100644 --- a/pkg/compiler/test/inference/type_mask_test.dart +++ b/pkg/compiler/test/inference/type_mask_test.dart @@ -2,12 +2,12 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/inferrer/typemasks/masks.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/inference/union_type_test.dart b/pkg/compiler/test/inference/union_type_test.dart index b2265dd56e9..2e12d0be208 100644 --- a/pkg/compiler/test/inference/union_type_test.dart +++ b/pkg/compiler/test/inference/union_type_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import "package:async_helper/async_helper.dart"; +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; import 'package:compiler/src/inferrer/typemasks/masks.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; diff --git a/pkg/compiler/test/inlining/inlining_test.dart b/pkg/compiler/test/inlining/inlining_test.dart index 798e15a26ac..b7beee838b8 100644 --- a/pkg/compiler/test/inlining/inlining_test.dart +++ b/pkg/compiler/test/inlining/inlining_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/inlining/meta_annotations2_test.dart b/pkg/compiler/test/inlining/meta_annotations2_test.dart index 37dc48be528..e0c7db76489 100644 --- a/pkg/compiler/test/inlining/meta_annotations2_test.dart +++ b/pkg/compiler/test/inlining/meta_annotations2_test.dart @@ -4,8 +4,8 @@ // Functional test of 'noInline' annotation from package:meta/dart2js.dart. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import 'package:compiler/compiler_api.dart' as api; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/inlining/meta_annotations3_test.dart b/pkg/compiler/test/inlining/meta_annotations3_test.dart index 09337bfd1cd..ea0523db13e 100644 --- a/pkg/compiler/test/inlining/meta_annotations3_test.dart +++ b/pkg/compiler/test/inlining/meta_annotations3_test.dart @@ -4,8 +4,8 @@ // Functional test of 'tryInline' annotation from package:meta/dart2js.dart. +import "package:expect/async_helper.dart"; import "package:expect/expect.dart"; -import "package:async_helper/async_helper.dart"; import 'package:compiler/compiler_api.dart' as api; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/inlining/meta_annotations_test.dart b/pkg/compiler/test/inlining/meta_annotations_test.dart index 42f3bfcccb2..cd567fef4f1 100644 --- a/pkg/compiler/test/inlining/meta_annotations_test.dart +++ b/pkg/compiler/test/inlining/meta_annotations_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; diff --git a/pkg/compiler/test/js/js_constant_test.dart b/pkg/compiler/test/js/js_constant_test.dart index 25822bb9cd4..d7cd1da9732 100644 --- a/pkg/compiler/test/js/js_constant_test.dart +++ b/pkg/compiler/test/js/js_constant_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/js/js_spec_optimization_test.dart b/pkg/compiler/test/js/js_spec_optimization_test.dart index 91a2f1eaa96..58db901aa0a 100644 --- a/pkg/compiler/test/js/js_spec_optimization_test.dart +++ b/pkg/compiler/test/js/js_spec_optimization_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/jsinterop/declaration_test.dart b/pkg/compiler/test/jsinterop/declaration_test.dart index 7d46acc011c..7c1428e17da 100644 --- a/pkg/compiler/test/jsinterop/declaration_test.dart +++ b/pkg/compiler/test/jsinterop/declaration_test.dart @@ -4,8 +4,8 @@ library jsinterop.abstract_test; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/jsinterop/internal_annotations_test.dart b/pkg/compiler/test/jsinterop/internal_annotations_test.dart index 8dd2e0dbf8d..1da464fdbcb 100644 --- a/pkg/compiler/test/jsinterop/internal_annotations_test.dart +++ b/pkg/compiler/test/jsinterop/internal_annotations_test.dart @@ -4,8 +4,8 @@ library jsinterop.internal_annotations_test; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart' show ClassEntity; diff --git a/pkg/compiler/test/jsinterop/interop_anonymous_unreachable_test.dart b/pkg/compiler/test/jsinterop/interop_anonymous_unreachable_test.dart index 3291e7ed923..7e317525e96 100644 --- a/pkg/compiler/test/jsinterop/interop_anonymous_unreachable_test.dart +++ b/pkg/compiler/test/jsinterop/interop_anonymous_unreachable_test.dart @@ -4,7 +4,7 @@ library tests.web.interop_anonymous_unreachable_test; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/compiler_helper.dart'; diff --git a/pkg/compiler/test/jsinterop/world_test.dart b/pkg/compiler/test/jsinterop/world_test.dart index 0ddf70515f4..be9a6218035 100644 --- a/pkg/compiler/test/jsinterop/world_test.dart +++ b/pkg/compiler/test/jsinterop/world_test.dart @@ -4,8 +4,8 @@ library jsinterop.world_test; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart' show ClassEntity; diff --git a/pkg/compiler/test/jumps/jump_test.dart b/pkg/compiler/test/jumps/jump_test.dart index 44adcc4332c..5420d1875b4 100644 --- a/pkg/compiler/test/jumps/jump_test.dart +++ b/pkg/compiler/test/jumps/jump_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; diff --git a/pkg/compiler/test/member_usage/member_usage_test.dart b/pkg/compiler/test/member_usage/member_usage_test.dart index 42fc8506224..d4427ae625a 100644 --- a/pkg/compiler/test/member_usage/member_usage_test.dart +++ b/pkg/compiler/test/member_usage/member_usage_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/enqueue.dart'; diff --git a/pkg/compiler/test/model/call_structure_namer_test.dart b/pkg/compiler/test/model/call_structure_namer_test.dart index a6195ba5955..587e47a6fa5 100644 --- a/pkg/compiler/test/model/call_structure_namer_test.dart +++ b/pkg/compiler/test/model/call_structure_namer_test.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/js_backend/namer.dart'; import 'package:compiler/src/universe/call_structure.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; main() { diff --git a/pkg/compiler/test/model/cfe_annotations_test.dart b/pkg/compiler/test/model/cfe_annotations_test.dart index b58aa394fc6..91400c7c823 100644 --- a/pkg/compiler/test/model/cfe_annotations_test.dart +++ b/pkg/compiler/test/model/cfe_annotations_test.dart @@ -3,13 +3,13 @@ // BSD-style license that can be found in the LICENSE file. import 'package:args/args.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/ir/annotations.dart'; import 'package:compiler/src/js_backend/native_data.dart'; import 'package:compiler/src/kernel/kernel_strategy.dart'; import 'package:compiler/src/kernel/element_map.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:front_end/src/api_prototype/lowering_predicates.dart'; import 'package:kernel/ast.dart' as ir; diff --git a/pkg/compiler/test/model/cfe_constant_evaluation_common.dart b/pkg/compiler/test/model/cfe_constant_evaluation_common.dart index 1e851755e60..781c5dde15f 100644 --- a/pkg/compiler/test/model/cfe_constant_evaluation_common.dart +++ b/pkg/compiler/test/model/cfe_constant_evaluation_common.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/common/elements.dart'; diff --git a/pkg/compiler/test/model/cfe_constant_swarm_test.dart b/pkg/compiler/test/model/cfe_constant_swarm_test.dart index fe681b85b22..3afa1cde908 100644 --- a/pkg/compiler/test/model/cfe_constant_swarm_test.dart +++ b/pkg/compiler/test/model/cfe_constant_swarm_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:args/args.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/args_helper.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/model/cfe_constant_test.dart b/pkg/compiler/test/model/cfe_constant_test.dart index c99d95ac209..4c58033778c 100644 --- a/pkg/compiler/test/model/cfe_constant_test.dart +++ b/pkg/compiler/test/model/cfe_constant_test.dart @@ -4,13 +4,13 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/id_testing.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/diagnostics/diagnostic_listener.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/kernel/element_map.dart'; import 'package:compiler/src/kernel/kernel_strategy.dart'; +import 'package:expect/async_helper.dart'; import 'package:kernel/ast.dart' as ir; import 'package:kernel/class_hierarchy.dart' as ir; import 'package:kernel/core_types.dart' as ir; diff --git a/pkg/compiler/test/model/class_set_test.dart b/pkg/compiler/test/model/class_set_test.dart index f10374ed6a2..991906dc703 100644 --- a/pkg/compiler/test/model/class_set_test.dart +++ b/pkg/compiler/test/model/class_set_test.dart @@ -6,8 +6,8 @@ library class_set_test; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart' show ClassEntity; import 'package:compiler/src/kernel/kernel_world.dart'; import 'package:compiler/src/universe/class_set.dart'; diff --git a/pkg/compiler/test/model/constant_value_test.dart b/pkg/compiler/test/model/constant_value_test.dart index 4275ca7ef4d..bdba61b1c2b 100644 --- a/pkg/compiler/test/model/constant_value_test.dart +++ b/pkg/compiler/test/model/constant_value_test.dart @@ -4,8 +4,8 @@ library dart2js.constants.values.test; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/names.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/types.dart'; diff --git a/pkg/compiler/test/model/enqueuer_test.dart b/pkg/compiler/test/model/enqueuer_test.dart index a7498a44b5f..5b364ff54c5 100644 --- a/pkg/compiler/test/model/enqueuer_test.dart +++ b/pkg/compiler/test/model/enqueuer_test.dart @@ -5,7 +5,6 @@ // Test that the enqueuers are not dependent upon in which order impacts are // applied. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/common/elements.dart'; @@ -20,6 +19,7 @@ import 'package:compiler/src/universe/world_builder.dart'; import 'package:compiler/src/universe/world_impact.dart'; import 'package:compiler/src/universe/use.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/model/forwarding_stub_test.dart b/pkg/compiler/test/model/forwarding_stub_test.dart index c99244d7207..946555373de 100644 --- a/pkg/compiler/test/model/forwarding_stub_test.dart +++ b/pkg/compiler/test/model/forwarding_stub_test.dart @@ -2,12 +2,12 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/names.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/model/future_or_test.dart b/pkg/compiler/test/model/future_or_test.dart index 0142ada2413..d59bde042a6 100644 --- a/pkg/compiler/test/model/future_or_test.dart +++ b/pkg/compiler/test/model/future_or_test.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/types.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/type_test_helper.dart'; diff --git a/pkg/compiler/test/model/instantiated_classes_test.dart b/pkg/compiler/test/model/instantiated_classes_test.dart index 364f4d4a4a7..5f8750f6994 100644 --- a/pkg/compiler/test/model/instantiated_classes_test.dart +++ b/pkg/compiler/test/model/instantiated_classes_test.dart @@ -5,8 +5,8 @@ library instantiated_classes_test; import 'dart:async'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart' show ClassEntity, LibraryEntity; import '../helpers/type_test_helper.dart'; diff --git a/pkg/compiler/test/model/mixin_typevariable_test.dart b/pkg/compiler/test/model/mixin_typevariable_test.dart index fb13c0c9593..cbca536d8df 100644 --- a/pkg/compiler/test/model/mixin_typevariable_test.dart +++ b/pkg/compiler/test/model/mixin_typevariable_test.dart @@ -4,9 +4,9 @@ library mixin_typevariable_test; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/types.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/type_test_helper.dart'; diff --git a/pkg/compiler/test/model/native_test.dart b/pkg/compiler/test/model/native_test.dart index 4a13fa16255..fd9984b7bf9 100644 --- a/pkg/compiler/test/model/native_test.dart +++ b/pkg/compiler/test/model/native_test.dart @@ -3,10 +3,10 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/model/needs_no_such_method_test.dart b/pkg/compiler/test/model/needs_no_such_method_test.dart index a57edc0c49f..7df0c147418 100644 --- a/pkg/compiler/test/model/needs_no_such_method_test.dart +++ b/pkg/compiler/test/model/needs_no_such_method_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:async'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/names.dart'; diff --git a/pkg/compiler/test/model/no_such_method_enabled_test.dart b/pkg/compiler/test/model/no_such_method_enabled_test.dart index aad72fc7c4b..921bfd44d2f 100644 --- a/pkg/compiler/test/model/no_such_method_enabled_test.dart +++ b/pkg/compiler/test/model/no_such_method_enabled_test.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/common/names.dart'; import 'package:compiler/src/compiler.dart'; @@ -10,6 +9,7 @@ import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/js_backend/no_such_method_registry.dart'; import 'package:compiler/src/js_model/elements.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/model/no_such_method_forwarders_test.dart b/pkg/compiler/test/model/no_such_method_forwarders_test.dart index e424fb353bb..17f809f1bb3 100644 --- a/pkg/compiler/test/model/no_such_method_forwarders_test.dart +++ b/pkg/compiler/test/model/no_such_method_forwarders_test.dart @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/types.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/element_lookup.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/model/strong_mode_closed_world_test.dart b/pkg/compiler/test/model/strong_mode_closed_world_test.dart index 1d1ffc89c05..bdb0e45876f 100644 --- a/pkg/compiler/test/model/strong_mode_closed_world_test.dart +++ b/pkg/compiler/test/model/strong_mode_closed_world_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/elements/entities.dart'; diff --git a/pkg/compiler/test/model/strong_mode_impact_test.dart b/pkg/compiler/test/model/strong_mode_impact_test.dart index fc3ba7415ff..cc83c9b2e65 100644 --- a/pkg/compiler/test/model/strong_mode_impact_test.dart +++ b/pkg/compiler/test/model/strong_mode_impact_test.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/common/elements.dart'; diff --git a/pkg/compiler/test/model/subtype_test.dart b/pkg/compiler/test/model/subtype_test.dart index 4252dd9232b..53732fd9c19 100644 --- a/pkg/compiler/test/model/subtype_test.dart +++ b/pkg/compiler/test/model/subtype_test.dart @@ -5,9 +5,9 @@ library subtype_test; import 'dart:async'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart' show ClassEntity; import 'package:compiler/src/elements/types.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/type_test_helper.dart'; diff --git a/pkg/compiler/test/model/subtypeset_test.dart b/pkg/compiler/test/model/subtypeset_test.dart index edac524da8c..59f00c9d465 100644 --- a/pkg/compiler/test/model/subtypeset_test.dart +++ b/pkg/compiler/test/model/subtypeset_test.dart @@ -6,8 +6,8 @@ library subtypeset_test; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/kernel/kernel_world.dart'; import 'package:compiler/src/universe/class_set.dart'; diff --git a/pkg/compiler/test/model/supermixin_test.dart b/pkg/compiler/test/model/supermixin_test.dart index 9319ee062c0..b775819d280 100644 --- a/pkg/compiler/test/model/supermixin_test.dart +++ b/pkg/compiler/test/model/supermixin_test.dart @@ -2,10 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/elements/entities.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/program_lookup.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/model/type_substitution_test.dart b/pkg/compiler/test/model/type_substitution_test.dart index 731fc32748d..092f90b4675 100644 --- a/pkg/compiler/test/model/type_substitution_test.dart +++ b/pkg/compiler/test/model/type_substitution_test.dart @@ -5,8 +5,8 @@ library type_substitution_test; import 'package:compiler/src/elements/names.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/elements/types.dart'; diff --git a/pkg/compiler/test/model/world_test.dart b/pkg/compiler/test/model/world_test.dart index ab80820d0e5..fc5354e8654 100644 --- a/pkg/compiler/test/model/world_test.dart +++ b/pkg/compiler/test/model/world_test.dart @@ -5,8 +5,8 @@ library world_test; import 'package:compiler/src/elements/names.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/common/names.dart'; import 'package:compiler/src/elements/entities.dart'; diff --git a/pkg/compiler/test/optimization/optimization_test.dart b/pkg/compiler/test/optimization/optimization_test.dart index 60b08c21895..44eea05bb4d 100644 --- a/pkg/compiler/test/optimization/optimization_test.dart +++ b/pkg/compiler/test/optimization/optimization_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/rti/backend_type_helper_test.dart b/pkg/compiler/test/rti/backend_type_helper_test.dart index 5149cee7609..adff4dc3db6 100644 --- a/pkg/compiler/test/rti/backend_type_helper_test.dart +++ b/pkg/compiler/test/rti/backend_type_helper_test.dart @@ -4,11 +4,11 @@ import 'dart:io'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/js_emitter/program_builder/program_builder.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/program_lookup.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/rti/bound_check_test.dart b/pkg/compiler/test/rti/bound_check_test.dart index 0d0e2fa0010..07d9cb5eb73 100644 --- a/pkg/compiler/test/rti/bound_check_test.dart +++ b/pkg/compiler/test/rti/bound_check_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import '../helpers/d8_helper.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/rti/disable_rti_test.dart b/pkg/compiler/test/rti/disable_rti_test.dart index 73ace510a67..4b246d607c0 100644 --- a/pkg/compiler/test/rti/disable_rti_test.dart +++ b/pkg/compiler/test/rti/disable_rti_test.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; @@ -10,6 +9,7 @@ import 'package:compiler/src/elements/entities.dart'; import 'package:compiler/src/js_backend/runtime_types_resolution.dart'; import 'package:compiler/src/js_emitter/model.dart'; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/program_lookup.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/rti/factory_call_test.dart b/pkg/compiler/test/rti/factory_call_test.dart index fa01a1c6283..6685808f7b5 100644 --- a/pkg/compiler/test/rti/factory_call_test.dart +++ b/pkg/compiler/test/rti/factory_call_test.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; import 'package:compiler/src/elements/entities.dart'; @@ -11,6 +10,7 @@ import 'package:compiler/src/js_emitter/model.dart'; import 'package:compiler/src/js_model/js_strategy.dart'; import 'package:compiler/src/js/js.dart' as js; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/program_lookup.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/rti/instance_call_test.dart b/pkg/compiler/test/rti/instance_call_test.dart index dfaae8a99bb..9c5a5774e10 100644 --- a/pkg/compiler/test/rti/instance_call_test.dart +++ b/pkg/compiler/test/rti/instance_call_test.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/common/elements.dart'; import 'package:compiler/src/compiler.dart'; @@ -15,6 +14,7 @@ import 'package:compiler/src/js/js.dart' as js; import 'package:compiler/src/js_model/js_world.dart' show JClosedWorld; import 'package:compiler/src/universe/call_structure.dart'; import 'package:compiler/src/universe/selector.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import '../helpers/program_lookup.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/rti/rti_emission_test_helper.dart b/pkg/compiler/test/rti/rti_emission_test_helper.dart index 54a1fedf004..8877e012acf 100644 --- a/pkg/compiler/test/rti/rti_emission_test_helper.dart +++ b/pkg/compiler/test/rti/rti_emission_test_helper.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/compiler.dart'; diff --git a/pkg/compiler/test/rti/rti_need_test_helper.dart b/pkg/compiler/test/rti/rti_need_test_helper.dart index 22b19c90f8d..4cc436ecc44 100644 --- a/pkg/compiler/test/rti/rti_need_test_helper.dart +++ b/pkg/compiler/test/rti/rti_need_test_helper.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/features.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/closure.dart'; import 'package:compiler/src/common.dart'; import 'package:compiler/src/common/elements.dart'; diff --git a/pkg/compiler/test/rti/runtime_type_hint_test.dart b/pkg/compiler/test/rti/runtime_type_hint_test.dart index 15e31d1e566..1f04e549c5a 100644 --- a/pkg/compiler/test/rti/runtime_type_hint_test.dart +++ b/pkg/compiler/test/rti/runtime_type_hint_test.dart @@ -2,9 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/diagnostics/messages.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/serialization/in_memory_split_test.dart b/pkg/compiler/test/serialization/in_memory_split_test.dart index 40a6209edaa..01c5f49edd9 100644 --- a/pkg/compiler/test/serialization/in_memory_split_test.dart +++ b/pkg/compiler/test/serialization/in_memory_split_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:args/args.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/serialization/strategies.dart'; import 'serialization_test_helper.dart'; import '../helpers/args_helper.dart'; diff --git a/pkg/compiler/test/serialization/on_disk_split_test.dart b/pkg/compiler/test/serialization/on_disk_split_test.dart index b6fa2168f49..342e322b778 100644 --- a/pkg/compiler/test/serialization/on_disk_split_test.dart +++ b/pkg/compiler/test/serialization/on_disk_split_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/dart2js.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/serialization/serialization_diff0_test.dart b/pkg/compiler/test/serialization/serialization_diff0_test.dart index cdc1a790f5f..208f6d39d84 100644 --- a/pkg/compiler/test/serialization/serialization_diff0_test.dart +++ b/pkg/compiler/test/serialization/serialization_diff0_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'serialization_diff_helper.dart'; diff --git a/pkg/compiler/test/serialization/serialization_diff1_test.dart b/pkg/compiler/test/serialization/serialization_diff1_test.dart index 4d01d616c0d..7286e355a73 100644 --- a/pkg/compiler/test/serialization/serialization_diff1_test.dart +++ b/pkg/compiler/test/serialization/serialization_diff1_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'serialization_diff_helper.dart'; diff --git a/pkg/compiler/test/serialization/serialization_diff2_test.dart b/pkg/compiler/test/serialization/serialization_diff2_test.dart index 4f3a7ad6619..f6ed971986a 100644 --- a/pkg/compiler/test/serialization/serialization_diff2_test.dart +++ b/pkg/compiler/test/serialization/serialization_diff2_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'serialization_diff_helper.dart'; diff --git a/pkg/compiler/test/serialization/serialization_diff3_test.dart b/pkg/compiler/test/serialization/serialization_diff3_test.dart index 9a5b583ac66..d180921a634 100644 --- a/pkg/compiler/test/serialization/serialization_diff3_test.dart +++ b/pkg/compiler/test/serialization/serialization_diff3_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'serialization_diff_helper.dart'; diff --git a/pkg/compiler/test/serialization/serialization_test.dart b/pkg/compiler/test/serialization/serialization_test.dart index 15976398cd8..cbca94ce06d 100644 --- a/pkg/compiler/test/serialization/serialization_test.dart +++ b/pkg/compiler/test/serialization/serialization_test.dart @@ -3,9 +3,9 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/serialization/strategies.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'serialization_test_helper.dart'; diff --git a/pkg/compiler/test/sourcemaps/mapping_test.dart b/pkg/compiler/test/sourcemaps/mapping_test.dart index 434a3886ae3..1b340e5c33e 100644 --- a/pkg/compiler/test/sourcemaps/mapping_test.dart +++ b/pkg/compiler/test/sourcemaps/mapping_test.dart @@ -6,8 +6,8 @@ import 'dart:async'; import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/annotated_code_helper.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:source_maps/source_maps.dart'; diff --git a/pkg/compiler/test/sourcemaps/minified_names_test.dart b/pkg/compiler/test/sourcemaps/minified_names_test.dart index 313610eef56..255ebd2d11d 100644 --- a/pkg/compiler/test/sourcemaps/minified_names_test.dart +++ b/pkg/compiler/test/sourcemaps/minified_names_test.dart @@ -7,7 +7,7 @@ import 'dart:io'; import 'dart:convert'; import 'package:args/args.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:dart2js_tools/src/dart2js_mapping.dart'; diff --git a/pkg/compiler/test/sourcemaps/name_test.dart b/pkg/compiler/test/sourcemaps/name_test.dart index 95e401163a5..c843139422c 100644 --- a/pkg/compiler/test/sourcemaps/name_test.dart +++ b/pkg/compiler/test/sourcemaps/name_test.dart @@ -4,8 +4,8 @@ library source_map_name_test; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/elements/names.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/common/elements.dart' show JElementEnvironment; diff --git a/pkg/compiler/test/sourcemaps/nomapping_test.dart b/pkg/compiler/test/sourcemaps/nomapping_test.dart index a777fa60dcb..11373f55f8f 100644 --- a/pkg/compiler/test/sourcemaps/nomapping_test.dart +++ b/pkg/compiler/test/sourcemaps/nomapping_test.dart @@ -5,9 +5,9 @@ import 'dart:async'; import 'dart:io'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; import 'package:compiler/src/commandline_options.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:source_maps/source_maps.dart'; diff --git a/pkg/compiler/test/sourcemaps/source_map_test.dart b/pkg/compiler/test/sourcemaps/source_map_test.dart index b4f98ddbb98..0385d345007 100644 --- a/pkg/compiler/test/sourcemaps/source_map_test.dart +++ b/pkg/compiler/test/sourcemaps/source_map_test.dart @@ -7,8 +7,8 @@ library test.source_map; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/compiler_api.dart' as api; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/util/memory_compiler.dart'; diff --git a/pkg/compiler/test/sourcemaps/stacktrace_test.dart b/pkg/compiler/test/sourcemaps/stacktrace_test.dart index 1dfe60fef23..dafa5d84a19 100644 --- a/pkg/compiler/test/sourcemaps/stacktrace_test.dart +++ b/pkg/compiler/test/sourcemaps/stacktrace_test.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:io'; import 'package:args/args.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/dart2js.dart' as entry; diff --git a/pkg/compiler/test/sourcemaps/stepping_test.dart b/pkg/compiler/test/sourcemaps/stepping_test.dart index ebddb1dd39b..1545944d16c 100644 --- a/pkg/compiler/test/sourcemaps/stepping_test.dart +++ b/pkg/compiler/test/sourcemaps/stepping_test.dart @@ -7,9 +7,9 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/annotated_code_helper.dart'; import 'package:args/args.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/dart2js.dart' as entry; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:sourcemap_testing/src/stepping_helper.dart'; diff --git a/pkg/compiler/test/sourcemaps/tools/source_mapping_tester.dart b/pkg/compiler/test/sourcemaps/tools/source_mapping_tester.dart index 38d43689dd1..5282abcc968 100644 --- a/pkg/compiler/test/sourcemaps/tools/source_mapping_tester.dart +++ b/pkg/compiler/test/sourcemaps/tools/source_mapping_tester.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'dart:io'; import 'package:_fe_analyzer_shared/src/util/filenames.dart'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:compiler/src/commandline_options.dart'; import 'package:compiler/src/io/source_information.dart'; diff --git a/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart b/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart index 3b5ee3f8ffe..22d61bd8d99 100644 --- a/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart +++ b/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart @@ -5,7 +5,7 @@ import "dart:io"; import "package:expect/expect.dart"; -import "package:expect/minitest.dart"; // ignore: deprecated_member_use +import "package:expect/legacy/minitest.dart"; // ignore: deprecated_member_use import 'package:front_end/src/api_unstable/dart2js.dart'; import "package:kernel/kernel.dart"; import "package:path/path.dart" as path; diff --git a/pkg/dev_compiler/test/string_to_uri_test.dart b/pkg/dev_compiler/test/string_to_uri_test.dart index 8213e42425d..396abb5bf35 100755 --- a/pkg/dev_compiler/test/string_to_uri_test.dart +++ b/pkg/dev_compiler/test/string_to_uri_test.dart @@ -17,8 +17,8 @@ void main(List args) { group('sourcePathToUri', () { test('various URL schemes', () { expect(sourcePathToUri('dart:io').toString(), 'dart:io'); - expect(sourcePathToUri('package:expect/minitest.dart').toString(), - 'package:expect/minitest.dart'); + expect(sourcePathToUri('package:expect/expect.dart').toString(), + 'package:expect/expect.dart'); expect(sourcePathToUri('foobar:whatnot').toString(), 'foobar:whatnot'); }); @@ -55,8 +55,8 @@ void main(List args) { group('sourcePathToRelativeUri', () { test('various URL schemes', () { expect(sourcePathToRelativeUri('dart:io').toString(), 'dart:io'); - expect(sourcePathToRelativeUri('package:expect/minitest.dart').toString(), - 'package:expect/minitest.dart'); + expect(sourcePathToRelativeUri('package:expect/expect.dart').toString(), + 'package:expect/expect.dart'); expect(sourcePathToRelativeUri('foobar:whatnot').toString(), 'foobar:whatnot'); }); diff --git a/pkg/dynamic_modules/pubspec.yaml b/pkg/dynamic_modules/pubspec.yaml index 4283e13b24e..da3f449be08 100644 --- a/pkg/dynamic_modules/pubspec.yaml +++ b/pkg/dynamic_modules/pubspec.yaml @@ -8,6 +8,5 @@ environment: # Use 'any' constraints here; we get our versions from the DEPS file. dev_dependencies: args: any - async_helper: any expect: any lints: any diff --git a/pkg/dynamic_modules/test/data/duplicate_library/main.dart b/pkg/dynamic_modules/test/data/duplicate_library/main.dart index c5fd91a8e93..179a1fac643 100644 --- a/pkg/dynamic_modules/test/data/duplicate_library/main.dart +++ b/pkg/dynamic_modules/test/data/duplicate_library/main.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import '../../common/testing.dart' as helper; -import 'package:async_helper/async_helper.dart' show asyncExpectThrows; +import 'package:expect/async_helper.dart' show asyncExpectThrows; // It is an error to load a module that provides a second definition for // a library that already exists in the application. diff --git a/pkg/dynamic_modules/test/data/load_twice/main.dart b/pkg/dynamic_modules/test/data/load_twice/main.dart index 562f807701f..61cdcaa57e6 100644 --- a/pkg/dynamic_modules/test/data/load_twice/main.dart +++ b/pkg/dynamic_modules/test/data/load_twice/main.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import '../../common/testing.dart' as helper; -import 'package:async_helper/async_helper.dart' show asyncExpectThrows; +import 'package:expect/async_helper.dart' show asyncExpectThrows; /// For the same reasons as the `duplicate_library` test, it is an error to load /// the same module twice. diff --git a/pkg/expect/lib/async_helper.dart b/pkg/expect/lib/async_helper.dart new file mode 100644 index 00000000000..9f92ee555db --- /dev/null +++ b/pkg/expect/lib/async_helper.dart @@ -0,0 +1,169 @@ +// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +/// This library is used for testing asynchronous tests. +/// If a test is asynchronous, it needs to notify the testing driver +/// about this (otherwise tests may get reported as passing after main() +/// finished even if the asynchronous operations fail). +/// +/// This library provides the following methods +/// - `asyncStart()`: Needs to be called before an asynchronous operation is +/// scheduled. +/// - `asyncEnd()`: Needs to be called as soon as the asynchronous operation +/// ended. +/// - `asyncSuccess(_)`: Variant of asyncEnd useful together with Future.then. +/// - `asyncTest(f)`: Helper method that wraps a computation that returns a +/// `Future` with matching calls to `asyncStart()` and +/// `asyncSuccess(_)`. +/// - `asyncExpectThrows(f)`: Checks that the `Future` `f` completes +/// with an error of type `E`. Calls `asyncStart()` +/// first and `asyncEnd()` when the future completes with +/// the expected error. +/// - `asyncExpectThrowsWhen(condition, f)`: +/// Checks that the `Future` `f` completes with an error of +/// type `E` if `condition` is true, and does not fail +/// if `condition` is false. Calls `asyncStart()` +/// first and `asyncEnd()` when the future completes with +/// the expected error, or with no error if the condition +/// is false. +/// +/// After every `asyncStart()` called is matched with a corresponding +/// `asyncEnd()` or `asyncSuccess(_)` call, the testing driver will be notified +/// that the tests is done. +library async_helper; + +import 'dart:async'; + +import 'package:expect/expect.dart'; + +bool _initialized = false; +int _asyncLevel = 0; + +Exception _buildException(String msg) { + return Exception('Fatal: $msg. This is most likely a bug in your test.'); +} + +/// Call this method before an asynchronous test is created. +/// +/// If [count] is provided, expect [count] [asyncEnd] calls instead of just one. +void asyncStart([int count = 1]) { + if (count <= 0) return; + if (_initialized && _asyncLevel == 0) { + throw _buildException('asyncStart() was called even though we are done ' + 'with testing.'); + } + if (!_initialized) { + print('unittest-suite-wait-for-done'); + _initialized = true; + } + _asyncLevel += count; +} + +/// Call this after an asynchronous test has ended successfully. +void asyncEnd() { + if (_asyncLevel <= 0) { + if (!_initialized) { + throw _buildException('asyncEnd() was called before asyncStart().'); + } else { + throw _buildException('asyncEnd() was called more often than ' + 'asyncStart().'); + } + } + _asyncLevel--; + if (_asyncLevel == 0) { + print('unittest-suite-success'); + } +} + +/// Call this after an asynchronous test has ended successfully. +/// +/// This is a helper for calling [asyncEnd] as a callback. +/// This method intentionally has a signature that matches `Future.then` as a +/// convenience for calling [asyncEnd] when a `Future` completes without error, +/// like this: +/// ```dart +/// asyncStart(); +/// Future result = test(); +/// result.then(asyncSuccess); +/// ``` +void asyncSuccess(void _) { + asyncEnd(); +} + +/// Helper method for performing asynchronous tests involving `Future`. +/// +/// The function [test] must return a `Future` which completes without error +/// when the test is successful. +Future asyncTest(Future Function() test) { + asyncStart(); + return test().then(asyncSuccess); +} + +/// Verifies that the asynchronous [result] throws a [T]. +/// +/// Fails if [result] completes with a value, or it completes with +/// an error which is not a [T]. +/// +/// Returns the accepted thrown object. +/// For example, to check the content of the thrown object, +/// you could write this: +/// ``` +/// var e = await asyncExpectThrows(asyncExpression) +/// Expect.isTrue(e.myMessage.contains("WARNING")); +/// ``` +/// If `result` completes with an [ExpectException] error from another +/// failed test expectation, that error cannot be caught and accepted. +Future asyncExpectThrows(Future result, + [String reason = ""]) { + // Delay computing the header text until the test has failed. + // The header computation uses complicated language features, + // and language tests should avoid doing complicated things + // until after the actual test has had a chance to succeed. + String header() { + // Handle null being passed in from legacy code + // while also avoiding producing an unnecessary null check warning here. + if ((reason as dynamic) == null) reason = ""; + // Only include the type in the message if it's not `Object` or a top type. + var type = Object() is! T ? "<$T>" : ""; + return "asyncExpectThrows$type($reason):"; + } + + // Unsound null-safety check. + if ((result as dynamic) == null) { + Expect.testError("${header()} result Future must not be null."); + } + + // TODO(rnystrom): It might useful to validate that T is not bound to + // ExpectException since that won't work. + + asyncStart(); + return result.then((_) { + throw ExpectException("${header()} Did not throw."); + }, onError: (error, stack) { + // A test failure doesn't count as throwing. Rethrow it. + if (error is ExpectException) throw error; + + if (error is! T) { + // Throws something unexpected. + throw ExpectException( + "${header()} Unexpected '${Error.safeToString(error)}'\n$stack"); + } + + asyncEnd(); + return error; + }); +} + +/// Checks that the asynchronous [result] throws a [T] if and only if +/// [condition] is `true`. +/// +/// When [condition] is `false`, [result] is expected to complete without +/// errors. +Future asyncExpectThrowsWhen( + bool condition, Future result, + [String reason = ""]) { + return condition + ? asyncExpectThrows(result, reason) + : result.then((_) => null); +} diff --git a/pkg/expect/lib/expect.dart b/pkg/expect/lib/expect.dart index e9da6cb4409..522ae045622 100644 --- a/pkg/expect/lib/expect.dart +++ b/pkg/expect/lib/expect.dart @@ -13,17 +13,16 @@ /// Error reporting as allowed to use more features, under the assumption /// that it will either work as desired, or break in some other way. /// As long as the *success path* is simple, a successful test can be trusted. -/// -/// NOTICE: This library is written to be usable by pre-2.12 language versions, -/// so it can be used to test non-sound-nullsafety implementations. library expect; /// Whether the program is running without sound null safety. // TODO(54798): migrate uses to directly import variations.dart +@Deprecated('Use unsoundNullSafety from variations.dart instead') bool get hasUnsoundNullSafety => const [] is List; /// Whether the program is running with sound null safety. // TODO(54798): migrate uses to directly import variations.dart +@Deprecated('Use !unsoundNullSafety from variations.dart instead') bool get hasSoundNullSafety => !hasUnsoundNullSafety; /// Expect is used for tests that do not want to make use of the @@ -849,8 +848,8 @@ class Expect { /// This is more of an assertion than a test. // TODO(lrn): Remove this method, or make it only do runtime checks. // It doesn't fit the `Expect` class. - // Make `static_type_helper.dart` or a `Chk` class a member of the `expect` - // package for use in checking *static* type properties. + // Use `static_type_helper.dart` or make a `Chk` class a member of the + // `expect` package for use in checking *static* type properties. static void subtype() { if (([] as dynamic) is List) return; _fail("Expect.subtype<$Sub, $Super>: $Sub is not a subtype of $Super"); @@ -892,7 +891,7 @@ class ExpectException { /// Call this to provide a function that associates a test name with this /// failure. /// - /// Used by async_helper/async_minitest.dart to inject logic to bind the + /// Used by legacy/async_minitest.dart to inject logic to bind the /// `group()` and `test()` name strings to a test failure. static void setTestNameCallback(String Function() getName) { _getTestName = getName; @@ -914,12 +913,3 @@ class ExpectException { /// Initial value for _getTestName. static String _kEmptyString() => ""; } - -/// Is true iff `assert` statements are enabled. -// Deprecated. Use variations.dart#asserts instead. -// Will be removed when Flutter engine has been migrated. -final bool assertStatementsEnabled = (() { - bool result = false; - assert(result = true); - return result; -})(); diff --git a/pkg/expect/lib/legacy/async_minitest.dart b/pkg/expect/lib/legacy/async_minitest.dart new file mode 100644 index 00000000000..c6b962db62f --- /dev/null +++ b/pkg/expect/lib/legacy/async_minitest.dart @@ -0,0 +1,341 @@ +// Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +/// A minimal, dependency-free emulation layer for a subset of the +/// unittest/test API used by the language and core library. +/// +/// NOT INTENDED FOR NEW TESTS. +/// +/// Compared with `minitest.dart`, this library supports and expects +/// asynchronous tests. It uses a `Zone` per test to associate a test name with +/// the failure. +/// +/// It does not support `setUp` or `tearDown` methods, +/// and matchers are severely restricted. +/// +/// A number of our language and core library tests were written against the +/// unittest package, which is now deprecated in favor of the new test package. +/// The latter is much better feature-wise, but is also quite complex and has +/// many dependencies. For low-level language and core library tests, we don't +/// want to have to pull in a large number of dependencies and be able to run +/// them correctly in order to run a test, so we want to test them against +/// something simpler. +/// +/// When possible, we just use the tiny expect library. But to avoid rewriting +/// all of the existing tests that use unittest, they can instead use this, +/// which shims the unittest API with as little code as possible and calls into +/// expect. +/// +/// Eventually, it would be good to refactor those tests to use the expect +/// package directly and remove this. +@Deprecated('Use expect.dart and async_helper.dart directly') +library; + +import 'dart:async'; + +import '../async_helper.dart'; +import '../expect.dart'; + +void group(String name, Function() body) { + var oldName = _pushName(name); + try { + body(); + } finally { + _popName(oldName); + } +} + +void test(String name, Function() body) { + var oldName = _pushName(name); + + asyncStart(); + var result = runZoned(body, zoneValues: {_testToken: _currentName}); + if (result is Future) { + result.then((_) { + asyncEnd(); + }); + } else { + // Ensure all tests get to be set up first. + scheduleMicrotask(asyncEnd); + } + + _popName(oldName); +} + +void expect(dynamic value, dynamic matcher, {String reason = ""}) { + Matcher m; + if (matcher is _Matcher) { + m = matcher.call; + } else if (matcher is! Matcher) { + m = equals(matcher); + } else { + m = matcher; + } + m(value); +} + +R Function() expectAsync0(R Function() f, {int count = 1}) { + asyncStart(count); + return () { + var result = f(); + asyncEnd(); + return result; + }; +} + +R Function(A) expectAsync1(R Function(A) f, {int count = 1}) { + asyncStart(count); + return (A a) { + var result = f(a); + asyncEnd(); + return result; + }; +} + +R Function(A, B) expectAsync2(R Function(A, B) f, {int count = 1}) { + asyncStart(count); + return (A a, B b) { + var result = f(a, b); + asyncEnd(); + return result; + }; +} + +dynamic expectAsync(Function f, {int count = 1}) { + var f2 = f; // Avoid type-promoting f, we want dynamic invocations. + if (f2 is Function(Never, Never, Never, Never, Never)) { + asyncStart(count); + return ([a, b, c, d, e]) { + var result = f(a, b, c, d, e); + asyncEnd(); + return result; + }; + } + if (f2 is Function(Never, Never, Never, Never)) { + asyncStart(count); + return ([a, b, c, d]) { + var result = f(a, b, c, d); + asyncEnd(); + return result; + }; + } + if (f2 is Function(Never, Never, Never)) { + asyncStart(count); + return ([a, b, c]) { + var result = f(a, b, c); + asyncEnd(); + return result; + }; + } + if (f2 is Function(Never, Never)) { + asyncStart(count); + return ([a, b]) { + var result = f(a, b); + asyncEnd(); + return result; + }; + } + if (f2 is Function(Never)) { + asyncStart(count); + return ([a]) { + var result = f(a); + asyncEnd(); + return result; + }; + } + if (f2 is Function()) { + asyncStart(count); + return () { + var result = f(); + asyncEnd(); + return result; + }; + } + throw UnsupportedError( + "expectAsync only accepts up to five argument functions"); +} + +// Matchers +typedef Matcher = void Function(dynamic); + +Matcher same(dynamic o) => (v) { + Expect.identical(o, v); + }; + +Matcher equals(dynamic o) => (v) { + Expect.deepEquals(o, v); + }; + +Matcher greaterThan(num n) => (dynamic v) { + Expect.type(v); + num value = v; + if (value > n) return; + Expect.fail("$v is not greater than $n"); + }; + +Matcher greaterThanOrEqualTo(num n) => (dynamic v) { + Expect.type(v); + num value = v; + if (value >= n) return; + Expect.fail("$v is not greater than $n"); + }; + +Matcher lessThan(num n) => (dynamic v) { + Expect.type(v); + num value = v; + if (value < n) return; + Expect.fail("$v is not less than $n"); + }; + +Matcher lessThanOrEqualTo(num n) => (dynamic v) { + Expect.type(v); + num value = v; + if (value <= n) return; + Expect.fail("$v is not less than $n"); + }; + +Matcher predicate(bool Function(dynamic value) fn, [String description = ""]) => + (dynamic v) { + Expect.isTrue(fn(v), description); + }; + +Matcher anyOf(List expected) => (dynamic actual) { + for (var string in expected) { + if (actual == string) return; + } + + Expect.fail("Expected $actual to be one of $expected."); + }; + +void isTrue(dynamic v) { + Expect.isTrue(v); +} + +void isFalse(dynamic v) { + Expect.isFalse(v); +} + +void isNull(dynamic o) { + Expect.isNull(o); +} + +void _checkThrow( + dynamic v, void Function(dynamic error) onError) { + if (v is Future) { + asyncStart(); + v.then((_) { + Expect.fail("Did not throw"); + }, onError: (e, s) { + if (e is! T) throw e; + onError(e); + asyncEnd(); + }); + return; + } + Expect.throws(v, (e) { + onError(e); + return true; + }); +} + +void returnsNormally(dynamic o) { + try { + Expect.type(o); + o(); + } catch (error, trace) { + Expect.fail( + "Expected function to return normally, but threw:\n$error\n\n$trace"); + } +} + +void throws(dynamic v) { + _checkThrow(v, (_) {}); +} + +Matcher throwsA(matcher) => (dynamic o) { + _checkThrow(o, (error) { + expect(error, matcher); + }); + }; + +Matcher completion(matcher) => (dynamic o) { + Expect.type(o); + Future future = o; + asyncStart(); + future.then((value) { + expect(value, matcher); + asyncEnd(); + }); + }; + +void completes(dynamic o) { + Expect.type(o); + Future future = o; + asyncStart(); + future.then(asyncSuccess); +} + +void isMap(dynamic o) { + Expect.type(o); +} + +void isList(dynamic o) { + Expect.type(o); +} + +void isNotNull(dynamic o) { + Expect.isNotNull(o); +} + +abstract class _Matcher { + void call(dynamic o); +} + +// ignore: camel_case_types +class isInstanceOf implements _Matcher { + @override + void call(dynamic o) { + Expect.type(o); + } +} + +void throwsArgumentError(dynamic v) { + _checkThrow(v, (_) {}); +} + +void throwsStateError(dynamic v) { + _checkThrow(v, (_) {}); +} + +void fail(String message) { + Expect.fail(message); +} + +/// Key for zone value holding current test name. +final _testToken = Object(); + +bool _initializedTestNameCallback = false; + +/// The current combined name of the nesting [group] or [test]. +String _currentName = ""; + +String _pushName(String newName) { + // Look up the current test name from the zone created for the test. + if (!_initializedTestNameCallback) { + ExpectException.setTestNameCallback(() => Zone.current[_testToken]); + _initializedTestNameCallback = true; + } + + var oldName = _currentName; + if (oldName == "") { + _currentName = newName; + } else { + _currentName = "$oldName $newName"; + } + return oldName; +} + +void _popName(String oldName) { + _currentName = oldName; +} diff --git a/pkg/expect/lib/legacy/minitest.dart b/pkg/expect/lib/legacy/minitest.dart new file mode 100644 index 00000000000..63d4b2f3f3f --- /dev/null +++ b/pkg/expect/lib/legacy/minitest.dart @@ -0,0 +1,212 @@ +// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +/// A minimal, dependency-free emulation layer for a subset of the +/// unittest/test API used by the language and core library (especially HTML) +/// tests. +/// +/// A number of our language and core library tests were written against the +/// unittest package, which is now deprecated in favor of the new test package. +/// The latter is much better feature-wise, but is also quite complex and has +/// many dependencies. For low-level language and core library tests, we don't +/// want to have to pull in a large number of dependencies and be able to run +/// them correctly in order to run a test, so we want to test them against +/// something simpler. +/// +/// When possible, we just use the tiny expect library. But to avoid rewriting +/// all of the existing tests that use unittest, they can instead use this, +/// which shims the unittest API with as little code as possible and calls into +/// expect. +/// +/// Eventually, it would be good to refactor those tests to use the expect +/// package directly and remove this. +@Deprecated("Use the 'Expect' class directly") +library expect.minitest; + +import 'dart:async'; + +import '../expect.dart'; + +typedef _ExpectationFunction = void Function(dynamic actual); + +final List<_Group> _groups = [_Group()]; + +final Object isFalse = _Expectation(Expect.isFalse); +final Object isNotNull = _Expectation(Expect.isNotNull); +final Object isNull = _Expectation(Expect.isNull); +final Object isTrue = _Expectation(Expect.isTrue); + +final Object returnsNormally = _Expectation((actual) { + try { + (actual as dynamic Function())(); + } catch (error) { + Expect.fail("Expected function to return normally, but threw:\n$error"); + } +}); + +final Object throws = _Expectation((actual) { + Expect.throws(actual as dynamic Function()); +}); + +final Object throwsArgumentError = _Expectation((actual) { + Expect.throws(actual as dynamic Function()); +}); + +final Object throwsNoSuchMethodError = _Expectation((actual) { + Expect.throws(actual as dynamic Function()); +}); + +final Object throwsRangeError = _Expectation((actual) { + Expect.throws(actual as dynamic Function()); +}); + +final Object throwsStateError = _Expectation((actual) { + Expect.throws(actual as dynamic Function()); +}); + +final Object throwsUnsupportedError = _Expectation((actual) { + Expect.throws(actual as dynamic Function()); +}); + +/// The test runner should call this once after running a test file. +void finishTests() { + _groups.clear(); + _groups.add(_Group()); +} + +void group(String description, Function() body) { + // TODO(rnystrom): Do something useful with the description. + _groups.add(_Group()); + + try { + var result = body(); + if (result is Future) { + Expect.testError("group() does not support asynchronous functions."); + } + } finally { + _groups.removeLast(); + } +} + +void test(String description, Function() body) { + // TODO(rnystrom): Do something useful with the description. + for (var group in _groups) { + var result = group.setUpFunction(); + if (result is Future) { + Expect.testError("setUp() does not support asynchronous functions."); + } + } + + try { + var result = body(); + if (result is Future) { + Expect.testError("test() does not support asynchronous functions."); + } + } finally { + for (var i = _groups.length - 1; i >= 0; i--) { + var group = _groups[i]; + var result = group.tearDownFunction(); + if (result is Future) { + Expect.testError("tearDown() does not support asynchronous functions."); + } + } + } +} + +void setUp(Function() body) { + // Can't define multiple setUps at the same level. + assert(_groups.last.setUpFunction == _defaultAction); + _groups.last.setUpFunction = body; +} + +void tearDown(Function() body) { + // Can't define multiple tearDowns at the same level. + assert(_groups.last.tearDownFunction == _defaultAction); + _groups.last.tearDownFunction = body; +} + +void expect(dynamic actual, dynamic expected, {String reason = ""}) { + // TODO(rnystrom): Do something useful with reason. + if (expected is! _Expectation) { + expected = equals(expected); + } + + var expectation = expected as _Expectation; + expectation.function(actual); +} + +void fail(String message) { + Expect.fail(message); +} + +Object equals(dynamic value) => _Expectation((actual) { + Expect.deepEquals(value, actual); + }); + +Object notEquals(dynamic value) => _Expectation((actual) { + Expect.notEquals(value, actual); + }); + +Object unorderedEquals(dynamic value) => _Expectation((actual) { + Expect.setEquals( + (value as Iterable).toSet(), (actual as Iterable).toSet()); + }); + +Object predicate(bool Function(dynamic value) fn, [String description = ""]) => + _Expectation((actual) { + Expect.isTrue(fn(actual), description); + }); + +Object inInclusiveRange(num min, num max) => _Expectation((actual) { + var actualNum = actual as num; + if (actualNum < min || actualNum > max) { + fail("Expected $actualNum to be in the inclusive range [$min, $max]."); + } + }); + +Object greaterThan(num value) => _Expectation((actual) { + var actualNum = actual as num; + if (actualNum <= value) { + fail("Expected $actualNum to be greater than $value."); + } + }); + +Object same(dynamic value) => _Expectation((actual) { + Expect.identical(value, actual); + }); + +Object closeTo(num value, num tolerance) => _Expectation((actual) { + Expect.approxEquals(value, actual as num, tolerance); + }); + +/// Succeeds if the actual value is any of the given strings. Unlike matcher's +/// [anyOf], this only works with strings and requires an explicit list. +Object anyOf(List expected) => _Expectation((actual) { + for (var string in expected) { + if (actual == string) return; + } + + fail("Expected $actual to be one of $expected."); + }); + +_defaultAction() {} + +/// One level of group() nesting to track an optional [setUp()] and [tearDown()] +/// function for the group. +/// +/// There is also an implicit top level group. +class _Group { + dynamic Function() setUpFunction = _defaultAction; + dynamic Function() tearDownFunction = _defaultAction; +} + +/// A wrapper around an expectation function. +/// +/// This function is passed the actual value and should throw an +/// [ExpectException] if the value doesn't match the expectation. +class _Expectation { + final _ExpectationFunction function; + + _Expectation(this.function); +} diff --git a/pkg/expect/lib/minitest.dart b/pkg/expect/lib/minitest.dart index c759877eb36..cda4212fbfe 100644 --- a/pkg/expect/lib/minitest.dart +++ b/pkg/expect/lib/minitest.dart @@ -1,212 +1,10 @@ -// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -/// A minimal, dependency-free emulation layer for a subset of the -/// unittest/test API used by the language and core library (especially HTML) -/// tests. -/// -/// A number of our language and core library tests were written against the -/// unittest package, which is now deprecated in favor of the new test package. -/// The latter is much better feature-wise, but is also quite complex and has -/// many dependencies. For low-level language and core library tests, we don't -/// want to have to pull in a large number of dependencies and be able to run -/// them correctly in order to run a test, so we want to test them against -/// something simpler. -/// -/// When possible, we just use the tiny expect library. But to avoid rewriting -/// all of the existing tests that use unittest, they can instead use this, -/// which shims the unittest API with as little code as possible and calls into -/// expect. -/// -/// Eventually, it would be good to refactor those tests to use the expect -/// package directly and remove this. -@Deprecated("Use the 'Expect' class directly") -library expect.minitest; +/// Legacy minitest.dart is now in `legacy/minitest.dart`. +/// This file will be removed when all direct references have been removed, +/// including from Flutter, if any. +library; -import 'dart:async'; - -import 'package:expect/expect.dart'; - -typedef _ExpectationFunction = void Function(dynamic actual); - -final List<_Group> _groups = [_Group()]; - -final Object isFalse = _Expectation(Expect.isFalse); -final Object isNotNull = _Expectation(Expect.isNotNull); -final Object isNull = _Expectation(Expect.isNull); -final Object isTrue = _Expectation(Expect.isTrue); - -final Object returnsNormally = _Expectation((actual) { - try { - (actual as dynamic Function())(); - } catch (error) { - Expect.fail("Expected function to return normally, but threw:\n$error"); - } -}); - -final Object throws = _Expectation((actual) { - Expect.throws(actual as dynamic Function()); -}); - -final Object throwsArgumentError = _Expectation((actual) { - Expect.throws(actual as dynamic Function()); -}); - -final Object throwsNoSuchMethodError = _Expectation((actual) { - Expect.throws(actual as dynamic Function()); -}); - -final Object throwsRangeError = _Expectation((actual) { - Expect.throws(actual as dynamic Function()); -}); - -final Object throwsStateError = _Expectation((actual) { - Expect.throws(actual as dynamic Function()); -}); - -final Object throwsUnsupportedError = _Expectation((actual) { - Expect.throws(actual as dynamic Function()); -}); - -/// The test runner should call this once after running a test file. -void finishTests() { - _groups.clear(); - _groups.add(_Group()); -} - -void group(String description, Function() body) { - // TODO(rnystrom): Do something useful with the description. - _groups.add(_Group()); - - try { - var result = body(); - if (result is Future) { - Expect.testError("group() does not support asynchronous functions."); - } - } finally { - _groups.removeLast(); - } -} - -void test(String description, Function() body) { - // TODO(rnystrom): Do something useful with the description. - for (var group in _groups) { - var result = group.setUpFunction(); - if (result is Future) { - Expect.testError("setUp() does not support asynchronous functions."); - } - } - - try { - var result = body(); - if (result is Future) { - Expect.testError("test() does not support asynchronous functions."); - } - } finally { - for (var i = _groups.length - 1; i >= 0; i--) { - var group = _groups[i]; - var result = group.tearDownFunction(); - if (result is Future) { - Expect.testError("tearDown() does not support asynchronous functions."); - } - } - } -} - -void setUp(Function() body) { - // Can't define multiple setUps at the same level. - assert(_groups.last.setUpFunction == _defaultAction); - _groups.last.setUpFunction = body; -} - -void tearDown(Function() body) { - // Can't define multiple tearDowns at the same level. - assert(_groups.last.tearDownFunction == _defaultAction); - _groups.last.tearDownFunction = body; -} - -void expect(dynamic actual, dynamic expected, {String reason = ""}) { - // TODO(rnystrom): Do something useful with reason. - if (expected is! _Expectation) { - expected = equals(expected); - } - - var expectation = expected as _Expectation; - expectation.function(actual); -} - -void fail(String message) { - Expect.fail(message); -} - -Object equals(dynamic value) => _Expectation((actual) { - Expect.deepEquals(value, actual); - }); - -Object notEquals(dynamic value) => _Expectation((actual) { - Expect.notEquals(value, actual); - }); - -Object unorderedEquals(dynamic value) => _Expectation((actual) { - Expect.setEquals( - (value as Iterable).toSet(), (actual as Iterable).toSet()); - }); - -Object predicate(bool Function(dynamic value) fn, [String description = ""]) => - _Expectation((actual) { - Expect.isTrue(fn(actual), description); - }); - -Object inInclusiveRange(num min, num max) => _Expectation((actual) { - var actualNum = actual as num; - if (actualNum < min || actualNum > max) { - fail("Expected $actualNum to be in the inclusive range [$min, $max]."); - } - }); - -Object greaterThan(num value) => _Expectation((actual) { - var actualNum = actual as num; - if (actualNum <= value) { - fail("Expected $actualNum to be greater than $value."); - } - }); - -Object same(dynamic value) => _Expectation((actual) { - Expect.identical(value, actual); - }); - -Object closeTo(num value, num tolerance) => _Expectation((actual) { - Expect.approxEquals(value, actual as num, tolerance); - }); - -/// Succeeds if the actual value is any of the given strings. Unlike matcher's -/// [anyOf], this only works with strings and requires an explicit list. -Object anyOf(List expected) => _Expectation((actual) { - for (var string in expected) { - if (actual == string) return; - } - - fail("Expected $actual to be one of $expected."); - }); - -_defaultAction() {} - -/// One level of group() nesting to track an optional [setUp()] and [tearDown()] -/// function for the group. -/// -/// There is also an implicit top level group. -class _Group { - dynamic Function() setUpFunction = _defaultAction; - dynamic Function() tearDownFunction = _defaultAction; -} - -/// A wrapper around an expectation function. -/// -/// This function is passed the actual value and should throw an -/// [ExpectException] if the value doesn't match the expectation. -class _Expectation { - final _ExpectationFunction function; - - _Expectation(this.function); -} +export 'legacy/minitest.dart'; // ignore: deprecated_member_use_from_same_package diff --git a/pkg/expect/lib/static_type_helper.dart b/pkg/expect/lib/static_type_helper.dart new file mode 100644 index 00000000000..cb81a52c563 --- /dev/null +++ b/pkg/expect/lib/static_type_helper.dart @@ -0,0 +1,90 @@ +// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +/// Helper to create [Type] values. +Type typeOf() => T; + +/// Ensures a context type of [T] for the operand. +Object? context(T x) => x; + +/// Captures the context type of the call and returns the same type. +/// +/// Can be used to check the context type as: +/// ```dart +/// int x = contextType(1 /* valid value */)..expectStaticType>; +/// ``` +T contextType(Object? result) => result as T; + +extension StaticType on T { + /// Check the static type. + /// + /// Use as follows (assuming `e` has static type `num`): + /// ```dart + /// e.expectStaticType>() // No context type. + /// e.expectStaticType>() // No context type. + /// e.expectStaticType>() // No context type. + /// ``` + /// or + /// ```dart + /// e..expectStaticType>() // Preserve context type. + /// e..expectStaticType>() // Preserve context type. + /// e..expectStaticType>() // Preserve context type. + /// ``` + /// This will be a *compile-time error* if the static type is not + /// as required by the constraints type (the one passed to [Exactly], + /// [SubtypeOf] or [SupertypeOf].) + T expectStaticType>() { + return this; + } + + /// Invokes [callback] with the static type of `this`. + /// + /// Allows any operation on the type. + T captureStaticType(void Function() callback) { + callback(); + return this; + } +} + +/// Invokes [callback] with the static type of [value]. +/// +/// Similar to [StaticType.captureStaticType], but works +/// for types like `void` and `dynamic` which do not allow +/// extension methods. +void captureStaticType(T value, void Function(X value) callback) { + callback(value); +} + +/// Use with [StaticType.expectStaticType] to expect precisely the type [T]. +/// +/// Example use: +/// ```dart +/// "abc".expectStaticType>(); +/// ``` +typedef Exactly = T Function(T); + +/// Use with [StaticType.expectStaticType] to expect a subtype of [T]. +/// +/// Example use: +/// ```dart +/// num x = 1; +/// x.expectStaticType>(); +/// ``` +typedef SubtypeOf = Never Function(T); + +/// Use with [StaticType.expectStaticType] to expect a supertype of [T]. +/// +/// Example use: +/// ```dart +/// num x = 1; +/// x.expectStaticType>(); +/// ``` +typedef SupertypeOf = T Function(Object?); + +/// Checks that an expression is assignable to [T1], [T2] and [Object]. +/// +/// This ensures that the static type of the expression is either dynamic, +/// Never, or a type assignable to both [T1] and [T2], and if those are +/// unrelated, it must be an intersection type. +void checkIntersectionType(T1 v1, T2 v2, Object v3) {} diff --git a/pkg/expect/test/nnbd_mode_test.dart b/pkg/expect/test/nnbd_mode_test.dart index 1bacdec2cc4..1d7b08eff01 100644 --- a/pkg/expect/test/nnbd_mode_test.dart +++ b/pkg/expect/test/nnbd_mode_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import "package:expect/expect.dart"; +import "package:expect/variations.dart" as variation; final bool strong = () { try { @@ -14,6 +15,5 @@ final bool strong = () { }(); void main() { - Expect.equals(strong, hasSoundNullSafety); - Expect.equals(!strong, hasUnsoundNullSafety); + Expect.equals(!strong, variation.unsoundNullSafety); } diff --git a/pkg/front_end/pubspec.yaml b/pkg/front_end/pubspec.yaml index 4c99c34b7ce..9c08e0d3e90 100644 --- a/pkg/front_end/pubspec.yaml +++ b/pkg/front_end/pubspec.yaml @@ -20,7 +20,6 @@ dependencies: dev_dependencies: analyzer: any args: any - async_helper: any build_integration: any compiler: any dart_style: any @@ -41,8 +40,6 @@ dependency_overrides: path: ../_fe_analyzer_shared _js_interop_checks: path: ../_js_interop_checks - async_helper: - path: ../async_helper build_integration: path: ../build_integration compiler: diff --git a/pkg/front_end/test/desugar_test.dart b/pkg/front_end/test/desugar_test.dart index a872f26aecf..00a7d3ff6f7 100644 --- a/pkg/front_end/test/desugar_test.dart +++ b/pkg/front_end/test/desugar_test.dart @@ -12,7 +12,7 @@ import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; import 'package:front_end/src/compute_platform_binaries_location.dart'; import 'package:front_end/src/kernel/utils.dart' show serializeComponent; diff --git a/pkg/front_end/test/expression_compilation_tools_test.dart b/pkg/front_end/test/expression_compilation_tools_test.dart index 315a911b9a1..ce363f04703 100644 --- a/pkg/front_end/test/expression_compilation_tools_test.dart +++ b/pkg/front_end/test/expression_compilation_tools_test.dart @@ -2,7 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:expect/minitest.dart'; // ignore: deprecated_member_use +import 'package:expect/legacy/minitest.dart'; // ignore: deprecated_member_use + import 'package:front_end/src/api_prototype/expression_compilation_tools.dart'; void main() { diff --git a/pkg/front_end/test/fasta/ambiguous_export_test.dart b/pkg/front_end/test/fasta/ambiguous_export_test.dart index d2f1e85d479..8bb2806420f 100644 --- a/pkg/front_end/test/fasta/ambiguous_export_test.dart +++ b/pkg/front_end/test/fasta/ambiguous_export_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart' show asyncTest; +import 'package:expect/async_helper.dart' show asyncTest; import 'package:expect/expect.dart' show Expect; import 'package:front_end/src/base/compiler_context.dart' show CompilerContext; import 'package:front_end/src/builder/declaration_builders.dart'; diff --git a/pkg/front_end/test/fasta/assert_locations_test.dart b/pkg/front_end/test/fasta/assert_locations_test.dart index f7dc5d222ce..d5100e753b9 100644 --- a/pkg/front_end/test/fasta/assert_locations_test.dart +++ b/pkg/front_end/test/fasta/assert_locations_test.dart @@ -4,7 +4,7 @@ library fasta.test.assert_locations_test; -import 'package:async_helper/async_helper.dart' show asyncTest; +import 'package:expect/async_helper.dart' show asyncTest; import 'package:expect/expect.dart' show Expect; import "package:front_end/src/api_prototype/compiler_options.dart" show CompilerOptions, DiagnosticMessage; diff --git a/pkg/front_end/test/fasta/bootstrap_test.dart b/pkg/front_end/test/fasta/bootstrap_test.dart index 893d1d81311..e236d7927aa 100644 --- a/pkg/front_end/test/fasta/bootstrap_test.dart +++ b/pkg/front_end/test/fasta/bootstrap_test.dart @@ -4,7 +4,7 @@ import 'dart:io' show Directory, File, Platform; -import 'package:async_helper/async_helper.dart' show asyncEnd, asyncStart; +import 'package:expect/async_helper.dart' show asyncEnd, asyncStart; import 'package:front_end/src/base/command_line_options.dart'; import 'package:kernel/ast.dart' show Component; import 'package:kernel/binary/ast_from_binary.dart' show BinaryBuilder; diff --git a/pkg/front_end/test/fasta/incremental_hello_test.dart b/pkg/front_end/test/fasta/incremental_hello_test.dart index b94a47ef3e4..5a357249221 100644 --- a/pkg/front_end/test/fasta/incremental_hello_test.dart +++ b/pkg/front_end/test/fasta/incremental_hello_test.dart @@ -4,7 +4,7 @@ library fasta.test.incremental_dynamic_test; -import 'package:async_helper/async_helper.dart' show asyncTest; +import 'package:expect/async_helper.dart' show asyncTest; import 'package:expect/expect.dart' show Expect; import "package:front_end/src/api_prototype/compiler_options.dart" show CompilerOptions, DiagnosticMessage; diff --git a/pkg/front_end/test/fasta/object_supertype_test.dart b/pkg/front_end/test/fasta/object_supertype_test.dart index 1f6ccd82c0b..881ba199c25 100644 --- a/pkg/front_end/test/fasta/object_supertype_test.dart +++ b/pkg/front_end/test/fasta/object_supertype_test.dart @@ -6,7 +6,7 @@ import "dart:convert" show json; import "package:_fe_analyzer_shared/src/messages/diagnostic_message.dart" show DiagnosticMessage, getMessageCodeObject; -import "package:async_helper/async_helper.dart" show asyncTest; +import "package:expect/async_helper.dart" show asyncTest; import "package:expect/expect.dart" show Expect; import "package:front_end/src/api_prototype/compiler_options.dart" show CompilerOptions; diff --git a/pkg/front_end/test/fasta/reexport_test.dart b/pkg/front_end/test/fasta/reexport_test.dart index 59c9b196a7b..4694bfb5739 100644 --- a/pkg/front_end/test/fasta/reexport_test.dart +++ b/pkg/front_end/test/fasta/reexport_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import "package:async_helper/async_helper.dart" show asyncTest; +import "package:expect/async_helper.dart" show asyncTest; import "package:front_end/src/api_prototype/front_end.dart" show CompilerOptions; import "package:front_end/src/testing/compiler_common.dart" show compileUnit; diff --git a/pkg/front_end/test/fasta/super_mixins_test.dart b/pkg/front_end/test/fasta/super_mixins_test.dart index 8ac6365efb5..b88a9ca9e4e 100644 --- a/pkg/front_end/test/fasta/super_mixins_test.dart +++ b/pkg/front_end/test/fasta/super_mixins_test.dart @@ -11,7 +11,7 @@ import "package:_fe_analyzer_shared/src/messages/diagnostic_message.dart" getMessageCodeObject, getMessageArguments; import 'package:_fe_analyzer_shared/src/messages/severity.dart' show Severity; -import 'package:async_helper/async_helper.dart' show asyncTest; +import 'package:expect/async_helper.dart' show asyncTest; import 'package:expect/expect.dart' show Expect; import "package:front_end/src/api_prototype/compiler_options.dart" show CompilerOptions; diff --git a/pkg/front_end/test/fasta/types/dill_hierarchy_test.dart b/pkg/front_end/test/fasta/types/dill_hierarchy_test.dart index 687ec3333c1..8d213a6f99c 100644 --- a/pkg/front_end/test/fasta/types/dill_hierarchy_test.dart +++ b/pkg/front_end/test/fasta/types/dill_hierarchy_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import "package:async_helper/async_helper.dart" show asyncTest; +import "package:expect/async_helper.dart" show asyncTest; import "package:expect/expect.dart" show Expect; import "package:front_end/src/api_prototype/compiler_options.dart" show CompilerOptions; diff --git a/pkg/front_end/test/fasta/types/fasta_types_test.dart b/pkg/front_end/test/fasta/types/fasta_types_test.dart index ff11ac00490..b0ae9dbd6e2 100644 --- a/pkg/front_end/test/fasta/types/fasta_types_test.dart +++ b/pkg/front_end/test/fasta/types/fasta_types_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import "package:async_helper/async_helper.dart" show asyncTest; +import "package:expect/async_helper.dart" show asyncTest; import "package:front_end/src/api_prototype/compiler_options.dart" show CompilerOptions; import "package:front_end/src/base/compiler_context.dart" show CompilerContext; diff --git a/pkg/front_end/test/fasta/types/legacy_upper_bound_helper.dart b/pkg/front_end/test/fasta/types/legacy_upper_bound_helper.dart index 51326352044..bf724c18b69 100644 --- a/pkg/front_end/test/fasta/types/legacy_upper_bound_helper.dart +++ b/pkg/front_end/test/fasta/types/legacy_upper_bound_helper.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import "package:async_helper/async_helper.dart" show asyncTest; +import "package:expect/async_helper.dart" show asyncTest; import "package:expect/expect.dart" show Expect; import "package:kernel/ast.dart"; import 'package:kernel/testing/type_parser_environment.dart' as parser; diff --git a/pkg/front_end/test/hot_reload_e2e_test.dart b/pkg/front_end/test/hot_reload_e2e_test.dart index ddf0367d2e3..f9d61d190a2 100644 --- a/pkg/front_end/test/hot_reload_e2e_test.dart +++ b/pkg/front_end/test/hot_reload_e2e_test.dart @@ -11,7 +11,7 @@ import 'dart:async' show Completer; import 'dart:convert' show LineSplitter, utf8; import 'dart:io' show Directory, File, Platform, Process; -import 'package:async_helper/async_helper.dart' show asyncTest; +import 'package:expect/async_helper.dart' show asyncTest; import 'package:expect/expect.dart' show Expect; import 'package:front_end/src/api_prototype/compiler_options.dart' show CompilerOptions; diff --git a/pkg/front_end/test/issue_34856_test.dart b/pkg/front_end/test/issue_34856_test.dart index 9070a74e6e0..f9e94f755e5 100644 --- a/pkg/front_end/test/issue_34856_test.dart +++ b/pkg/front_end/test/issue_34856_test.dart @@ -4,7 +4,7 @@ import 'dart:io' show File; -import 'package:async_helper/async_helper.dart' show asyncTest; +import 'package:expect/async_helper.dart' show asyncTest; import 'package:front_end/src/api_prototype/compiler_options.dart' show CompilerOptions; import 'package:front_end/src/api_prototype/kernel_generator.dart' diff --git a/pkg/front_end/test/mixin_export_test.dart b/pkg/front_end/test/mixin_export_test.dart index 89e4fcfc292..d9de003a699 100644 --- a/pkg/front_end/test/mixin_export_test.dart +++ b/pkg/front_end/test/mixin_export_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:async_helper/async_helper.dart' show asyncTest; +import 'package:expect/async_helper.dart' show asyncTest; import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/testing/compiler_common.dart'; diff --git a/pkg/front_end/test/packages_format_error_test.dart b/pkg/front_end/test/packages_format_error_test.dart index d7c5a946f08..a3005edebc6 100644 --- a/pkg/front_end/test/packages_format_error_test.dart +++ b/pkg/front_end/test/packages_format_error_test.dart @@ -4,7 +4,7 @@ import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart' show DiagnosticMessage, getMessageCodeObject; -import 'package:async_helper/async_helper.dart' show asyncTest; +import 'package:expect/async_helper.dart' show asyncTest; import 'package:expect/expect.dart' show Expect; import 'package:front_end/src/api_prototype/compiler_options.dart' show CompilerOptions; diff --git a/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart b/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart index 5f19df95c2b..433176eaf10 100644 --- a/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart +++ b/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart @@ -6,7 +6,7 @@ library fasta.test.compile_platform_test; import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; void main(List arguments) { diff --git a/pkg/front_end/tool/_fasta/compile_platform_test.dart b/pkg/front_end/tool/_fasta/compile_platform_test.dart index 5f19df95c2b..433176eaf10 100644 --- a/pkg/front_end/tool/_fasta/compile_platform_test.dart +++ b/pkg/front_end/tool/_fasta/compile_platform_test.dart @@ -6,7 +6,7 @@ library fasta.test.compile_platform_test; import 'dart:io'; -import 'package:async_helper/async_helper.dart'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; void main(List arguments) { diff --git a/pkg/js_ast/test/string_escape_test.dart b/pkg/js_ast/test/string_escape_test.dart index d061c5fcafc..45ff5bfae45 100644 --- a/pkg/js_ast/test/string_escape_test.dart +++ b/pkg/js_ast/test/string_escape_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:expect/minitest.dart'; // ignore: deprecated_member_use +import 'package:expect/legacy/minitest.dart'; // ignore: deprecated_member_use import 'package:js_ast/js_ast.dart'; import 'package:js_ast/src/characters.dart'; diff --git a/pkg/kernel/test/class_hierarchy_test.dart b/pkg/kernel/test/class_hierarchy_test.dart index 75de13e0237..f475b9d6dcf 100644 --- a/pkg/kernel/test/class_hierarchy_test.dart +++ b/pkg/kernel/test/class_hierarchy_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import "package:expect/minitest.dart"; // ignore: deprecated_member_use +import "package:expect/legacy/minitest.dart"; // ignore: deprecated_member_use import "package:kernel/ast.dart"; import "package:kernel/class_hierarchy.dart"; diff --git a/pkg/modular_test/lib/src/loader.dart b/pkg/modular_test/lib/src/loader.dart index e03aede2c0f..ce24a7f810f 100644 --- a/pkg/modular_test/lib/src/loader.dart +++ b/pkg/modular_test/lib/src/loader.dart @@ -256,12 +256,10 @@ dependencies: expect: [meta, smith] smith: [] meta: [] - async_helper: [] collection: [] packages: expect: pkg/expect/lib smith: pkg/smith/lib - async_helper: pkg/async_helper/lib meta: pkg/meta/lib collection: third_party/pkg/collection/lib '''; diff --git a/pkg/modular_test/pubspec.yaml b/pkg/modular_test/pubspec.yaml index e9209a43758..8a73b3c3c28 100644 --- a/pkg/modular_test/pubspec.yaml +++ b/pkg/modular_test/pubspec.yaml @@ -18,7 +18,6 @@ dependencies: # Use 'any' constraints here; we get our versions from the DEPS file. dev_dependencies: - async_helper: any expect: any lints: any test: any diff --git a/pkg/modular_test/test/find_sdk_root1_test.dart b/pkg/modular_test/test/find_sdk_root1_test.dart index d4f7030cc03..dbbf8b63408 100644 --- a/pkg/modular_test/test/find_sdk_root1_test.dart +++ b/pkg/modular_test/test/find_sdk_root1_test.dart @@ -4,8 +4,8 @@ import 'dart:io'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:modular_test/src/find_sdk_root.dart'; // This and the 'src/find_sdk_root2_test.dart' check that we can locate diff --git a/pkg/modular_test/test/loader/default_package_dependency_error/expectation.txt b/pkg/modular_test/test/loader/default_package_dependency_error/expectation.txt index 741b70396ed..455ad952053 100644 --- a/pkg/modular_test/test/loader/default_package_dependency_error/expectation.txt +++ b/pkg/modular_test/test/loader/default_package_dependency_error/expectation.txt @@ -5,9 +5,13 @@ expect is shared? yes is sdk? no dependencies: meta, smith, sdk + lib/async_helper.dart lib/config.dart lib/expect.dart + lib/legacy/async_minitest.dart + lib/legacy/minitest.dart lib/minitest.dart + lib/static_type_helper.dart lib/variations.dart main diff --git a/pkg/modular_test/test/loader/valid_packages/expectation.txt b/pkg/modular_test/test/loader/valid_packages/expectation.txt index 4237cad4c5b..17447731fae 100644 --- a/pkg/modular_test/test/loader/valid_packages/expectation.txt +++ b/pkg/modular_test/test/loader/valid_packages/expectation.txt @@ -5,9 +5,13 @@ expect is shared? yes is sdk? no dependencies: meta, smith, sdk + lib/async_helper.dart lib/config.dart lib/expect.dart + lib/legacy/async_minitest.dart + lib/legacy/minitest.dart lib/minitest.dart + lib/static_type_helper.dart lib/variations.dart js diff --git a/pkg/modular_test/test/src/find_sdk_root2_test.dart b/pkg/modular_test/test/src/find_sdk_root2_test.dart index b13e48e9e59..05dba888959 100644 --- a/pkg/modular_test/test/src/find_sdk_root2_test.dart +++ b/pkg/modular_test/test/src/find_sdk_root2_test.dart @@ -4,8 +4,8 @@ import 'dart:io'; +import 'package:expect/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:async_helper/async_helper.dart'; import 'package:modular_test/src/find_sdk_root.dart'; // This and the '../find_sdk_root1_test.dart' check that we can locate diff --git a/pkg/smith/test/builder_test.dart b/pkg/smith/test/builder_test.dart index e202afc383a..fdcef82dcd9 100644 --- a/pkg/smith/test/builder_test.dart +++ b/pkg/smith/test/builder_test.dart @@ -1,7 +1,7 @@ // Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:expect/minitest.dart'; // ignore: deprecated_member_use +import 'package:expect/legacy/minitest.dart'; // ignore: deprecated_member_use import 'package:smith/smith.dart'; diff --git a/pkg/smith/test/configuration_test.dart b/pkg/smith/test/configuration_test.dart index cc326c2de87..c56db0d4f02 100644 --- a/pkg/smith/test/configuration_test.dart +++ b/pkg/smith/test/configuration_test.dart @@ -1,7 +1,7 @@ // Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:expect/minitest.dart'; // ignore: deprecated_member_use +import 'package:expect/legacy/minitest.dart'; // ignore: deprecated_member_use import 'package:smith/smith.dart'; diff --git a/pkg/smith/test/test_helpers.dart b/pkg/smith/test/test_helpers.dart index c7764dd5290..b09f9e0160b 100644 --- a/pkg/smith/test/test_helpers.dart +++ b/pkg/smith/test/test_helpers.dart @@ -1,7 +1,7 @@ // Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:expect/minitest.dart'; // ignore: deprecated_member_use +import 'package:expect/legacy/minitest.dart'; // ignore: deprecated_member_use import 'package:smith/smith.dart'; diff --git a/pkg/smith/test/test_matrix_test.dart b/pkg/smith/test/test_matrix_test.dart index d8e1c628d42..0ac1858fce6 100644 --- a/pkg/smith/test/test_matrix_test.dart +++ b/pkg/smith/test/test_matrix_test.dart @@ -1,7 +1,7 @@ // Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:expect/minitest.dart'; // ignore: deprecated_member_use +import 'package:expect/legacy/minitest.dart'; // ignore: deprecated_member_use import 'package:smith/smith.dart'; diff --git a/pkg/sourcemap_testing/lib/src/stepping_helper.dart b/pkg/sourcemap_testing/lib/src/stepping_helper.dart index b3a066f00f3..004fc091eb8 100644 --- a/pkg/sourcemap_testing/lib/src/stepping_helper.dart +++ b/pkg/sourcemap_testing/lib/src/stepping_helper.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/annotated_code_helper.dart'; import 'package:dart2js_tools/src/util.dart'; -import 'package:expect/minitest.dart'; // ignore: deprecated_member_use +import 'package:expect/legacy/minitest.dart'; // ignore: deprecated_member_use import 'package:path/path.dart' as path; import 'package:source_maps/source_maps.dart'; diff --git a/pkg/test_runner/lib/src/browser.dart b/pkg/test_runner/lib/src/browser.dart index 71b12e57b4f..a9570e22de2 100644 --- a/pkg/test_runner/lib/src/browser.dart +++ b/pkg/test_runner/lib/src/browser.dart @@ -197,7 +197,7 @@ testErrorToStackTrace = function(error) { }; runtime.addAsyncCallback = function() { - async_helper.async_helper.asyncStart(); + expect.async_helper.asyncStart(); }; runtime.removeAsyncCallback = function() { @@ -205,7 +205,7 @@ runtime.removeAsyncCallback = function() { // performed, but we don't want to report the test as being done until // after that operation completes, so wait for that callback to run. setTimeout(() => { - async_helper.async_helper.asyncEnd(); + expect.async_helper.asyncEnd(); }, 0); }; """; @@ -235,7 +235,7 @@ runtime.jsInteropNonNullAsserts($jsInteropNonNullAsserts); var import = 'dartDevEmbedder.importLibrary'; libraryImports = """ let runtime = $import("dart:_runtime"); - let async_helper = $import("package:async_helper/async_helper.dart"); + let expect = $import("package:expect/async_helper.dart"); let _isolate_helper = $import("dart:_isolate_helper"); let _debugger = $import("dart:_debugger"); """; @@ -255,7 +255,7 @@ runtime.jsInteropNonNullAsserts($jsInteropNonNullAsserts); libraryImports = """ let sdk = dart_library.import("dart_sdk", "$appName"); let runtime = sdk.dart; - let async_helper = dart_library.import("async_helper", "$appName"); + let expect = dart_library.import("expect", "$appName"); let _isolate_helper = sdk._isolate_helper; let _debugger = sdk._debugger; """; @@ -305,8 +305,8 @@ $packagePaths