From 686d8f8a22a8ad03375c0b7b8a2442831652190b Mon Sep 17 00:00:00 2001 From: Ian Hickson Date: Tue, 14 Aug 2018 20:33:58 -0700 Subject: [PATCH] Shim package:test to avoid matcher issues (#20602) * Upgrade everything except matcher. * Roll matcher (and test) * Adjust tests that depend on flutter:test directly to depend on a shim * Require use of package:test shim and remove other references to package:test --- .../flutter_test/filtering_test.dart | 2 +- .../flutter_test/trivial_test.dart | 2 +- dev/automated_tests/pubspec.yaml | 12 +-- dev/benchmarks/complex_layout/pubspec.yaml | 14 ++-- .../test_driver/scroll_perf_test.dart | 2 +- .../test_driver/semantics_perf_test.dart | 2 +- dev/benchmarks/microbenchmarks/pubspec.yaml | 12 +-- dev/bots/pubspec.yaml | 18 ++--- dev/bots/test.dart | 76 +++++++++++++++++++ dev/bots/test/common.dart | 14 ++++ dev/bots/test/fake_process_manager.dart | 3 +- dev/bots/test/fake_process_manager_test.dart | 2 +- dev/bots/test/prepare_package_test.dart | 8 +- .../bin/tasks/flutter_test_performance.dart | 2 +- dev/devicelab/pubspec.yaml | 18 ++--- dev/devicelab/test/adb_test.dart | 3 +- dev/devicelab/test/common.dart | 14 ++++ dev/devicelab/test/manifest_test.dart | 4 +- dev/devicelab/test/run_test.dart | 3 +- dev/devicelab/test/utils_test.dart | 3 +- dev/integration_tests/channels/pubspec.yaml | 4 +- .../channels/test_driver/main_test.dart | 2 +- .../external_ui/pubspec.yaml | 4 +- .../external_ui/test_driver/main_test.dart | 3 +- dev/integration_tests/flavors/pubspec.yaml | 4 +- .../flavors/test_driver/main_test.dart | 2 +- .../platform_interaction/pubspec.yaml | 4 +- .../test_driver/main_test.dart | 2 +- dev/integration_tests/ui/pubspec.yaml | 14 ++-- .../commands_debug_paint_test.dart | 2 +- .../ui/test_driver/commands_none_test.dart | 2 +- .../commands_performance_overlay_test.dart | 2 +- .../ui/test_driver/driver_test.dart | 3 +- .../ui/test_driver/keyboard_resize_test.dart | 3 +- .../test_driver/keyboard_textfield_test.dart | 3 +- .../ui/test_driver/route_test.dart | 3 +- .../ui/test_driver/screenshot_test.dart | 3 +- dev/manual_tests/pubspec.yaml | 12 +-- .../trivial_test.dart | 2 +- dev/tools/pubspec.yaml | 18 ++--- dev/tools/vitool/pubspec.yaml | 12 +-- examples/catalog/pubspec.yaml | 14 ++-- examples/flutter_gallery/pubspec.yaml | 18 ++--- .../test/calculator/logic.dart | 3 +- .../test/example_code_parser_test.dart | 2 +- .../test_driver/scroll_perf_test.dart | 2 +- .../test_driver/transitions_perf_test.dart | 2 +- examples/flutter_view/lib/main.dart | 4 + examples/hello_world/pubspec.yaml | 12 +-- examples/layers/pubspec.yaml | 12 +-- .../test/smoketests/raw/canvas_test.dart | 2 +- .../test/smoketests/raw/hello_world_test.dart | 2 +- .../smoketests/raw/spinning_square_test.dart | 2 +- .../layers/test/smoketests/raw/text_test.dart | 2 +- .../test/smoketests/raw/touch_input_test.dart | 2 +- .../custom_coordinate_systems_test.dart | 2 +- .../rendering/flex_layout_test.dart | 2 +- .../rendering/hello_world_test.dart | 2 +- .../rendering/spinning_square_test.dart | 2 +- .../rendering/touch_input_test.dart | 2 +- .../widgets/spinning_mixed_test.dart | 2 +- examples/platform_channel/pubspec.yaml | 14 ++-- .../test_driver/button_tap_test.dart | 2 +- examples/platform_channel_swift/pubspec.yaml | 14 ++-- .../test_driver/button_tap_test.dart | 2 +- examples/stocks/pubspec.yaml | 14 ++-- .../stocks/test_driver/scroll_perf_test.dart | 2 +- packages/flutter/pubspec.yaml | 18 ++--- packages/flutter/test/engine/color_test.dart | 2 +- packages/flutter/test/engine/dart_test.dart | 2 +- .../test/engine/paragraph_builder_test.dart | 2 +- packages/flutter/test/engine/rect_test.dart | 2 +- packages/flutter/test/engine/rrect_test.dart | 2 +- .../flutter/test/engine/task_order_test.dart | 2 +- .../test/examples/sector_layout_test.dart | 2 +- .../test/flutter_test_alternative.dart | 14 ++++ .../test/foundation/assertions_test.dart | 2 +- .../test/foundation/bit_field_test.dart | 2 +- .../foundation/caching_iterable_test.dart | 2 +- .../foundation/consolidate_response_test.dart | 9 ++- .../test/foundation/error_reporting_test.dart | 2 +- .../test/foundation/licenses_test.dart | 2 +- .../flutter/test/foundation/print_test.dart | 2 +- .../flutter/test/foundation/profile_test.dart | 2 +- .../test/foundation/reassemble_test.dart | 2 +- .../test/foundation/serialization_test.dart | 2 +- .../foundation/service_extensions_test.dart | 2 +- .../test/foundation/stack_trace_test.dart | 2 +- .../foundation/synchronous_future_test.dart | 2 +- .../flutter/test/gestures/arena_test.dart | 3 +- .../test/gestures/double_tap_test.dart | 2 +- .../test/gestures/gesture_binding_test.dart | 3 +- .../flutter/test/gestures/gesture_tester.dart | 3 +- .../flutter/test/gestures/locking_test.dart | 3 +- .../test/gestures/long_press_test.dart | 2 +- .../test/gestures/lsq_solver_test.dart | 2 +- packages/flutter/test/gestures/tap_test.dart | 2 +- .../flutter/test/harness/trivial_test.dart | 2 +- .../material/animated_icons_private_test.dart | 3 +- .../flutter/test/material/colors_test.dart | 4 +- .../flutter/test/painting/box_fit_test.dart | 2 +- .../test/painting/decoration_test.dart | 14 ++-- .../flutter/test/painting/geometry_test.dart | 2 +- .../painting/image_cache_resize_test.dart | 2 +- .../test/painting/image_cache_test.dart | 2 +- .../test/painting/image_decoder_test.dart | 2 +- .../test/painting/paint_image_test.dart | 2 +- .../flutter/test/painting/text_span_test.dart | 2 +- .../test/painting/text_style_test.dart | 2 +- .../flutter/test/physics/near_equal_test.dart | 4 +- .../flutter/test/physics/newton_test.dart | 4 +- .../test/rendering/annotated_region_test.dart | 2 +- .../test/rendering/aspect_ratio_test.dart | 2 +- .../flutter/test/rendering/baseline_test.dart | 2 +- .../test/rendering/box_constraints_test.dart | 8 +- .../rendering/cached_intrinsics_test.dart | 2 +- .../test/rendering/constraints_test.dart | 2 +- .../flutter/test/rendering/debug_test.dart | 2 +- .../rendering/dynamic_intrinsics_test.dart | 2 +- .../rendering/independent_layout_test.dart | 2 +- .../test/rendering/intrinsic_width_test.dart | 2 +- .../test/rendering/mutations_test.dart | 2 +- .../non_render_object_root_test.dart | 2 +- .../flutter/test/rendering/object_test.dart | 2 +- .../flutter/test/rendering/offstage_test.dart | 2 +- .../flutter/test/rendering/overflow_test.dart | 2 +- .../rendering/paragraph_intrinsics_test.dart | 2 +- .../test/rendering/positioned_box_test.dart | 2 +- .../test/rendering/proxy_box_test.dart | 2 +- .../proxy_getters_and_setters_test.dart | 2 +- .../flutter/test/rendering/reattach_test.dart | 2 +- .../test/rendering/relative_rect_test.dart | 2 +- .../test/rendering/repaint_boundary_test.dart | 2 +- .../semantics_and_children_test.dart | 2 +- .../test/rendering/simple_semantics_test.dart | 2 +- .../flutter/test/rendering/size_test.dart | 2 +- .../test/rendering/sliver_cache_test.dart | 2 +- .../test/rendering/slivers_block_test.dart | 2 +- .../test/rendering/slivers_layout_test.dart | 2 +- .../flutter/test/rendering/stack_test.dart | 2 +- .../test/rendering/transform_test.dart | 2 +- .../test/scheduler/animation_test.dart | 3 +- .../flutter/test/scheduler/priority_test.dart | 3 +- .../test/scheduler/scheduler_test.dart | 3 +- .../custom_semantics_action_test.dart | 7 +- .../semantics/semantics_service_test.dart | 3 +- .../test/services/message_codecs_test.dart | 2 +- .../test/services/platform_channel_test.dart | 4 +- .../test/services/platform_messages_test.dart | 2 +- .../test/services/platform_views_test.dart | 6 +- .../test/services/text_input_test.dart | 2 +- packages/flutter_driver/pubspec.yaml | 14 ++-- packages/flutter_driver/test/common.dart | 14 ++++ .../test/flutter_driver_test.dart | 11 +-- .../test/src/timeline_summary_test.dart | 3 +- .../test/src/timeline_test.dart | 3 +- packages/flutter_goldens/pubspec.yaml | 18 ++--- packages/flutter_localizations/pubspec.yaml | 12 +-- packages/flutter_test/lib/src/goldens.dart | 4 +- packages/flutter_test/lib/src/matchers.dart | 6 +- packages/flutter_test/pubspec.yaml | 14 ++-- packages/flutter_test/test/goldens_test.dart | 10 +-- .../lib/src/commands/update_packages.dart | 1 - packages/flutter_tools/pubspec.yaml | 22 +++--- .../flutter_tools/test/analytics_test.dart | 6 +- .../test/android/android_device_test.dart | 2 +- .../test/android/android_emulator_test.dart | 2 +- .../test/android/android_sdk_test.dart | 1 - .../test/android/android_workflow_test.dart | 1 - .../test/android/gradle_test.dart | 1 - .../test/application_package_test.dart | 10 ++- .../flutter_tools/test/artifacts_test.dart | 2 +- .../test/asset_bundle_package_fonts_test.dart | 2 - .../test/asset_bundle_package_test.dart | 2 +- .../flutter_tools/test/asset_bundle_test.dart | 2 - .../test/asset_bundle_variant_test.dart | 2 - packages/flutter_tools/test/asset_test.dart | 2 +- .../flutter_tools/test/base/build_test.dart | 2 +- .../flutter_tools/test/base/common_test.dart | 1 - .../flutter_tools/test/base/context_test.dart | 3 +- .../test/base/file_system_test.dart | 1 - .../test/base/fingerprint_test.dart | 2 +- .../flutter_tools/test/base/flags_test.dart | 1 - packages/flutter_tools/test/base/io_test.dart | 2 +- .../flutter_tools/test/base/logger_test.dart | 14 ++-- .../flutter_tools/test/base/logs_test.dart | 1 - .../flutter_tools/test/base/net_test.dart | 2 +- packages/flutter_tools/test/base/os_test.dart | 3 +- .../test/base/os_utils_test.dart | 2 +- .../flutter_tools/test/base/process_test.dart | 2 +- .../test/base/terminal_test.dart | 3 +- .../flutter_tools/test/base_utils_test.dart | 3 +- .../flutter_tools/test/bug_report_test.dart | 5 +- packages/flutter_tools/test/cache_test.dart | 2 +- packages/flutter_tools/test/channel_test.dart | 1 - .../commands/analyze_continuously_test.dart | 2 +- .../test/commands/analyze_once_test.dart | 1 - .../test/commands/analyze_test.dart | 2 +- .../test/commands/attach_test.dart | 5 +- .../test/commands/config_test.dart | 2 +- .../test/commands/create_test.dart | 1 - .../test/commands/daemon_test.dart | 2 +- .../test/commands/devices_test.dart | 1 - .../test/commands/doctor_test.dart | 2 +- .../test/commands/drive_test.dart | 1 - .../test/commands/format_test.dart | 1 - .../test/commands/fuchsia_reload_test.dart | 2 +- .../test/commands/ide_config_test.dart | 1 - .../test/commands/install_test.dart | 1 - .../test/commands/packages_test.dart | 1 - .../flutter_tools/test/commands/run_test.dart | 1 - .../test/commands/shell_completion_test.dart | 1 - .../test/commands/test_test.dart | 2 +- .../test/commands/upgrade_test.dart | 1 - packages/flutter_tools/test/compile_test.dart | 2 +- packages/flutter_tools/test/config_test.dart | 3 +- .../test/crash_reporting_test.dart | 3 +- .../flutter_tools/test/dart/pub_get_test.dart | 1 - .../test/dart_dependencies_test.dart | 1 - .../test/dependency_checker_test.dart | 2 +- packages/flutter_tools/test/devfs_test.dart | 1 - packages/flutter_tools/test/device_test.dart | 2 +- .../flutter_tools/test/emulator_test.dart | 2 +- .../test/flutter_manifest_test.dart | 1 - .../test/forbidden_imports_test.dart | 1 - packages/flutter_tools/test/hot_test.dart | 2 +- .../expression_evaluation_test.dart | 3 +- .../test/integration/flutter_attach_test.dart | 2 +- .../test/integration/flutter_tester_test.dart | 2 +- .../test/integration/hot_reload_test.dart | 5 +- .../test/integration/lifetime_test.dart | 2 +- .../test/intellij/intellij_test.dart | 2 +- .../test/ios/cocoapods_test.dart | 6 +- .../test/ios/code_signing_test.dart | 2 +- .../flutter_tools/test/ios/devices_test.dart | 2 +- .../test/ios/ios_workflow_test.dart | 2 +- packages/flutter_tools/test/ios/mac_test.dart | 1 - .../test/ios/simulators_test.dart | 2 +- .../test/ios/xcodeproj_test.dart | 2 +- packages/flutter_tools/test/project_test.dart | 5 +- .../test/protocol_discovery_test.dart | 2 +- .../test/resident_runner_test.dart | 2 +- .../runner/flutter_command_runner_test.dart | 1 - .../test/runner/flutter_command_test.dart | 2 +- packages/flutter_tools/test/src/common.dart | 13 +++- packages/flutter_tools/test/src/context.dart | 1 - packages/flutter_tools/test/src/mocks.dart | 3 +- packages/flutter_tools/test/stop_test.dart | 1 - .../test/tester/flutter_tester_test.dart | 3 +- packages/flutter_tools/test/trace_test.dart | 1 - packages/flutter_tools/test/utils_test.dart | 3 +- packages/flutter_tools/test/version_test.dart | 2 +- .../flutter_tools/test/vmservice_test.dart | 2 - .../pubspec.yaml | 18 ++--- .../test/common.dart | 14 ++++ .../test/fuchsia_remote_connection_test.dart | 5 +- .../test/src/dart/dart_vm_test.dart | 9 ++- .../src/runners/ssh_command_runner_test.dart | 5 +- 258 files changed, 629 insertions(+), 468 deletions(-) create mode 100644 dev/bots/test/common.dart create mode 100644 dev/devicelab/test/common.dart create mode 100644 packages/flutter/test/flutter_test_alternative.dart create mode 100644 packages/flutter_driver/test/common.dart create mode 100644 packages/fuchsia_remote_debug_protocol/test/common.dart diff --git a/dev/automated_tests/flutter_test/filtering_test.dart b/dev/automated_tests/flutter_test/filtering_test.dart index c525b9e125..57ac394b4c 100644 --- a/dev/automated_tests/flutter_test/filtering_test.dart +++ b/dev/automated_tests/flutter_test/filtering_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { test('included', () { diff --git a/dev/automated_tests/flutter_test/trivial_test.dart b/dev/automated_tests/flutter_test/trivial_test.dart index 9efb063150..3646502e47 100644 --- a/dev/automated_tests/flutter_test/trivial_test.dart +++ b/dev/automated_tests/flutter_test/trivial_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { test('trivial', () { }); diff --git a/dev/automated_tests/pubspec.yaml b/dev/automated_tests/pubspec.yaml index 802a03592f..ea0177bf1a 100644 --- a/dev/automated_tests/pubspec.yaml +++ b/dev/automated_tests/pubspec.yaml @@ -13,10 +13,10 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -25,7 +25,7 @@ dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -46,9 +46,9 @@ dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -60,4 +60,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: c18c +# PUBSPEC CHECKSUM: b535 diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml index f4b271bcc0..10793ce83a 100644 --- a/dev/benchmarks/complex_layout/pubspec.yaml +++ b/dev/benchmarks/complex_layout/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -39,10 +39,10 @@ dev_dependencies: analyzer: 0.32.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -50,7 +50,7 @@ dev_dependencies: js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -65,9 +65,9 @@ dev_dependencies: shelf_web_socket: 0.2.2+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -78,4 +78,4 @@ flutter: - packages/flutter_gallery_assets/people/square/ali.png - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png -# PUBSPEC CHECKSUM: 0a55 +# PUBSPEC CHECKSUM: 3201 diff --git a/dev/benchmarks/complex_layout/test_driver/scroll_perf_test.dart b/dev/benchmarks/complex_layout/test_driver/scroll_perf_test.dart index 9c66e6d368..d8b97f80ff 100644 --- a/dev/benchmarks/complex_layout/test_driver/scroll_perf_test.dart +++ b/dev/benchmarks/complex_layout/test_driver/scroll_perf_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('scrolling performance test', () { diff --git a/dev/benchmarks/complex_layout/test_driver/semantics_perf_test.dart b/dev/benchmarks/complex_layout/test_driver/semantics_perf_test.dart index 4c88623269..f216a8470d 100644 --- a/dev/benchmarks/complex_layout/test_driver/semantics_perf_test.dart +++ b/dev/benchmarks/complex_layout/test_driver/semantics_perf_test.dart @@ -8,7 +8,7 @@ import 'dart:io'; import 'package:flutter_driver/flutter_driver.dart'; import 'package:path/path.dart' as p; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('semantics performance test', () { diff --git a/dev/benchmarks/microbenchmarks/pubspec.yaml b/dev/benchmarks/microbenchmarks/pubspec.yaml index d5cf300cac..302557531a 100644 --- a/dev/benchmarks/microbenchmarks/pubspec.yaml +++ b/dev/benchmarks/microbenchmarks/pubspec.yaml @@ -17,11 +17,11 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dart_style: 1.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -33,7 +33,7 @@ dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -54,9 +54,9 @@ dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -68,4 +68,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 0ced +# PUBSPEC CHECKSUM: 0296 diff --git a/dev/bots/pubspec.yaml b/dev/bots/pubspec.yaml index c42ce16759..adc0e124ab 100644 --- a/dev/bots/pubspec.yaml +++ b/dev/bots/pubspec.yaml @@ -5,39 +5,39 @@ dependencies: path: 1.6.2 args: 1.5.0 meta: 1.1.5 - process: 3.0.3 - platform: 2.1.2 + process: 3.0.5 + platform: 2.2.0 http: 0.11.3+17 http_parser: 3.1.3 async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dev_dependencies: - test: 0.12.41 + test: 0.12.42 mockito: 3.0.0-beta analyzer: 0.32.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -61,4 +61,4 @@ dev_dependencies: web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 5a94 +# PUBSPEC CHECKSUM: b541 diff --git a/dev/bots/test.dart b/dev/bots/test.dart index 942dfdbdf2..09e66f5f79 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -160,6 +160,7 @@ Future _checkForTrailingSpaces() async { } Future _analyzeRepo() async { + await _verifyNoTestPackageImports(flutterRoot); await _verifyGeneratedPluginRegistrants(flutterRoot); await _verifyNoBadImportsInFlutter(flutterRoot); await _verifyNoBadImportsInFlutterTools(flutterRoot); @@ -528,6 +529,81 @@ Future _runFlutterAnalyze(String workingDirectory, { ); } +Future _verifyNoTestPackageImports(String workingDirectory) async { + // TODO(ianh): Remove this whole test once https://github.com/dart-lang/matcher/issues/98 is fixed. + final List shims = []; + final List errors = new Directory(workingDirectory) + .listSync(recursive: true) + .where((FileSystemEntity entity) { + return entity is File && entity.path.endsWith('.dart'); + }) + .map((FileSystemEntity entity) { + final File file = entity; + final String data = file.readAsStringSync(); + final String name = path.relative(file.path, from: workingDirectory); + if (name.startsWith('bin/cache') || + name == 'dev/bots/test.dart') + return null; + if (data.contains("import 'package:test/test.dart'")) { + if (data.contains("// Defines a 'package:test' shim.")) { + shims.add(' $name'); + if (!data.contains('https://github.com/dart-lang/matcher/issues/98')) + return ' $name: Shims must link to the isInstanceOf issue.'; + if (data.contains("import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;") && + data.contains("export 'package:test/test.dart' hide TypeMatcher, isInstanceOf;")) + return null; + return ' $name: Shim seems to be missing the expected import/export lines.'; + } + final int count = 'package:test'.allMatches(data).length; + if (file.path.contains('/test_driver/') || + name.startsWith('dev/missing_dependency_tests/') || + name.startsWith('dev/automated_tests/') || + name.startsWith('packages/flutter/test/engine/') || + name.startsWith('examples/layers/test/smoketests/raw/') || + name.startsWith('examples/layers/test/smoketests/rendering/') || + name.startsWith('examples/flutter_gallery/test/calculator')) { + // We only exempt driver tests, some of our special trivial tests. + // Driver tests aren't typically expected to use TypeMatcher and company. + // The trivial tests don't typically do anything at all and it would be + // a pain to have to give them a shim. + if (!data.contains("import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;")) + return ' $name: test does not hide TypeMatcher and isInstanceOf from package:test; consider using a shim instead.'; + assert(count > 0); + if (count == 1) + return null; + return ' $name: uses \'package:test\' $count times.'; + } + if (name.startsWith('packages/flutter_test/')) { + // flutter_test has deep ties to package:test + return null; + } + if (data.contains("import 'package:test/test.dart' as test_package;") || + data.contains("import 'package:test/test.dart' as test_package show ")) { + if (count == 1) + return null; + } + return ' $name: uses \'package:test\' directly.'; + } + }) + .where((String line) => line != null) + .toList() + ..sort(); + + // Fail if any errors + if (errors.isNotEmpty) { + print('$red━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━$reset'); + final String s1 = errors.length == 1 ? 's' : ''; + final String s2 = errors.length == 1 ? '' : 's'; + print('${bold}The following file$s2 depend$s1 on \'package:test\' directly:$reset'); + print(errors.join('\n')); + print('Rather than depending on \'package:test\' directly, use one of the shims:'); + print(shims.join('\n')); + print('This insulates us from breaking changes in \'package:test\'.'); + print('$red━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━$reset\n'); + exit(1); + } +} + Future _verifyNoBadImportsInFlutter(String workingDirectory) async { final List errors = []; final String libPath = path.join(workingDirectory, 'packages', 'flutter', 'lib'); diff --git a/dev/bots/test/common.dart b/dev/bots/test/common.dart new file mode 100644 index 0000000000..b36d043b0a --- /dev/null +++ b/dev/bots/test/common.dart @@ -0,0 +1,14 @@ +// Copyright 2018 The Chromium Authors. 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:test/test.dart' hide TypeMatcher, isInstanceOf; +import 'package:test/test.dart' as test_package show TypeMatcher; + +export 'package:test/test.dart' hide TypeMatcher, isInstanceOf; + +// Defines a 'package:test' shim. +// TODO(ianh): Remove this file once https://github.com/dart-lang/matcher/issues/98 is fixed + +/// A matcher that compares the type of the actual value to the type argument T. +Matcher isInstanceOf() => new test_package.TypeMatcher(); // ignore: prefer_const_constructors, https://github.com/dart-lang/sdk/issues/32544 diff --git a/dev/bots/test/fake_process_manager.dart b/dev/bots/test/fake_process_manager.dart index be9f78be50..4b92bf32dd 100644 --- a/dev/bots/test/fake_process_manager.dart +++ b/dev/bots/test/fake_process_manager.dart @@ -8,7 +8,8 @@ import 'dart:io'; import 'package:process/process.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; + +import 'common.dart'; /// A mock that can be used to fake a process manager that runs commands /// and returns results. diff --git a/dev/bots/test/fake_process_manager_test.dart b/dev/bots/test/fake_process_manager_test.dart index d94f6efac5..884cf819f5 100644 --- a/dev/bots/test/fake_process_manager_test.dart +++ b/dev/bots/test/fake_process_manager_test.dart @@ -5,7 +5,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:test/test.dart'; +import 'common.dart'; import 'fake_process_manager.dart'; diff --git a/dev/bots/test/prepare_package_test.dart b/dev/bots/test/prepare_package_test.dart index 46c0609789..bfeb9e4e9c 100644 --- a/dev/bots/test/prepare_package_test.dart +++ b/dev/bots/test/prepare_package_test.dart @@ -8,11 +8,11 @@ import 'dart:io' hide Platform; import 'dart:typed_data'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; import 'package:path/path.dart' as path; import 'package:platform/platform.dart' show FakePlatform; import '../prepare_package.dart'; +import 'common.dart'; import 'fake_process_manager.dart'; void main() { @@ -25,7 +25,7 @@ void main() { expectAsync1((List commandLine) async { return processRunner.runProcess(commandLine); })(['this_executable_better_not_exist_2857632534321']), - throwsA(const isInstanceOf())); + throwsA(isInstanceOf())); try { await processRunner.runProcess(['this_executable_better_not_exist_2857632534321']); } on ProcessRunnerException catch (e) { @@ -62,7 +62,7 @@ void main() { expectAsync1((List commandLine) async { return processRunner.runProcess(commandLine); })(['echo', 'test']), - throwsA(const isInstanceOf())); + throwsA(isInstanceOf())); }); }); group('ArchiveCreator for $platformName', () { @@ -204,7 +204,7 @@ void main() { }; processManager.fakeResults = calls; expect(expectAsync0(creator.initializeRepo), - throwsA(const isInstanceOf())); + throwsA(isInstanceOf())); }); }); diff --git a/dev/devicelab/bin/tasks/flutter_test_performance.dart b/dev/devicelab/bin/tasks/flutter_test_performance.dart index a2f96d2c4d..171e5c5648 100644 --- a/dev/devicelab/bin/tasks/flutter_test_performance.dart +++ b/dev/devicelab/bin/tasks/flutter_test_performance.dart @@ -23,7 +23,7 @@ import 'package:path/path.dart' as path; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; -// Matches the output of package:test, e.g.: "00:01 +1 loading foo" +// Matches the output of the "test" package, e.g.: "00:01 +1 loading foo" final RegExp testOutputPattern = new RegExp(r'^[0-9][0-9]:[0-9][0-9] \+[0-9]+: (.+?) *$'); enum TestStep { diff --git a/dev/devicelab/pubspec.yaml b/dev/devicelab/pubspec.yaml index 5b5a3b196d..fcb50a5287 100644 --- a/dev/devicelab/pubspec.yaml +++ b/dev/devicelab/pubspec.yaml @@ -5,12 +5,12 @@ homepage: https://github.com/flutter/flutter dependencies: args: 1.5.0 - file: 5.0.1 + file: 5.0.4 image: 2.0.4 meta: 1.1.5 path: 1.6.2 - platform: 2.1.2 - process: 3.0.3 + platform: 2.2.0 + process: 3.0.5 stack_trace: 1.9.3 vm_service_client: 0.2.6 @@ -22,7 +22,7 @@ dependencies: crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" petitparser: 1.7.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -33,14 +33,14 @@ dependencies: dev_dependencies: # See packages/flutter_test/pubspec.yaml for why we're pinning this version. - test: 0.12.41 + test: 0.12.42 analyzer: 0.32.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -61,10 +61,10 @@ dev_dependencies: shelf_web_socket: 0.2.2+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 3eb4 +# PUBSPEC CHECKSUM: d261 diff --git a/dev/devicelab/test/adb_test.dart b/dev/devicelab/test/adb_test.dart index 82d6842353..e2ac66a265 100644 --- a/dev/devicelab/test/adb_test.dart +++ b/dev/devicelab/test/adb_test.dart @@ -4,11 +4,12 @@ import 'dart:async'; -import 'package:test/test.dart'; import 'package:collection/collection.dart' show ListEquality, MapEquality; import 'package:flutter_devicelab/framework/adb.dart'; +import 'common.dart'; + void main() { group('device', () { Device device; diff --git a/dev/devicelab/test/common.dart b/dev/devicelab/test/common.dart new file mode 100644 index 0000000000..b36d043b0a --- /dev/null +++ b/dev/devicelab/test/common.dart @@ -0,0 +1,14 @@ +// Copyright 2018 The Chromium Authors. 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:test/test.dart' hide TypeMatcher, isInstanceOf; +import 'package:test/test.dart' as test_package show TypeMatcher; + +export 'package:test/test.dart' hide TypeMatcher, isInstanceOf; + +// Defines a 'package:test' shim. +// TODO(ianh): Remove this file once https://github.com/dart-lang/matcher/issues/98 is fixed + +/// A matcher that compares the type of the actual value to the type argument T. +Matcher isInstanceOf() => new test_package.TypeMatcher(); // ignore: prefer_const_constructors, https://github.com/dart-lang/sdk/issues/32544 diff --git a/dev/devicelab/test/manifest_test.dart b/dev/devicelab/test/manifest_test.dart index c9ecbc819f..ebbe35c6e1 100644 --- a/dev/devicelab/test/manifest_test.dart +++ b/dev/devicelab/test/manifest_test.dart @@ -4,10 +4,10 @@ import 'dart:io'; -import 'package:test/test.dart'; - import 'package:flutter_devicelab/framework/manifest.dart'; +import 'common.dart'; + void main() { group('production manifest', () { test('must be valid', () { diff --git a/dev/devicelab/test/run_test.dart b/dev/devicelab/test/run_test.dart index 5327770f12..772202326f 100644 --- a/dev/devicelab/test/run_test.dart +++ b/dev/devicelab/test/run_test.dart @@ -7,7 +7,8 @@ import 'dart:io'; import 'package:path/path.dart' as path; import 'package:process/process.dart'; -import 'package:test/test.dart'; + +import 'common.dart'; void main() { const ProcessManager processManager = LocalProcessManager(); diff --git a/dev/devicelab/test/utils_test.dart b/dev/devicelab/test/utils_test.dart index 03bb51e16f..3718af7b0a 100644 --- a/dev/devicelab/test/utils_test.dart +++ b/dev/devicelab/test/utils_test.dart @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; import 'package:flutter_devicelab/framework/utils.dart'; +import 'common.dart'; + void main() { group('grep', () { test('greps lines', () { diff --git a/dev/integration_tests/channels/pubspec.yaml b/dev/integration_tests/channels/pubspec.yaml index 0870594ca4..0d49edd9ae 100644 --- a/dev/integration_tests/channels/pubspec.yaml +++ b/dev/integration_tests/channels/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -29,4 +29,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 5453 +# PUBSPEC CHECKSUM: 4256 diff --git a/dev/integration_tests/channels/test_driver/main_test.dart b/dev/integration_tests/channels/test_driver/main_test.dart index ddcb83dac4..e370f6a4fd 100644 --- a/dev/integration_tests/channels/test_driver/main_test.dart +++ b/dev/integration_tests/channels/test_driver/main_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('channel suite', () { diff --git a/dev/integration_tests/external_ui/pubspec.yaml b/dev/integration_tests/external_ui/pubspec.yaml index d43b1667cf..f4aa07c09f 100644 --- a/dev/integration_tests/external_ui/pubspec.yaml +++ b/dev/integration_tests/external_ui/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -29,4 +29,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 5453 +# PUBSPEC CHECKSUM: 4256 diff --git a/dev/integration_tests/external_ui/test_driver/main_test.dart b/dev/integration_tests/external_ui/test_driver/main_test.dart index 4cfb2798e1..c4021d1c4e 100644 --- a/dev/integration_tests/external_ui/test_driver/main_test.dart +++ b/dev/integration_tests/external_ui/test_driver/main_test.dart @@ -3,8 +3,9 @@ // found in the LICENSE file. import 'dart:async'; + import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; final RegExp calibrationRegExp = new RegExp('Flutter frame rate is (.*)fps'); final RegExp statsRegExp = new RegExp('Produced: (.*)fps\nConsumed: (.*)fps\nWidget builds: (.*)'); diff --git a/dev/integration_tests/flavors/pubspec.yaml b/dev/integration_tests/flavors/pubspec.yaml index 7c8e8a3681..bef86d2501 100644 --- a/dev/integration_tests/flavors/pubspec.yaml +++ b/dev/integration_tests/flavors/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -29,4 +29,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 5453 +# PUBSPEC CHECKSUM: 4256 diff --git a/dev/integration_tests/flavors/test_driver/main_test.dart b/dev/integration_tests/flavors/test_driver/main_test.dart index 548ebbf7d9..9fdd0e50b7 100644 --- a/dev/integration_tests/flavors/test_driver/main_test.dart +++ b/dev/integration_tests/flavors/test_driver/main_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('flavors suite', () { diff --git a/dev/integration_tests/platform_interaction/pubspec.yaml b/dev/integration_tests/platform_interaction/pubspec.yaml index ee47962f97..de514e97a1 100644 --- a/dev/integration_tests/platform_interaction/pubspec.yaml +++ b/dev/integration_tests/platform_interaction/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -29,4 +29,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 5453 +# PUBSPEC CHECKSUM: 4256 diff --git a/dev/integration_tests/platform_interaction/test_driver/main_test.dart b/dev/integration_tests/platform_interaction/test_driver/main_test.dart index 716ee7cd4d..900f4e0dfe 100644 --- a/dev/integration_tests/platform_interaction/test_driver/main_test.dart +++ b/dev/integration_tests/platform_interaction/test_driver/main_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('channel suite', () { diff --git a/dev/integration_tests/ui/pubspec.yaml b/dev/integration_tests/ui/pubspec.yaml index 4601511b5a..baa5c7a395 100644 --- a/dev/integration_tests/ui/pubspec.yaml +++ b/dev/integration_tests/ui/pubspec.yaml @@ -15,10 +15,10 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" petitparser: 1.7.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -35,14 +35,14 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - test: 0.12.41 + test: 0.12.42 analyzer: 0.32.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -64,7 +64,7 @@ dev_dependencies: shelf_web_socket: 0.2.2+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -73,4 +73,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 03e6 +# PUBSPEC CHECKSUM: 8392 diff --git a/dev/integration_tests/ui/test_driver/commands_debug_paint_test.dart b/dev/integration_tests/ui/test_driver/commands_debug_paint_test.dart index d7046c98b5..7cd2bb23c8 100644 --- a/dev/integration_tests/ui/test_driver/commands_debug_paint_test.dart +++ b/dev/integration_tests/ui/test_driver/commands_debug_paint_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { FlutterDriver driver; diff --git a/dev/integration_tests/ui/test_driver/commands_none_test.dart b/dev/integration_tests/ui/test_driver/commands_none_test.dart index e04e39e5dc..96c9ffa845 100644 --- a/dev/integration_tests/ui/test_driver/commands_none_test.dart +++ b/dev/integration_tests/ui/test_driver/commands_none_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { FlutterDriver driver; diff --git a/dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart b/dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart index f5de33523c..5a45218171 100644 --- a/dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart +++ b/dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { FlutterDriver driver; diff --git a/dev/integration_tests/ui/test_driver/driver_test.dart b/dev/integration_tests/ui/test_driver/driver_test.dart index 5b177c77bb..e036a4a0d4 100644 --- a/dev/integration_tests/ui/test_driver/driver_test.dart +++ b/dev/integration_tests/ui/test_driver/driver_test.dart @@ -5,7 +5,8 @@ import 'dart:async'; import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; + +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('FlutterDriver', () { diff --git a/dev/integration_tests/ui/test_driver/keyboard_resize_test.dart b/dev/integration_tests/ui/test_driver/keyboard_resize_test.dart index a6a7710e67..ae834a58f0 100644 --- a/dev/integration_tests/ui/test_driver/keyboard_resize_test.dart +++ b/dev/integration_tests/ui/test_driver/keyboard_resize_test.dart @@ -6,7 +6,8 @@ import 'dart:async'; import 'package:integration_ui/keys.dart' as keys; import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; + +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('end-to-end test', () { diff --git a/dev/integration_tests/ui/test_driver/keyboard_textfield_test.dart b/dev/integration_tests/ui/test_driver/keyboard_textfield_test.dart index 477e3a3d4f..a2ee650b63 100644 --- a/dev/integration_tests/ui/test_driver/keyboard_textfield_test.dart +++ b/dev/integration_tests/ui/test_driver/keyboard_textfield_test.dart @@ -6,7 +6,8 @@ import 'dart:async'; import 'package:integration_ui/keys.dart' as keys; import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; + +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('end-to-end test', () { diff --git a/dev/integration_tests/ui/test_driver/route_test.dart b/dev/integration_tests/ui/test_driver/route_test.dart index f7ec81e37f..26bcf7a7e1 100644 --- a/dev/integration_tests/ui/test_driver/route_test.dart +++ b/dev/integration_tests/ui/test_driver/route_test.dart @@ -3,7 +3,8 @@ // found in the LICENSE file. import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; + +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('flutter run test --route', () { diff --git a/dev/integration_tests/ui/test_driver/screenshot_test.dart b/dev/integration_tests/ui/test_driver/screenshot_test.dart index 9523183e5b..52583a2aa5 100644 --- a/dev/integration_tests/ui/test_driver/screenshot_test.dart +++ b/dev/integration_tests/ui/test_driver/screenshot_test.dart @@ -4,7 +4,8 @@ import 'package:flutter_driver/flutter_driver.dart'; import 'package:image/image.dart'; -import 'package:test/test.dart'; + +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('FlutterDriver', () { diff --git a/dev/manual_tests/pubspec.yaml b/dev/manual_tests/pubspec.yaml index ebeb0b88c0..b85d252338 100644 --- a/dev/manual_tests/pubspec.yaml +++ b/dev/manual_tests/pubspec.yaml @@ -22,10 +22,10 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -34,7 +34,7 @@ dev_dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -54,9 +54,9 @@ dev_dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -66,4 +66,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 7c9a +# PUBSPEC CHECKSUM: 2d43 diff --git a/dev/missing_dependency_tests/trivial_test.dart b/dev/missing_dependency_tests/trivial_test.dart index 798a1e5413..c8bb894f55 100644 --- a/dev/missing_dependency_tests/trivial_test.dart +++ b/dev/missing_dependency_tests/trivial_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { test('Trivial test', () { diff --git a/dev/tools/pubspec.yaml b/dev/tools/pubspec.yaml index 96703c0c72..acd79f03f5 100644 --- a/dev/tools/pubspec.yaml +++ b/dev/tools/pubspec.yaml @@ -8,37 +8,37 @@ dependencies: intl: 0.15.7 meta: 1.1.5 path: 1.6.2 - process: 3.0.3 + process: 3.0.5 async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - platform: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dev_dependencies: - test: 0.12.41 + test: 0.12.42 mockito: 3.0.0-beta analyzer: 0.32.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -62,4 +62,4 @@ dev_dependencies: web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: bdc4 +# PUBSPEC CHECKSUM: 5871 diff --git a/dev/tools/vitool/pubspec.yaml b/dev/tools/vitool/pubspec.yaml index 72e6e52e1a..7e4c9600b7 100644 --- a/dev/tools/vitool/pubspec.yaml +++ b/dev/tools/vitool/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: xml: 3.0.1 collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" petitparser: 1.7.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -25,10 +25,10 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -55,9 +55,9 @@ dev_dependencies: source_maps: 0.10.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -65,4 +65,4 @@ dev_dependencies: web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: ef38 +# PUBSPEC CHECKSUM: 80e0 diff --git a/examples/catalog/pubspec.yaml b/examples/catalog/pubspec.yaml index 6c3e730ef5..7c49d88ec3 100644 --- a/examples/catalog/pubspec.yaml +++ b/examples/catalog/pubspec.yaml @@ -23,11 +23,11 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -37,7 +37,7 @@ dev_dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -56,9 +56,9 @@ dev_dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -68,4 +68,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: d5b8 +# PUBSPEC CHECKSUM: 0264 diff --git a/examples/flutter_gallery/pubspec.yaml b/examples/flutter_gallery/pubspec.yaml index 59d3f0f36c..c4c66f9354 100644 --- a/examples/flutter_gallery/pubspec.yaml +++ b/examples/flutter_gallery/pubspec.yaml @@ -6,7 +6,7 @@ dependencies: device_info: 0.2.1 intl: 0.15.7 connectivity: 0.3.1 - string_scanner: 1.0.3 + string_scanner: 1.0.4 url_launcher: 3.0.3 cupertino_icons: 0.1.2 video_player: 0.6.4 @@ -38,11 +38,11 @@ dev_dependencies: boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -51,16 +51,16 @@ dev_dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - platform: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" plugin: 0.2.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.3.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - process: 3.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + process: 3.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" quiver: 2.0.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -72,7 +72,7 @@ dev_dependencies: stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -200,4 +200,4 @@ flutter: - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-Regular.ttf weight: 400 -# PUBSPEC CHECKSUM: 80e6 +# PUBSPEC CHECKSUM: e993 diff --git a/examples/flutter_gallery/test/calculator/logic.dart b/examples/flutter_gallery/test/calculator/logic.dart index d4545925c6..472b0060ad 100644 --- a/examples/flutter_gallery/test/calculator/logic.dart +++ b/examples/flutter_gallery/test/calculator/logic.dart @@ -3,7 +3,8 @@ // found in the LICENSE file. import 'package:flutter_gallery/demo/calculator/logic.dart'; -import 'package:test/test.dart'; + +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { test('Test order of operations: 12 + 3 * 4 = 24', () { diff --git a/examples/flutter_gallery/test/example_code_parser_test.dart b/examples/flutter_gallery/test/example_code_parser_test.dart index d8d6ba5b77..2b4476c4b0 100644 --- a/examples/flutter_gallery/test/example_code_parser_test.dart +++ b/examples/flutter_gallery/test/example_code_parser_test.dart @@ -7,7 +7,7 @@ import 'dart:typed_data'; import 'package:flutter/services.dart'; import 'package:flutter_gallery/gallery/example_code_parser.dart'; -import 'package:test/test.dart'; +import 'package:flutter_test/flutter_test.dart'; void main() { test('Flutter gallery example code parser test', () async { diff --git a/examples/flutter_gallery/test_driver/scroll_perf_test.dart b/examples/flutter_gallery/test_driver/scroll_perf_test.dart index 8ed957a6ff..0f70b1bd6c 100644 --- a/examples/flutter_gallery/test_driver/scroll_perf_test.dart +++ b/examples/flutter_gallery/test_driver/scroll_perf_test.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('scrolling performance test', () { diff --git a/examples/flutter_gallery/test_driver/transitions_perf_test.dart b/examples/flutter_gallery/test_driver/transitions_perf_test.dart index ef51796901..a656406ace 100644 --- a/examples/flutter_gallery/test_driver/transitions_perf_test.dart +++ b/examples/flutter_gallery/test_driver/transitions_perf_test.dart @@ -9,7 +9,7 @@ import 'package:file/file.dart'; import 'package:file/local.dart'; import 'package:flutter_driver/flutter_driver.dart'; import 'package:path/path.dart' as path; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; const FileSystem _fs = LocalFileSystem(); diff --git a/examples/flutter_view/lib/main.dart b/examples/flutter_view/lib/main.dart index 5e7b62950b..b20e646960 100644 --- a/examples/flutter_view/lib/main.dart +++ b/examples/flutter_view/lib/main.dart @@ -1,3 +1,7 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/examples/hello_world/pubspec.yaml b/examples/hello_world/pubspec.yaml index 0386fdd07c..c5312e54d7 100644 --- a/examples/hello_world/pubspec.yaml +++ b/examples/hello_world/pubspec.yaml @@ -20,10 +20,10 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -32,7 +32,7 @@ dev_dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -52,9 +52,9 @@ dev_dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -64,4 +64,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: c18c +# PUBSPEC CHECKSUM: b535 diff --git a/examples/layers/pubspec.yaml b/examples/layers/pubspec.yaml index fce442c7f2..ff417286e4 100644 --- a/examples/layers/pubspec.yaml +++ b/examples/layers/pubspec.yaml @@ -19,10 +19,10 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -31,7 +31,7 @@ dev_dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -51,9 +51,9 @@ dev_dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -65,4 +65,4 @@ flutter: - services/data.json uses-material-design: true -# PUBSPEC CHECKSUM: c18c +# PUBSPEC CHECKSUM: b535 diff --git a/examples/layers/test/smoketests/raw/canvas_test.dart b/examples/layers/test/smoketests/raw/canvas_test.dart index 979180a5df..e4abd3a156 100644 --- a/examples/layers/test/smoketests/raw/canvas_test.dart +++ b/examples/layers/test/smoketests/raw/canvas_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../raw/canvas.dart' as demo; diff --git a/examples/layers/test/smoketests/raw/hello_world_test.dart b/examples/layers/test/smoketests/raw/hello_world_test.dart index c46b114633..bc99b292d0 100644 --- a/examples/layers/test/smoketests/raw/hello_world_test.dart +++ b/examples/layers/test/smoketests/raw/hello_world_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../raw/hello_world.dart' as demo; diff --git a/examples/layers/test/smoketests/raw/spinning_square_test.dart b/examples/layers/test/smoketests/raw/spinning_square_test.dart index e289f2b79c..78c1aae9ce 100644 --- a/examples/layers/test/smoketests/raw/spinning_square_test.dart +++ b/examples/layers/test/smoketests/raw/spinning_square_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../raw/spinning_square.dart' as demo; diff --git a/examples/layers/test/smoketests/raw/text_test.dart b/examples/layers/test/smoketests/raw/text_test.dart index 1ba1d38b47..1c7a17cc15 100644 --- a/examples/layers/test/smoketests/raw/text_test.dart +++ b/examples/layers/test/smoketests/raw/text_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../raw/text.dart' as demo; diff --git a/examples/layers/test/smoketests/raw/touch_input_test.dart b/examples/layers/test/smoketests/raw/touch_input_test.dart index 09065d0a48..cf3abc3d92 100644 --- a/examples/layers/test/smoketests/raw/touch_input_test.dart +++ b/examples/layers/test/smoketests/raw/touch_input_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../raw/touch_input.dart' as demo; diff --git a/examples/layers/test/smoketests/rendering/custom_coordinate_systems_test.dart b/examples/layers/test/smoketests/rendering/custom_coordinate_systems_test.dart index 332d2a1519..cb448d7cfb 100644 --- a/examples/layers/test/smoketests/rendering/custom_coordinate_systems_test.dart +++ b/examples/layers/test/smoketests/rendering/custom_coordinate_systems_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../rendering/custom_coordinate_systems.dart' as demo; diff --git a/examples/layers/test/smoketests/rendering/flex_layout_test.dart b/examples/layers/test/smoketests/rendering/flex_layout_test.dart index cac9a58c84..4c8a3daa35 100644 --- a/examples/layers/test/smoketests/rendering/flex_layout_test.dart +++ b/examples/layers/test/smoketests/rendering/flex_layout_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../rendering/flex_layout.dart' as demo; diff --git a/examples/layers/test/smoketests/rendering/hello_world_test.dart b/examples/layers/test/smoketests/rendering/hello_world_test.dart index ca3bcabf9e..1a7022cc45 100644 --- a/examples/layers/test/smoketests/rendering/hello_world_test.dart +++ b/examples/layers/test/smoketests/rendering/hello_world_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../rendering/hello_world.dart' as demo; diff --git a/examples/layers/test/smoketests/rendering/spinning_square_test.dart b/examples/layers/test/smoketests/rendering/spinning_square_test.dart index ab0621c887..db39d12990 100644 --- a/examples/layers/test/smoketests/rendering/spinning_square_test.dart +++ b/examples/layers/test/smoketests/rendering/spinning_square_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../rendering/spinning_square.dart' as demo; diff --git a/examples/layers/test/smoketests/rendering/touch_input_test.dart b/examples/layers/test/smoketests/rendering/touch_input_test.dart index 0ffd5eda58..cc0af3c2a7 100644 --- a/examples/layers/test/smoketests/rendering/touch_input_test.dart +++ b/examples/layers/test/smoketests/rendering/touch_input_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import '../../../rendering/touch_input.dart' as demo; diff --git a/examples/layers/test/smoketests/widgets/spinning_mixed_test.dart b/examples/layers/test/smoketests/widgets/spinning_mixed_test.dart index 090a19ecf7..fc41da48b7 100644 --- a/examples/layers/test/smoketests/widgets/spinning_mixed_test.dart +++ b/examples/layers/test/smoketests/widgets/spinning_mixed_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import 'package:flutter_test/flutter_test.dart'; import '../../../widgets/spinning_mixed.dart' as demo; diff --git a/examples/platform_channel/pubspec.yaml b/examples/platform_channel/pubspec.yaml index b75386e482..ee0f2d0229 100644 --- a/examples/platform_channel/pubspec.yaml +++ b/examples/platform_channel/pubspec.yaml @@ -22,11 +22,11 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -36,7 +36,7 @@ dev_dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -56,9 +56,9 @@ dev_dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -68,4 +68,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: d5b8 +# PUBSPEC CHECKSUM: 0264 diff --git a/examples/platform_channel/test_driver/button_tap_test.dart b/examples/platform_channel/test_driver/button_tap_test.dart index adf5467fda..b2e38b2ed1 100644 --- a/examples/platform_channel/test_driver/button_tap_test.dart +++ b/examples/platform_channel/test_driver/button_tap_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('button tap test', () { diff --git a/examples/platform_channel_swift/pubspec.yaml b/examples/platform_channel_swift/pubspec.yaml index 0926bc0061..cc33a8ebb9 100644 --- a/examples/platform_channel_swift/pubspec.yaml +++ b/examples/platform_channel_swift/pubspec.yaml @@ -22,11 +22,11 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -36,7 +36,7 @@ dev_dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -56,9 +56,9 @@ dev_dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -68,4 +68,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: d5b8 +# PUBSPEC CHECKSUM: 0264 diff --git a/examples/platform_channel_swift/test_driver/button_tap_test.dart b/examples/platform_channel_swift/test_driver/button_tap_test.dart index e39cb5a591..5b185ddb47 100644 --- a/examples/platform_channel_swift/test_driver/button_tap_test.dart +++ b/examples/platform_channel_swift/test_driver/button_tap_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('button tap test', () { diff --git a/examples/stocks/pubspec.yaml b/examples/stocks/pubspec.yaml index 5ff477d950..b1eb751c6f 100644 --- a/examples/stocks/pubspec.yaml +++ b/examples/stocks/pubspec.yaml @@ -16,15 +16,15 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dart_style: 1.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -32,7 +32,7 @@ dependencies: plugin: 0.2.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -46,7 +46,7 @@ dev_dependencies: sdk: flutter boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -66,11 +66,11 @@ dev_dependencies: source_maps: 0.10.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 1ddc +# PUBSPEC CHECKSUM: 1588 diff --git a/examples/stocks/test_driver/scroll_perf_test.dart b/examples/stocks/test_driver/scroll_perf_test.dart index 304549fe82..8c5f0ca853 100644 --- a/examples/stocks/test_driver/scroll_perf_test.dart +++ b/examples/stocks/test_driver/scroll_perf_test.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { group('scrolling performance test', () { diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index 3b3bef369e..55af75d63f 100644 --- a/packages/flutter/pubspec.yaml +++ b/packages/flutter/pubspec.yaml @@ -27,11 +27,11 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -41,17 +41,17 @@ dev_dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - platform: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" plugin: 0.2.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.3.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - process: 3.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + process: 3.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" quiver: 2.0.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -63,13 +63,13 @@ dev_dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 39ca +# PUBSPEC CHECKSUM: dc77 diff --git a/packages/flutter/test/engine/color_test.dart b/packages/flutter/test/engine/color_test.dart index 0a6d2fa2c1..ed9144e49f 100644 --- a/packages/flutter/test/engine/color_test.dart +++ b/packages/flutter/test/engine/color_test.dart @@ -4,7 +4,7 @@ import 'dart:ui'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { test('color accessors should work', () { diff --git a/packages/flutter/test/engine/dart_test.dart b/packages/flutter/test/engine/dart_test.dart index 7efe12f9d1..86e59667e4 100644 --- a/packages/flutter/test/engine/dart_test.dart +++ b/packages/flutter/test/engine/dart_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; /// Verifies Dart semantics governed by flags set by Flutter tooling. void main() { diff --git a/packages/flutter/test/engine/paragraph_builder_test.dart b/packages/flutter/test/engine/paragraph_builder_test.dart index 552dcd0e59..eb46f31799 100644 --- a/packages/flutter/test/engine/paragraph_builder_test.dart +++ b/packages/flutter/test/engine/paragraph_builder_test.dart @@ -4,7 +4,7 @@ import 'dart:ui'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { test('Should be able to build and layout a paragraph', () { diff --git a/packages/flutter/test/engine/rect_test.dart b/packages/flutter/test/engine/rect_test.dart index dfdf9933f4..f478f3a113 100644 --- a/packages/flutter/test/engine/rect_test.dart +++ b/packages/flutter/test/engine/rect_test.dart @@ -4,7 +4,7 @@ import 'dart:ui'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { test('rect accessors', () { diff --git a/packages/flutter/test/engine/rrect_test.dart b/packages/flutter/test/engine/rrect_test.dart index a5a4d14bba..06140102e7 100644 --- a/packages/flutter/test/engine/rrect_test.dart +++ b/packages/flutter/test/engine/rrect_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/painting.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { test('RRect.contains()', () { diff --git a/packages/flutter/test/engine/task_order_test.dart b/packages/flutter/test/engine/task_order_test.dart index 3ae150ed50..6eadd945fb 100644 --- a/packages/flutter/test/engine/task_order_test.dart +++ b/packages/flutter/test/engine/task_order_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; void main() { test('Message loop flushes microtasks between iterations', () async { diff --git a/packages/flutter/test/examples/sector_layout_test.dart b/packages/flutter/test/examples/sector_layout_test.dart index 64a9f196e5..ed599ceebd 100644 --- a/packages/flutter/test/examples/sector_layout_test.dart +++ b/packages/flutter/test/examples/sector_layout_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import 'package:flutter_test/flutter_test.dart'; import '../../../../examples/layers/rendering/custom_coordinate_systems.dart'; import '../rendering/rendering_tester.dart'; diff --git a/packages/flutter/test/flutter_test_alternative.dart b/packages/flutter/test/flutter_test_alternative.dart new file mode 100644 index 0000000000..79d7310b12 --- /dev/null +++ b/packages/flutter/test/flutter_test_alternative.dart @@ -0,0 +1,14 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Defines a 'package:test' shim. +// TODO(ianh): Remove this file once https://github.com/dart-lang/matcher/issues/98 is fixed + +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; +import 'package:test/test.dart' as test_package show TypeMatcher; + +export 'package:test/test.dart' hide TypeMatcher, isInstanceOf; + +/// A matcher that compares the type of the actual value to the type argument T. +Matcher isInstanceOf() => new test_package.TypeMatcher(); // ignore: prefer_const_constructors, https://github.com/dart-lang/sdk/issues/32544 diff --git a/packages/flutter/test/foundation/assertions_test.dart b/packages/flutter/test/foundation/assertions_test.dart index edbc079760..a2ff96a829 100644 --- a/packages/flutter/test/foundation/assertions_test.dart +++ b/packages/flutter/test/foundation/assertions_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'capture_output.dart'; diff --git a/packages/flutter/test/foundation/bit_field_test.dart b/packages/flutter/test/foundation/bit_field_test.dart index bd14f04e2e..a9a388a2c9 100644 --- a/packages/flutter/test/foundation/bit_field_test.dart +++ b/packages/flutter/test/foundation/bit_field_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; enum _TestEnum { a, b, c, d, e, f, g, h, diff --git a/packages/flutter/test/foundation/caching_iterable_test.dart b/packages/flutter/test/foundation/caching_iterable_test.dart index 42f7b2288f..beedf3468e 100644 --- a/packages/flutter/test/foundation/caching_iterable_test.dart +++ b/packages/flutter/test/foundation/caching_iterable_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; int yieldCount; diff --git a/packages/flutter/test/foundation/consolidate_response_test.dart b/packages/flutter/test/foundation/consolidate_response_test.dart index 13293ea8ca..bcd15058c2 100644 --- a/packages/flutter/test/foundation/consolidate_response_test.dart +++ b/packages/flutter/test/foundation/consolidate_response_test.dart @@ -1,10 +1,15 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'dart:async'; import 'dart:io'; import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; import 'package:mockito/mockito.dart'; +import '../flutter_test_alternative.dart'; + void main() { group(consolidateHttpClientResponseBytes, () { final List chunkOne = [0, 1, 2, 3, 4, 5]; @@ -86,7 +91,7 @@ void main() { when(response.contentLength).thenReturn(-1); expect(consolidateHttpClientResponseBytes(response), - throwsA(const isInstanceOf())); + throwsA(isInstanceOf())); }); }); } diff --git a/packages/flutter/test/foundation/error_reporting_test.dart b/packages/flutter/test/foundation/error_reporting_test.dart index ef8d9aeab4..dabc49cd12 100644 --- a/packages/flutter/test/foundation/error_reporting_test.dart +++ b/packages/flutter/test/foundation/error_reporting_test.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; dynamic getAssertionErrorWithMessage() { try { diff --git a/packages/flutter/test/foundation/licenses_test.dart b/packages/flutter/test/foundation/licenses_test.dart index d19fbd427c..b223383a99 100644 --- a/packages/flutter/test/foundation/licenses_test.dart +++ b/packages/flutter/test/foundation/licenses_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('LicenseEntryWithLineBreaks - most cases', () { diff --git a/packages/flutter/test/foundation/print_test.dart b/packages/flutter/test/foundation/print_test.dart index 224289ffa1..c56135df9e 100644 --- a/packages/flutter/test/foundation/print_test.dart +++ b/packages/flutter/test/foundation/print_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart'; import 'package:quiver/testing/async.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'capture_output.dart'; diff --git a/packages/flutter/test/foundation/profile_test.dart b/packages/flutter/test/foundation/profile_test.dart index b8f73b4906..ec5d54ba95 100644 --- a/packages/flutter/test/foundation/profile_test.dart +++ b/packages/flutter/test/foundation/profile_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; // We run our tests in debug mode, to this will always evaluate to false... const bool isReleaseMode = bool.fromEnvironment('dart.vm.product'); diff --git a/packages/flutter/test/foundation/reassemble_test.dart b/packages/flutter/test/foundation/reassemble_test.dart index 952965d3f5..6c4ec7ea6d 100644 --- a/packages/flutter/test/foundation/reassemble_test.dart +++ b/packages/flutter/test/foundation/reassemble_test.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; class TestFoundationFlutterBinding extends BindingBase { bool wasLocked; diff --git a/packages/flutter/test/foundation/serialization_test.dart b/packages/flutter/test/foundation/serialization_test.dart index 595ae19896..73f9809fde 100644 --- a/packages/flutter/test/foundation/serialization_test.dart +++ b/packages/flutter/test/foundation/serialization_test.dart @@ -5,7 +5,7 @@ import 'dart:typed_data'; import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { group('Write and read buffer round-trip', () { diff --git a/packages/flutter/test/foundation/service_extensions_test.dart b/packages/flutter/test/foundation/service_extensions_test.dart index 0790859578..bc29aec989 100644 --- a/packages/flutter/test/foundation/service_extensions_test.dart +++ b/packages/flutter/test/foundation/service_extensions_test.dart @@ -13,7 +13,7 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; class TestServiceExtensionsBinding extends BindingBase with ServicesBinding, diff --git a/packages/flutter/test/foundation/stack_trace_test.dart b/packages/flutter/test/foundation/stack_trace_test.dart index e4c9aa60a9..daf726ee51 100644 --- a/packages/flutter/test/foundation/stack_trace_test.dart +++ b/packages/flutter/test/foundation/stack_trace_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { // TODO(8128): These tests and the filtering mechanism should be revisited to account for causal async stack traces. diff --git a/packages/flutter/test/foundation/synchronous_future_test.dart b/packages/flutter/test/foundation/synchronous_future_test.dart index a1350ff29f..73199ba23e 100644 --- a/packages/flutter/test/foundation/synchronous_future_test.dart +++ b/packages/flutter/test/foundation/synchronous_future_test.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('SynchronousFuture control test', () async { diff --git a/packages/flutter/test/gestures/arena_test.dart b/packages/flutter/test/gestures/arena_test.dart index 38931be6b8..437a1f12ce 100644 --- a/packages/flutter/test/gestures/arena_test.dart +++ b/packages/flutter/test/gestures/arena_test.dart @@ -3,7 +3,8 @@ // found in the LICENSE file. import 'package:flutter/gestures.dart'; -import 'package:test/test.dart'; + +import '../flutter_test_alternative.dart'; typedef void GestureArenaCallback(Object key); diff --git a/packages/flutter/test/gestures/double_tap_test.dart b/packages/flutter/test/gestures/double_tap_test.dart index 3e04ef1782..8f6a0193ce 100644 --- a/packages/flutter/test/gestures/double_tap_test.dart +++ b/packages/flutter/test/gestures/double_tap_test.dart @@ -4,8 +4,8 @@ import 'package:flutter/gestures.dart'; import 'package:quiver/testing/async.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'gesture_tester.dart'; class TestGestureArenaMember extends GestureArenaMember { diff --git a/packages/flutter/test/gestures/gesture_binding_test.dart b/packages/flutter/test/gestures/gesture_binding_test.dart index 0aa89c373d..0ed89703f3 100644 --- a/packages/flutter/test/gestures/gesture_binding_test.dart +++ b/packages/flutter/test/gestures/gesture_binding_test.dart @@ -6,7 +6,8 @@ import 'dart:ui' as ui; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:test/test.dart'; + +import '../flutter_test_alternative.dart'; typedef void HandleEventCallback(PointerEvent event); diff --git a/packages/flutter/test/gestures/gesture_tester.dart b/packages/flutter/test/gestures/gesture_tester.dart index 4f88224413..227b86a1e9 100644 --- a/packages/flutter/test/gestures/gesture_tester.dart +++ b/packages/flutter/test/gestures/gesture_tester.dart @@ -5,9 +5,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:meta/meta.dart'; -import 'package:test/test.dart'; import 'package:quiver/testing/async.dart'; +import '../flutter_test_alternative.dart'; + class TestGestureFlutterBinding extends BindingBase with GestureBinding { } void ensureGestureBinding() { diff --git a/packages/flutter/test/gestures/locking_test.dart b/packages/flutter/test/gestures/locking_test.dart index 923c4a0854..e0cbf180a3 100644 --- a/packages/flutter/test/gestures/locking_test.dart +++ b/packages/flutter/test/gestures/locking_test.dart @@ -7,7 +7,8 @@ import 'dart:ui' as ui; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:test/test.dart'; + +import '../flutter_test_alternative.dart'; typedef void HandleEventCallback(PointerEvent event); diff --git a/packages/flutter/test/gestures/long_press_test.dart b/packages/flutter/test/gestures/long_press_test.dart index f2c8b7c8b0..524a4a71b1 100644 --- a/packages/flutter/test/gestures/long_press_test.dart +++ b/packages/flutter/test/gestures/long_press_test.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:flutter/gestures.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'gesture_tester.dart'; const PointerDownEvent down = PointerDownEvent( diff --git a/packages/flutter/test/gestures/lsq_solver_test.dart b/packages/flutter/test/gestures/lsq_solver_test.dart index c61cbd7b56..0fcf4923c3 100644 --- a/packages/flutter/test/gestures/lsq_solver_test.dart +++ b/packages/flutter/test/gestures/lsq_solver_test.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:flutter/gestures.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { bool approx(double value, double expectation) { diff --git a/packages/flutter/test/gestures/tap_test.dart b/packages/flutter/test/gestures/tap_test.dart index fcf9094438..e0edb1ebb2 100644 --- a/packages/flutter/test/gestures/tap_test.dart +++ b/packages/flutter/test/gestures/tap_test.dart @@ -4,8 +4,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'gesture_tester.dart'; class TestGestureArenaMember extends GestureArenaMember { diff --git a/packages/flutter/test/harness/trivial_test.dart b/packages/flutter/test/harness/trivial_test.dart index f9326ffaa0..7d97684b81 100644 --- a/packages/flutter/test/harness/trivial_test.dart +++ b/packages/flutter/test/harness/trivial_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('should pass', () { diff --git a/packages/flutter/test/material/animated_icons_private_test.dart b/packages/flutter/test/material/animated_icons_private_test.dart index e83f6a1297..7d69c9a58d 100644 --- a/packages/flutter/test/material/animated_icons_private_test.dart +++ b/packages/flutter/test/material/animated_icons_private_test.dart @@ -17,7 +17,8 @@ import 'package:flutter/animation.dart'; import 'package:flutter/widgets.dart'; import 'package:meta/meta.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; + +import '../flutter_test_alternative.dart'; part 'package:flutter/src/material/animated_icons/animated_icons.dart'; part 'package:flutter/src/material/animated_icons/animated_icons_data.dart'; diff --git a/packages/flutter/test/material/colors_test.dart b/packages/flutter/test/material/colors_test.dart index c61178c043..243fb79cf7 100644 --- a/packages/flutter/test/material/colors_test.dart +++ b/packages/flutter/test/material/colors_test.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; - import 'package:flutter/material.dart'; +import '../flutter_test_alternative.dart'; + const List primaryKeys = [50, 100, 200, 300, 400, 500, 600, 700, 800, 900]; const List accentKeys = [100, 200, 400, 700]; diff --git a/packages/flutter/test/painting/box_fit_test.dart b/packages/flutter/test/painting/box_fit_test.dart index 9f4e33262a..a95f537e5a 100644 --- a/packages/flutter/test/painting/box_fit_test.dart +++ b/packages/flutter/test/painting/box_fit_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/painting.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('applyBoxFit', () { diff --git a/packages/flutter/test/painting/decoration_test.dart b/packages/flutter/test/painting/decoration_test.dart index d227bbaba8..78ac761685 100644 --- a/packages/flutter/test/painting/decoration_test.dart +++ b/packages/flutter/test/painting/decoration_test.dart @@ -9,7 +9,7 @@ import 'dart:ui' as ui show Image, ImageByteFormat, ColorFilter; import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; import 'package:quiver/testing/async.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import '../painting/mocks_for_image_cache.dart'; import '../rendering/rendering_tester.dart'; @@ -227,10 +227,10 @@ void main() { final Invocation call = canvas.invocations.singleWhere((Invocation call) => call.memberName == #drawImageNine); expect(call.isMethod, isTrue); expect(call.positionalArguments, hasLength(4)); - expect(call.positionalArguments[0], const isInstanceOf()); + expect(call.positionalArguments[0], isInstanceOf()); expect(call.positionalArguments[1], new Rect.fromLTRB(10.0, 20.0, 40.0, 60.0)); expect(call.positionalArguments[2], new Rect.fromLTRB(0.0, 0.0, 100.0, 100.0)); - expect(call.positionalArguments[3], const isInstanceOf()); + expect(call.positionalArguments[3], isInstanceOf()); expect(call.positionalArguments[3].isAntiAlias, false); expect(call.positionalArguments[3].colorFilter, colorFilter); expect(call.positionalArguments[3].filterQuality, FilterQuality.low); @@ -342,9 +342,9 @@ void main() { }); test('Decoration.lerp with unrelated decorations', () { - expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.0), const isInstanceOf()); // ignore: CONST_EVAL_THROWS_EXCEPTION - expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.25), const isInstanceOf()); // ignore: CONST_EVAL_THROWS_EXCEPTION - expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.75), const isInstanceOf()); // ignore: CONST_EVAL_THROWS_EXCEPTION - expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 1.0), const isInstanceOf()); // ignore: CONST_EVAL_THROWS_EXCEPTION + expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.0), isInstanceOf()); // ignore: CONST_EVAL_THROWS_EXCEPTION + expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.25), isInstanceOf()); // ignore: CONST_EVAL_THROWS_EXCEPTION + expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 0.75), isInstanceOf()); // ignore: CONST_EVAL_THROWS_EXCEPTION + expect(Decoration.lerp(const FlutterLogoDecoration(), const BoxDecoration(), 1.0), isInstanceOf()); // ignore: CONST_EVAL_THROWS_EXCEPTION }); } diff --git a/packages/flutter/test/painting/geometry_test.dart b/packages/flutter/test/painting/geometry_test.dart index af9be0f7c0..ba6afa0e99 100644 --- a/packages/flutter/test/painting/geometry_test.dart +++ b/packages/flutter/test/painting/geometry_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/painting.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('positionDependentBox', () { diff --git a/packages/flutter/test/painting/image_cache_resize_test.dart b/packages/flutter/test/painting/image_cache_resize_test.dart index bb0c040c8e..adbf16e3c0 100644 --- a/packages/flutter/test/painting/image_cache_resize_test.dart +++ b/packages/flutter/test/painting/image_cache_resize_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/painting.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import '../rendering/rendering_tester.dart'; import 'mocks_for_image_cache.dart'; diff --git a/packages/flutter/test/painting/image_cache_test.dart b/packages/flutter/test/painting/image_cache_test.dart index b42c7398dc..a7b660a803 100644 --- a/packages/flutter/test/painting/image_cache_test.dart +++ b/packages/flutter/test/painting/image_cache_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/painting.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import '../rendering/rendering_tester.dart'; import 'mocks_for_image_cache.dart'; diff --git a/packages/flutter/test/painting/image_decoder_test.dart b/packages/flutter/test/painting/image_decoder_test.dart index e693723946..8fb8d2faa3 100644 --- a/packages/flutter/test/painting/image_decoder_test.dart +++ b/packages/flutter/test/painting/image_decoder_test.dart @@ -6,7 +6,7 @@ import 'dart:typed_data'; import 'dart:ui' as ui; import 'package:flutter/painting.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'image_data.dart'; diff --git a/packages/flutter/test/painting/paint_image_test.dart b/packages/flutter/test/painting/paint_image_test.dart index 164de8a9f9..6da7109fa1 100644 --- a/packages/flutter/test/painting/paint_image_test.dart +++ b/packages/flutter/test/painting/paint_image_test.dart @@ -8,7 +8,7 @@ import 'dart:ui' as ui; import 'package:flutter/painting.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; class TestImage implements ui.Image { TestImage({ this.width, this.height }); diff --git a/packages/flutter/test/painting/text_span_test.dart b/packages/flutter/test/painting/text_span_test.dart index 4dc3cae5b9..9b0126a198 100644 --- a/packages/flutter/test/painting/text_span_test.dart +++ b/packages/flutter/test/painting/text_span_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/painting.dart'; import 'package:flutter_test/flutter_test.dart' show nonconst; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('TextSpan equals', () { diff --git a/packages/flutter/test/painting/text_style_test.dart b/packages/flutter/test/painting/text_style_test.dart index 656485a2ba..de4fb470db 100644 --- a/packages/flutter/test/painting/text_style_test.dart +++ b/packages/flutter/test/painting/text_style_test.dart @@ -5,7 +5,7 @@ import 'dart:ui' as ui show TextStyle, ParagraphStyle; import 'package:flutter/painting.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('TextStyle control test', () { diff --git a/packages/flutter/test/physics/near_equal_test.dart b/packages/flutter/test/physics/near_equal_test.dart index 0a10efdc0e..41b91db030 100644 --- a/packages/flutter/test/physics/near_equal_test.dart +++ b/packages/flutter/test/physics/near_equal_test.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; - import 'package:flutter/physics.dart'; +import '../flutter_test_alternative.dart'; + void main() { test('test_friction', () { expect(nearEqual(5.0, 6.0, 2.0), isTrue); diff --git a/packages/flutter/test/physics/newton_test.dart b/packages/flutter/test/physics/newton_test.dart index 3055bb8d5a..c2b43583a9 100644 --- a/packages/flutter/test/physics/newton_test.dart +++ b/packages/flutter/test/physics/newton_test.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; - import 'package:flutter/physics.dart'; import 'package:flutter/widgets.dart'; +import '../flutter_test_alternative.dart'; + void main() { test('test_friction', () { final FrictionSimulation friction = new FrictionSimulation(0.3, 100.0, 400.0); diff --git a/packages/flutter/test/rendering/annotated_region_test.dart b/packages/flutter/test/rendering/annotated_region_test.dart index e0d9c76b81..3cb8a8b45b 100644 --- a/packages/flutter/test/rendering/annotated_region_test.dart +++ b/packages/flutter/test/rendering/annotated_region_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { group(AnnotatedRegion, () { diff --git a/packages/flutter/test/rendering/aspect_ratio_test.dart b/packages/flutter/test/rendering/aspect_ratio_test.dart index 66b878b43e..ff4aa6b5e6 100644 --- a/packages/flutter/test/rendering/aspect_ratio_test.dart +++ b/packages/flutter/test/rendering/aspect_ratio_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; void main() { diff --git a/packages/flutter/test/rendering/baseline_test.dart b/packages/flutter/test/rendering/baseline_test.dart index 2603dd1873..02d7ea11ce 100644 --- a/packages/flutter/test/rendering/baseline_test.dart +++ b/packages/flutter/test/rendering/baseline_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/box_constraints_test.dart b/packages/flutter/test/rendering/box_constraints_test.dart index 46abd8127c..952c769286 100644 --- a/packages/flutter/test/rendering/box_constraints_test.dart +++ b/packages/flutter/test/rendering/box_constraints_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('BoxConstraints toString', () { @@ -153,9 +153,9 @@ void main() { minHeight: 20.0, maxHeight: 30.0, ); - expect(() => BoxConstraints.lerp(constraints1, constraints2, 0.5), throwsA(const isInstanceOf())); - expect(() => BoxConstraints.lerp(constraints1, constraints3, 0.5), throwsA(const isInstanceOf())); - expect(() => BoxConstraints.lerp(constraints2, constraints3, 0.5), throwsA(const isInstanceOf())); + expect(() => BoxConstraints.lerp(constraints1, constraints2, 0.5), throwsA(isInstanceOf())); + expect(() => BoxConstraints.lerp(constraints1, constraints3, 0.5), throwsA(isInstanceOf())); + expect(() => BoxConstraints.lerp(constraints2, constraints3, 0.5), throwsA(isInstanceOf())); }); test('BoxConstraints normalize', () { diff --git a/packages/flutter/test/rendering/cached_intrinsics_test.dart b/packages/flutter/test/rendering/cached_intrinsics_test.dart index 2b21c94e6a..c167a639ce 100644 --- a/packages/flutter/test/rendering/cached_intrinsics_test.dart +++ b/packages/flutter/test/rendering/cached_intrinsics_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; class RenderTestBox extends RenderBox { double value = 0.0; diff --git a/packages/flutter/test/rendering/constraints_test.dart b/packages/flutter/test/rendering/constraints_test.dart index 0599041f96..4a8dbc026b 100644 --- a/packages/flutter/test/rendering/constraints_test.dart +++ b/packages/flutter/test/rendering/constraints_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/debug_test.dart b/packages/flutter/test/rendering/debug_test.dart index 1b35885430..f4a8d6dca5 100644 --- a/packages/flutter/test/rendering/debug_test.dart +++ b/packages/flutter/test/rendering/debug_test.dart @@ -4,9 +4,9 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; import 'package:vector_math/vector_math_64.dart'; +import '../flutter_test_alternative.dart'; import 'mock_canvas.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/dynamic_intrinsics_test.dart b/packages/flutter/test/rendering/dynamic_intrinsics_test.dart index b976ec49b8..4cc6a598b3 100644 --- a/packages/flutter/test/rendering/dynamic_intrinsics_test.dart +++ b/packages/flutter/test/rendering/dynamic_intrinsics_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/independent_layout_test.dart b/packages/flutter/test/rendering/independent_layout_test.dart index 0d9a688c95..72fce9141a 100644 --- a/packages/flutter/test/rendering/independent_layout_test.dart +++ b/packages/flutter/test/rendering/independent_layout_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/intrinsic_width_test.dart b/packages/flutter/test/rendering/intrinsic_width_test.dart index 9648d2c516..abe4cfd66f 100644 --- a/packages/flutter/test/rendering/intrinsic_width_test.dart +++ b/packages/flutter/test/rendering/intrinsic_width_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/mutations_test.dart b/packages/flutter/test/rendering/mutations_test.dart index 33c90a1255..a554a29794 100644 --- a/packages/flutter/test/rendering/mutations_test.dart +++ b/packages/flutter/test/rendering/mutations_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/non_render_object_root_test.dart b/packages/flutter/test/rendering/non_render_object_root_test.dart index 037654a155..0ec6a3cd7d 100644 --- a/packages/flutter/test/rendering/non_render_object_root_test.dart +++ b/packages/flutter/test/rendering/non_render_object_root_test.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/object_test.dart b/packages/flutter/test/rendering/object_test.dart index 37a17a2b11..afd2a3098f 100644 --- a/packages/flutter/test/rendering/object_test.dart +++ b/packages/flutter/test/rendering/object_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('ensure frame is scheduled for markNeedsSemanticsUpdate', () { diff --git a/packages/flutter/test/rendering/offstage_test.dart b/packages/flutter/test/rendering/offstage_test.dart index 6a60cca7ff..a4a9f70dd1 100644 --- a/packages/flutter/test/rendering/offstage_test.dart +++ b/packages/flutter/test/rendering/offstage_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/overflow_test.dart b/packages/flutter/test/rendering/overflow_test.dart index b1c3c72961..7303a36254 100644 --- a/packages/flutter/test/rendering/overflow_test.dart +++ b/packages/flutter/test/rendering/overflow_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/paragraph_intrinsics_test.dart b/packages/flutter/test/rendering/paragraph_intrinsics_test.dart index 74214a5fa9..d8f76bba56 100644 --- a/packages/flutter/test/rendering/paragraph_intrinsics_test.dart +++ b/packages/flutter/test/rendering/paragraph_intrinsics_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('list body and paragraph intrinsics', () { diff --git a/packages/flutter/test/rendering/positioned_box_test.dart b/packages/flutter/test/rendering/positioned_box_test.dart index f726862ac6..bb10b42f3a 100644 --- a/packages/flutter/test/rendering/positioned_box_test.dart +++ b/packages/flutter/test/rendering/positioned_box_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/proxy_box_test.dart b/packages/flutter/test/rendering/proxy_box_test.dart index 0671515dd3..4985f24fde 100644 --- a/packages/flutter/test/rendering/proxy_box_test.dart +++ b/packages/flutter/test/rendering/proxy_box_test.dart @@ -10,7 +10,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/src/scheduler/ticker.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/proxy_getters_and_setters_test.dart b/packages/flutter/test/rendering/proxy_getters_and_setters_test.dart index 65a4390782..6bddf6897e 100644 --- a/packages/flutter/test/rendering/proxy_getters_and_setters_test.dart +++ b/packages/flutter/test/rendering/proxy_getters_and_setters_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('RenderConstrainedBox getters and setters', () { diff --git a/packages/flutter/test/rendering/reattach_test.dart b/packages/flutter/test/rendering/reattach_test.dart index 2ed3754dde..ca946d1d0f 100644 --- a/packages/flutter/test/rendering/reattach_test.dart +++ b/packages/flutter/test/rendering/reattach_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/relative_rect_test.dart b/packages/flutter/test/rendering/relative_rect_test.dart index 020aef0583..ef9e2e4a43 100644 --- a/packages/flutter/test/rendering/relative_rect_test.dart +++ b/packages/flutter/test/rendering/relative_rect_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('RelativeRect.==', () { diff --git a/packages/flutter/test/rendering/repaint_boundary_test.dart b/packages/flutter/test/rendering/repaint_boundary_test.dart index abccad6eed..f9e145aec9 100644 --- a/packages/flutter/test/rendering/repaint_boundary_test.dart +++ b/packages/flutter/test/rendering/repaint_boundary_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/semantics_and_children_test.dart b/packages/flutter/test/rendering/semantics_and_children_test.dart index 6d945d4174..7bd70bb26c 100644 --- a/packages/flutter/test/rendering/semantics_and_children_test.dart +++ b/packages/flutter/test/rendering/semantics_and_children_test.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart' show TestVSync; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/simple_semantics_test.dart b/packages/flutter/test/rendering/simple_semantics_test.dart index 96274093fa..b305db2e2d 100644 --- a/packages/flutter/test/rendering/simple_semantics_test.dart +++ b/packages/flutter/test/rendering/simple_semantics_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/size_test.dart b/packages/flutter/test/rendering/size_test.dart index 1548ba2242..05fd72edfa 100644 --- a/packages/flutter/test/rendering/size_test.dart +++ b/packages/flutter/test/rendering/size_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/sliver_cache_test.dart b/packages/flutter/test/rendering/sliver_cache_test.dart index 91ca7a834f..0f1e1aa316 100644 --- a/packages/flutter/test/rendering/sliver_cache_test.dart +++ b/packages/flutter/test/rendering/sliver_cache_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/slivers_block_test.dart b/packages/flutter/test/rendering/slivers_block_test.dart index f815cd51b5..52115dad3f 100644 --- a/packages/flutter/test/rendering/slivers_block_test.dart +++ b/packages/flutter/test/rendering/slivers_block_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/rendering.dart'; import 'package:meta/meta.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/slivers_layout_test.dart b/packages/flutter/test/rendering/slivers_layout_test.dart index 00550c0afb..6f8fa0ce41 100644 --- a/packages/flutter/test/rendering/slivers_layout_test.dart +++ b/packages/flutter/test/rendering/slivers_layout_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/stack_test.dart b/packages/flutter/test/rendering/stack_test.dart index 25ccdfe874..a6fd9030d1 100644 --- a/packages/flutter/test/rendering/stack_test.dart +++ b/packages/flutter/test/rendering/stack_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/rendering/transform_test.dart b/packages/flutter/test/rendering/transform_test.dart index f174438417..8b10bed50a 100644 --- a/packages/flutter/test/rendering/transform_test.dart +++ b/packages/flutter/test/rendering/transform_test.dart @@ -5,7 +5,7 @@ import 'dart:math' as math; import 'package:flutter/rendering.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'rendering_tester.dart'; diff --git a/packages/flutter/test/scheduler/animation_test.dart b/packages/flutter/test/scheduler/animation_test.dart index ab7835dde7..da766b0df8 100644 --- a/packages/flutter/test/scheduler/animation_test.dart +++ b/packages/flutter/test/scheduler/animation_test.dart @@ -5,7 +5,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; -import 'package:test/test.dart'; + +import '../flutter_test_alternative.dart'; import 'scheduler_tester.dart'; diff --git a/packages/flutter/test/scheduler/priority_test.dart b/packages/flutter/test/scheduler/priority_test.dart index 277ed2278a..6efa9769c2 100644 --- a/packages/flutter/test/scheduler/priority_test.dart +++ b/packages/flutter/test/scheduler/priority_test.dart @@ -3,7 +3,8 @@ // found in the LICENSE file. import 'package:flutter/scheduler.dart'; -import 'package:test/test.dart'; + +import '../flutter_test_alternative.dart'; void main() { test('Priority operators control test', () async { diff --git a/packages/flutter/test/scheduler/scheduler_test.dart b/packages/flutter/test/scheduler/scheduler_test.dart index 25b3b29e08..87f37ef004 100644 --- a/packages/flutter/test/scheduler/scheduler_test.dart +++ b/packages/flutter/test/scheduler/scheduler_test.dart @@ -6,7 +6,8 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; -import 'package:test/test.dart'; + +import '../flutter_test_alternative.dart'; class TestSchedulerBinding extends BindingBase with ServicesBinding, SchedulerBinding { } diff --git a/packages/flutter/test/semantics/custom_semantics_action_test.dart b/packages/flutter/test/semantics/custom_semantics_action_test.dart index 9a7253ed23..06f6ea9279 100644 --- a/packages/flutter/test/semantics/custom_semantics_action_test.dart +++ b/packages/flutter/test/semantics/custom_semantics_action_test.dart @@ -1,6 +1,11 @@ -import 'package:test/test.dart'; +// Copyright 2015 The Chromium Authors. 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:flutter/semantics.dart'; +import '../flutter_test_alternative.dart'; + void main() { group(CustomSemanticsAction, () { diff --git a/packages/flutter/test/semantics/semantics_service_test.dart b/packages/flutter/test/semantics/semantics_service_test.dart index 6be6394ed2..a21358e736 100644 --- a/packages/flutter/test/semantics/semantics_service_test.dart +++ b/packages/flutter/test/semantics/semantics_service_test.dart @@ -6,7 +6,8 @@ import 'dart:ui' show TextDirection; import 'package:flutter/semantics.dart'; import 'package:flutter/services.dart' show SystemChannels; -import 'package:test/test.dart'; + +import '../flutter_test_alternative.dart'; void main() { test('Semantic announcement', () async { diff --git a/packages/flutter/test/services/message_codecs_test.dart b/packages/flutter/test/services/message_codecs_test.dart index 8ad2c88bc2..4abd1d884d 100644 --- a/packages/flutter/test/services/message_codecs_test.dart +++ b/packages/flutter/test/services/message_codecs_test.dart @@ -5,7 +5,7 @@ import 'dart:typed_data'; import 'package:flutter/services.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { group('Binary codec', () { diff --git a/packages/flutter/test/services/platform_channel_test.dart b/packages/flutter/test/services/platform_channel_test.dart index 9e11ad1865..7b3c4ccd6a 100644 --- a/packages/flutter/test/services/platform_channel_test.dart +++ b/packages/flutter/test/services/platform_channel_test.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:typed_data'; import 'package:flutter/services.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { group('BasicMessageChannel', () { @@ -215,7 +215,7 @@ void main() { await new Future.delayed(Duration.zero); expect(events, isEmpty); expect(errors, hasLength(1)); - expect(errors[0], const isInstanceOf()); + expect(errors[0], isInstanceOf()); final PlatformException error = errors[0]; expect(error.code, '404'); expect(error.message, 'Not Found.'); diff --git a/packages/flutter/test/services/platform_messages_test.dart b/packages/flutter/test/services/platform_messages_test.dart index 76deaabfd2..278bcb7390 100644 --- a/packages/flutter/test/services/platform_messages_test.dart +++ b/packages/flutter/test/services/platform_messages_test.dart @@ -5,7 +5,7 @@ import 'dart:typed_data'; import 'package:flutter/services.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { test('Mock binary message handler control test', () async { diff --git a/packages/flutter/test/services/platform_views_test.dart b/packages/flutter/test/services/platform_views_test.dart index e8159d194d..09e2b5a3c9 100644 --- a/packages/flutter/test/services/platform_views_test.dart +++ b/packages/flutter/test/services/platform_views_test.dart @@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/painting.dart'; import 'package:flutter/services.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; import 'fake_platform_views.dart'; @@ -21,7 +21,7 @@ void main() { expect( () => PlatformViewsService.initAndroidView( id: 0, viewType: 'web').setSize(const Size(100.0, 100.0)), - throwsA(const isInstanceOf())); + throwsA(isInstanceOf())); }); test('create Android views', () async { @@ -45,7 +45,7 @@ void main() { expect( () => PlatformViewsService.initAndroidView( id: 0, viewType: 'web').setSize(const Size(100.0, 100.0)), - throwsA(const isInstanceOf())); + throwsA(isInstanceOf())); }); test('dispose Android view', () async { diff --git a/packages/flutter/test/services/text_input_test.dart b/packages/flutter/test/services/text_input_test.dart index ae982fc5d5..b435ac9a9c 100644 --- a/packages/flutter/test/services/text_input_test.dart +++ b/packages/flutter/test/services/text_input_test.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; -import 'package:test/test.dart'; +import '../flutter_test_alternative.dart'; void main() { group('TextInputConfiguration', () { diff --git a/packages/flutter_driver/pubspec.yaml b/packages/flutter_driver/pubspec.yaml index 6ae2d86c7c..be942160ea 100644 --- a/packages/flutter_driver/pubspec.yaml +++ b/packages/flutter_driver/pubspec.yaml @@ -4,7 +4,7 @@ homepage: http://flutter.io author: Flutter Authors dependencies: - file: 5.0.1 + file: 5.0.4 json_rpc_2: 2.0.9 meta: 1.1.5 path: 1.6.2 @@ -23,10 +23,10 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -35,7 +35,7 @@ dependencies: js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -53,7 +53,7 @@ dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -62,8 +62,8 @@ dependencies: yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dev_dependencies: - test: 0.12.41 + test: 0.12.42 mockito: 3.0.0-beta quiver: 2.0.0+1 -# PUBSPEC CHECKSUM: 1fc6 +# PUBSPEC CHECKSUM: 7a72 diff --git a/packages/flutter_driver/test/common.dart b/packages/flutter_driver/test/common.dart new file mode 100644 index 0000000000..b36d043b0a --- /dev/null +++ b/packages/flutter_driver/test/common.dart @@ -0,0 +1,14 @@ +// Copyright 2018 The Chromium Authors. 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:test/test.dart' hide TypeMatcher, isInstanceOf; +import 'package:test/test.dart' as test_package show TypeMatcher; + +export 'package:test/test.dart' hide TypeMatcher, isInstanceOf; + +// Defines a 'package:test' shim. +// TODO(ianh): Remove this file once https://github.com/dart-lang/matcher/issues/98 is fixed + +/// A matcher that compares the type of the actual value to the type argument T. +Matcher isInstanceOf() => new test_package.TypeMatcher(); // ignore: prefer_const_constructors, https://github.com/dart-lang/sdk/issues/32544 diff --git a/packages/flutter_driver/test/flutter_driver_test.dart b/packages/flutter_driver/test/flutter_driver_test.dart index 483fccb586..be81f39b4c 100644 --- a/packages/flutter_driver/test/flutter_driver_test.dart +++ b/packages/flutter_driver/test/flutter_driver_test.dart @@ -10,9 +10,10 @@ import 'package:flutter_driver/src/driver/driver.dart'; import 'package:flutter_driver/src/driver/timeline.dart'; import 'package:json_rpc_2/json_rpc_2.dart' as rpc; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; import 'package:vm_service_client/vm_service_client.dart'; +import 'common.dart'; + /// Magical timeout value that's different from the default. const Duration _kTestTimeout = Duration(milliseconds: 1234); const String _kSerializedTestTimeout = '1234'; @@ -138,7 +139,7 @@ void main() { group('ByValueKey', () { test('restricts value types', () async { expect(() => find.byValueKey(null), - throwsA(const isInstanceOf())); + throwsA(isInstanceOf())); }); test('finds by ValueKey', () async { @@ -158,7 +159,7 @@ void main() { group('tap', () { test('requires a target reference', () async { - expect(driver.tap(null), throwsA(const isInstanceOf())); + expect(driver.tap(null), throwsA(isInstanceOf())); }); test('sends the tap command', () async { @@ -177,7 +178,7 @@ void main() { group('getText', () { test('requires a target reference', () async { - expect(driver.getText(null), throwsA(const isInstanceOf())); + expect(driver.getText(null), throwsA(isInstanceOf())); }); test('sends the getText command', () async { @@ -200,7 +201,7 @@ void main() { group('waitFor', () { test('requires a target reference', () async { - expect(driver.waitFor(null), throwsA(const isInstanceOf())); + expect(driver.waitFor(null), throwsA(isInstanceOf())); }); test('sends the waitFor command', () async { diff --git a/packages/flutter_driver/test/src/timeline_summary_test.dart b/packages/flutter_driver/test/src/timeline_summary_test.dart index c3e4352180..166fdbd425 100644 --- a/packages/flutter_driver/test/src/timeline_summary_test.dart +++ b/packages/flutter_driver/test/src/timeline_summary_test.dart @@ -8,7 +8,8 @@ import 'package:file/file.dart'; import 'package:flutter_driver/flutter_driver.dart'; import 'package:flutter_driver/src/driver/common.dart'; import 'package:path/path.dart' as path; -import 'package:test/test.dart'; + +import '../common.dart'; void main() { group('TimelineSummary', () { diff --git a/packages/flutter_driver/test/src/timeline_test.dart b/packages/flutter_driver/test/src/timeline_test.dart index 7647c18377..0d57f88630 100644 --- a/packages/flutter_driver/test/src/timeline_test.dart +++ b/packages/flutter_driver/test/src/timeline_test.dart @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; import 'package:flutter_driver/src/driver/timeline.dart'; +import '../common.dart'; + void main() { group('Timeline', () { test('parses JSON', () { diff --git a/packages/flutter_goldens/pubspec.yaml b/packages/flutter_goldens/pubspec.yaml index 743e9500dc..def33004b0 100644 --- a/packages/flutter_goldens/pubspec.yaml +++ b/packages/flutter_goldens/pubspec.yaml @@ -5,10 +5,10 @@ dependencies: flutter_test: sdk: flutter collection: 1.14.6 - file: 5.0.1 + file: 5.0.4 meta: 1.1.5 - platform: 2.1.2 - process: 3.0.3 + platform: 2.2.0 + process: 3.0.5 analyzer: 0.32.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -17,10 +17,10 @@ dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -30,7 +30,7 @@ dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -50,9 +50,9 @@ dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -64,4 +64,4 @@ dependencies: dev_dependencies: mockito: 3.0.0-beta -# PUBSPEC CHECKSUM: 39ca +# PUBSPEC CHECKSUM: dc77 diff --git a/packages/flutter_localizations/pubspec.yaml b/packages/flutter_localizations/pubspec.yaml index 6971941165..687c9b1c58 100644 --- a/packages/flutter_localizations/pubspec.yaml +++ b/packages/flutter_localizations/pubspec.yaml @@ -24,10 +24,10 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -36,7 +36,7 @@ dev_dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -55,13 +55,13 @@ dev_dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test: 0.12.41 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test: 0.12.42 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 1dd7 +# PUBSPEC CHECKSUM: 5580 diff --git a/packages/flutter_test/lib/src/goldens.dart b/packages/flutter_test/lib/src/goldens.dart index f0142ead84..ff7330f928 100644 --- a/packages/flutter_test/lib/src/goldens.dart +++ b/packages/flutter_test/lib/src/goldens.dart @@ -8,7 +8,7 @@ import 'dart:typed_data'; import 'package:flutter/foundation.dart'; import 'package:path/path.dart' as path; -import 'package:test/test.dart' show TestFailure; +import 'package:test/test.dart' as test_package show TestFailure; /// Compares rasterized image bytes against a golden image file. /// @@ -178,7 +178,7 @@ class LocalFileComparator implements GoldenFileComparator { Future compare(Uint8List imageBytes, Uri golden) async { final File goldenFile = _getFile(golden); if (!goldenFile.existsSync()) { - throw new TestFailure('Could not be compared against non-existent file: "$golden"'); + throw new test_package.TestFailure('Could not be compared against non-existent file: "$golden"'); } final List goldenBytes = await goldenFile.readAsBytes(); return _areListsEqual(imageBytes, goldenBytes); diff --git a/packages/flutter_test/lib/src/matchers.dart b/packages/flutter_test/lib/src/matchers.dart index 96f1a808be..b749b4109d 100644 --- a/packages/flutter_test/lib/src/matchers.dart +++ b/packages/flutter_test/lib/src/matchers.dart @@ -9,7 +9,7 @@ import 'dart:ui'; import 'package:meta/meta.dart'; import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; -import 'package:test/test.dart' as test_package show isInstanceOf; +import 'package:test/test.dart' as test_package show TypeMatcher; import 'package:test/src/frontend/async_matcher.dart'; // ignore: implementation_imports import 'package:flutter/foundation.dart'; @@ -191,8 +191,8 @@ final Matcher isFlutterError = isInstanceOf(); final Matcher isAssertionError = isInstanceOf(); /// A matcher that compares the type of the actual value to the type argument T. -// TODO(ianh): https://github.com/flutter/flutter/issues/18608, https://github.com/dart-lang/matcher/pull/88 -Matcher isInstanceOf() => new test_package.isInstanceOf(); // ignore: prefer_const_constructors, https://github.com/dart-lang/sdk/issues/32544 +// TODO(ianh): Remove this once https://github.com/dart-lang/matcher/issues/98 is fixed +Matcher isInstanceOf() => new test_package.TypeMatcher(); // ignore: prefer_const_constructors, https://github.com/dart-lang/sdk/issues/32544 /// Asserts that two [double]s are equal, within some tolerated error. /// diff --git a/packages/flutter_test/pubspec.yaml b/packages/flutter_test/pubspec.yaml index 42c34afe20..e5f918df52 100644 --- a/packages/flutter_test/pubspec.yaml +++ b/packages/flutter_test/pubspec.yaml @@ -8,7 +8,7 @@ dependencies: # We depend on very specific internal implementation details of the # 'test' package, which change between versions, so when upgrading # this, make sure the tests are still running correctly. - test: 0.12.41 + test: 0.12.42 # Used by golden file comparator path: 1.6.2 @@ -32,10 +32,10 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -44,7 +44,7 @@ dependencies: json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -62,7 +62,7 @@ dependencies: source_maps: 0.10.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -72,8 +72,8 @@ dependencies: yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dev_dependencies: - file: 5.0.1 + file: 5.0.4 intl: 0.15.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: d5b8 +# PUBSPEC CHECKSUM: 0264 diff --git a/packages/flutter_test/test/goldens_test.dart b/packages/flutter_test/test/goldens_test.dart index 9017356dd8..a5b50e3b13 100644 --- a/packages/flutter_test/test/goldens_test.dart +++ b/packages/flutter_test/test/goldens_test.dart @@ -7,10 +7,8 @@ import 'dart:io' as io; import 'dart:typed_data'; import 'package:file/memory.dart'; -import 'package:test/test.dart' as test_package; -import 'package:test/test.dart' hide test; - -import 'package:flutter_test/flutter_test.dart' show goldenFileComparator, LocalFileComparator; +import 'package:flutter_test/flutter_test.dart' hide test; +import 'package:flutter_test/flutter_test.dart' as test_package; const List _kExpectedBytes = [1, 2, 3]; @@ -59,7 +57,7 @@ void main() { group('goldenFileComparator', () { test('is initialized by test framework', () { expect(goldenFileComparator, isNotNull); - expect(goldenFileComparator, const isInstanceOf()); + expect(goldenFileComparator, isInstanceOf()); final LocalFileComparator comparator = goldenFileComparator; expect(comparator.basedir.path, contains('flutter_test')); }); @@ -133,7 +131,7 @@ void main() { group('fails', () { test('when golden file does not exist', () async { final Future comparison = doComparison(); - expect(comparison, throwsA(const isInstanceOf())); + expect(comparison, throwsA(isInstanceOf())); }); test('when golden bytes are leading subset of image bytes', () async { diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index e3925f8a0d..ed44f6b7e1 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -28,7 +28,6 @@ import '../runner/flutter_command.dart'; const Map _kManuallyPinnedDependencies = { // Add pinned packages here. 'mockito': '3.0.0-beta', // TODO(aam): https://github.com/dart-lang/mockito/issues/110 - 'matcher': '0.12.2+1', // TODO(ianh): https://github.com/flutter/flutter/issues/18608, https://github.com/dart-lang/matcher/pull/88 'flutter_gallery_assets': '0.1.4', // See //examples/flutter_gallery/pubspec.yaml }; diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index 0a6aacbe23..ac7e1e2200 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -12,18 +12,18 @@ dependencies: completion: 0.2.1+1 coverage: 0.12.2 crypto: 2.0.6 - file: 5.0.1 + file: 5.0.4 http: 0.11.3+17 intl: 0.15.7 json_rpc_2: 2.0.9 json_schema: 1.0.10 - linter: 0.1.58 + linter: 0.1.59 meta: 1.1.5 mustache: 1.0.2 package_config: 1.0.5 - platform: 2.1.2 + platform: 2.2.0 plugin: 0.2.0+3 - process: 3.0.3 + process: 3.0.5 quiver: 2.0.0+1 stack_trace: 1.9.3 stream_channel: 1.6.8 @@ -36,24 +36,24 @@ dependencies: # We depend on very specific internal implementation details of the # 'test' package, which change between versions, so when upgrading # this, make sure the tests are still running correctly. - test: 0.12.41 + test: 0.12.42 async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dart2_constant: 1.0.2+dart2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -69,7 +69,7 @@ dependencies: source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -78,10 +78,10 @@ dependencies: dev_dependencies: collection: 1.14.6 mockito: 3.0.0-beta - file_testing: 2.0.0 + file_testing: 2.0.1 dartdoc: # Exclude this package from the hosted API docs. nodoc: true -# PUBSPEC CHECKSUM: 6bdd +# PUBSPEC CHECKSUM: cb8c diff --git a/packages/flutter_tools/test/analytics_test.dart b/packages/flutter_tools/test/analytics_test.dart index 866b418b29..b61cd35b02 100644 --- a/packages/flutter_tools/test/analytics_test.dart +++ b/packages/flutter_tools/test/analytics_test.dart @@ -3,6 +3,9 @@ // found in the LICENSE file. import 'package:args/command_runner.dart'; +import 'package:mockito/mockito.dart'; +import 'package:quiver/time.dart'; + import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/build.dart'; @@ -12,9 +15,6 @@ import 'package:flutter_tools/src/doctor.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/usage.dart'; import 'package:flutter_tools/src/version.dart'; -import 'package:mockito/mockito.dart'; -import 'package:quiver/time.dart'; -import 'package:test/test.dart'; import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/android/android_device_test.dart b/packages/flutter_tools/test/android/android_device_test.dart index 5fb766d0e9..46edcff380 100644 --- a/packages/flutter_tools/test/android/android_device_test.dart +++ b/packages/flutter_tools/test/android/android_device_test.dart @@ -8,8 +8,8 @@ import 'package:flutter_tools/src/android/android_device.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/android/android_emulator_test.dart b/packages/flutter_tools/test/android/android_emulator_test.dart index b00ecfeaed..e4256d8ca0 100644 --- a/packages/flutter_tools/test/android/android_emulator_test.dart +++ b/packages/flutter_tools/test/android/android_emulator_test.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:flutter_tools/src/android/android_emulator.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/android/android_sdk_test.dart b/packages/flutter_tools/test/android/android_sdk_test.dart index a478369a09..179db33277 100644 --- a/packages/flutter_tools/test/android/android_sdk_test.dart +++ b/packages/flutter_tools/test/android/android_sdk_test.dart @@ -10,7 +10,6 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/config.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/android/android_workflow_test.dart b/packages/flutter_tools/test/android/android_workflow_test.dart index 80e1fdc0d8..48831650f3 100644 --- a/packages/flutter_tools/test/android/android_workflow_test.dart +++ b/packages/flutter_tools/test/android/android_workflow_test.dart @@ -12,7 +12,6 @@ import 'package:flutter_tools/src/android/android_workflow.dart'; import 'package:mockito/mockito.dart'; import 'package:platform/platform.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/android/gradle_test.dart b/packages/flutter_tools/test/android/gradle_test.dart index fb12e3d10d..ed8741e5a4 100644 --- a/packages/flutter_tools/test/android/gradle_test.dart +++ b/packages/flutter_tools/test/android/gradle_test.dart @@ -16,7 +16,6 @@ import 'package:flutter_tools/src/project.dart'; import 'package:mockito/mockito.dart'; import 'package:platform/platform.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/application_package_test.dart b/packages/flutter_tools/test/application_package_test.dart index a57e72b2f4..bba01f314f 100644 --- a/packages/flutter_tools/test/application_package_test.dart +++ b/packages/flutter_tools/test/application_package_test.dart @@ -4,16 +4,18 @@ import 'dart:convert'; +import 'package:file/file.dart'; +import 'package:file/memory.dart'; +import 'package:mockito/mockito.dart'; + import 'package:flutter_tools/src/application_package.dart'; import 'package:flutter_tools/src/base/context.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/os.dart'; import 'package:flutter_tools/src/ios/ios_workflow.dart'; -import 'package:test/test.dart'; -import 'package:file/file.dart'; -import 'package:file/memory.dart'; -import 'package:mockito/mockito.dart'; + +import 'src/common.dart'; import 'src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/artifacts_test.dart b/packages/flutter_tools/test/artifacts_test.dart index 4cd0f71f1c..7767736132 100644 --- a/packages/flutter_tools/test/artifacts_test.dart +++ b/packages/flutter_tools/test/artifacts_test.dart @@ -7,8 +7,8 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/artifacts.dart'; -import 'package:test/test.dart'; +import 'src/common.dart'; import 'src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/asset_bundle_package_fonts_test.dart b/packages/flutter_tools/test/asset_bundle_package_fonts_test.dart index 14d222e150..dc7c135eb1 100644 --- a/packages/flutter_tools/test/asset_bundle_package_fonts_test.dart +++ b/packages/flutter_tools/test/asset_bundle_package_fonts_test.dart @@ -11,8 +11,6 @@ import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; -import 'package:test/test.dart'; - import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/asset_bundle_package_test.dart b/packages/flutter_tools/test/asset_bundle_package_test.dart index 07100a718a..624607698a 100644 --- a/packages/flutter_tools/test/asset_bundle_package_test.dart +++ b/packages/flutter_tools/test/asset_bundle_package_test.dart @@ -7,12 +7,12 @@ import 'dart:convert'; import 'package:file/file.dart'; import 'package:file/memory.dart'; + import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/flutter_manifest.dart'; -import 'package:test/test.dart'; import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/asset_bundle_test.dart b/packages/flutter_tools/test/asset_bundle_test.dart index c8f663c6d2..e4fdf8ee18 100644 --- a/packages/flutter_tools/test/asset_bundle_test.dart +++ b/packages/flutter_tools/test/asset_bundle_test.dart @@ -10,8 +10,6 @@ import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; -import 'package:test/test.dart'; - import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/asset_bundle_variant_test.dart b/packages/flutter_tools/test/asset_bundle_variant_test.dart index d3c37f447b..e58f0e7f0d 100644 --- a/packages/flutter_tools/test/asset_bundle_variant_test.dart +++ b/packages/flutter_tools/test/asset_bundle_variant_test.dart @@ -10,8 +10,6 @@ import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; -import 'package:test/test.dart'; - import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/asset_test.dart b/packages/flutter_tools/test/asset_test.dart index 352541bbfb..79bd611d1a 100644 --- a/packages/flutter_tools/test/asset_test.dart +++ b/packages/flutter_tools/test/asset_test.dart @@ -7,7 +7,7 @@ import 'dart:async'; import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; -import 'package:test/test.dart'; + import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/base/build_test.dart b/packages/flutter_tools/test/base/build_test.dart index 7f26e6fe5a..e7617c4bb0 100644 --- a/packages/flutter_tools/test/base/build_test.dart +++ b/packages/flutter_tools/test/base/build_test.dart @@ -17,8 +17,8 @@ import 'package:flutter_tools/src/base/process.dart'; import 'package:flutter_tools/src/ios/mac.dart'; import 'package:flutter_tools/src/version.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; class MockFlutterVersion extends Mock implements FlutterVersion {} diff --git a/packages/flutter_tools/test/base/common_test.dart b/packages/flutter_tools/test/base/common_test.dart index b46c66edee..91ea07a611 100644 --- a/packages/flutter_tools/test/base/common_test.dart +++ b/packages/flutter_tools/test/base/common_test.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; import 'package:flutter_tools/src/base/common.dart'; import '../src/common.dart'; diff --git a/packages/flutter_tools/test/base/context_test.dart b/packages/flutter_tools/test/base/context_test.dart index ba7f8c21a2..6b79495ad4 100644 --- a/packages/flutter_tools/test/base/context_test.dart +++ b/packages/flutter_tools/test/base/context_test.dart @@ -5,7 +5,8 @@ import 'dart:async'; import 'package:flutter_tools/src/base/context.dart'; -import 'package:test/test.dart'; + +import '../src/common.dart'; void main() { group('AppContext', () { diff --git a/packages/flutter_tools/test/base/file_system_test.dart b/packages/flutter_tools/test/base/file_system_test.dart index 144e4eb489..7f6c6c9db5 100644 --- a/packages/flutter_tools/test/base/file_system_test.dart +++ b/packages/flutter_tools/test/base/file_system_test.dart @@ -5,7 +5,6 @@ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:platform/platform.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/base/fingerprint_test.dart b/packages/flutter_tools/test/base/fingerprint_test.dart index f6fdc3aa4d..bf989fce6d 100644 --- a/packages/flutter_tools/test/base/fingerprint_test.dart +++ b/packages/flutter_tools/test/base/fingerprint_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/fingerprint.dart'; import 'package:flutter_tools/src/version.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/base/flags_test.dart b/packages/flutter_tools/test/base/flags_test.dart index 4074201a13..cd79cbf7c7 100644 --- a/packages/flutter_tools/test/base/flags_test.dart +++ b/packages/flutter_tools/test/base/flags_test.dart @@ -7,7 +7,6 @@ import 'dart:async'; import 'package:flutter_tools/src/base/flags.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/base/io_test.dart b/packages/flutter_tools/test/base/io_test.dart index 8a173a9d11..be3cd3c410 100644 --- a/packages/flutter_tools/test/base/io_test.dart +++ b/packages/flutter_tools/test/base/io_test.dart @@ -7,8 +7,8 @@ import 'dart:io' as io; import 'package:flutter_tools/src/base/io.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/base/logger_test.dart b/packages/flutter_tools/test/base/logger_test.dart index cf1fbf126d..c2fe6056bb 100644 --- a/packages/flutter_tools/test/base/logger_test.dart +++ b/packages/flutter_tools/test/base/logger_test.dart @@ -7,8 +7,8 @@ import 'dart:async'; import 'package:flutter_tools/src/base/context.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/base/logger.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; import '../src/mocks.dart'; @@ -72,8 +72,8 @@ void main() { expect(lines.length, equals(1)); // Verify that stopping or canceling multiple times throws. - expect(() { ansiSpinner.stop(); }, throwsA(const isInstanceOf())); - expect(() { ansiSpinner.cancel(); }, throwsA(const isInstanceOf())); + expect(() { ansiSpinner.stop(); }, throwsA(isInstanceOf())); + expect(() { ansiSpinner.cancel(); }, throwsA(isInstanceOf())); }, overrides: {Stdio: () => mockStdio}); testUsingContext('AnsiStatus works when cancelled', () async { @@ -95,8 +95,8 @@ void main() { expect(lines[1], equals('')); // Verify that stopping or canceling multiple times throws. - expect(() { ansiStatus.cancel(); }, throwsA(const isInstanceOf())); - expect(() { ansiStatus.stop(); }, throwsA(const isInstanceOf())); + expect(() { ansiStatus.cancel(); }, throwsA(isInstanceOf())); + expect(() { ansiStatus.stop(); }, throwsA(isInstanceOf())); }, overrides: {Stdio: () => mockStdio}); testUsingContext('AnsiStatus works when stopped', () async { @@ -119,8 +119,8 @@ void main() { expect(lines[1], equals('')); // Verify that stopping or canceling multiple times throws. - expect(() { ansiStatus.stop(); }, throwsA(const isInstanceOf())); - expect(() { ansiStatus.cancel(); }, throwsA(const isInstanceOf())); + expect(() { ansiStatus.stop(); }, throwsA(isInstanceOf())); + expect(() { ansiStatus.cancel(); }, throwsA(isInstanceOf())); }, overrides: {Stdio: () => mockStdio}); testUsingContext('sequential startProgress calls with StdoutLogger', () async { diff --git a/packages/flutter_tools/test/base/logs_test.dart b/packages/flutter_tools/test/base/logs_test.dart index 345501d37b..ff74ed1ef8 100644 --- a/packages/flutter_tools/test/base/logs_test.dart +++ b/packages/flutter_tools/test/base/logs_test.dart @@ -4,7 +4,6 @@ import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/commands/logs.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/base/net_test.dart b/packages/flutter_tools/test/base/net_test.dart index ddab776f00..05ef212111 100644 --- a/packages/flutter_tools/test/base/net_test.dart +++ b/packages/flutter_tools/test/base/net_test.dart @@ -7,8 +7,8 @@ import 'dart:async'; import 'package:flutter_tools/src/base/io.dart' as io; import 'package:flutter_tools/src/base/net.dart'; import 'package:quiver/testing/async.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/base/os_test.dart b/packages/flutter_tools/test/base/os_test.dart index 608dbb92ca..d4385d7cc7 100644 --- a/packages/flutter_tools/test/base/os_test.dart +++ b/packages/flutter_tools/test/base/os_test.dart @@ -8,9 +8,8 @@ import 'package:flutter_tools/src/base/os.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; import 'package:platform/platform.dart'; -import 'package:test/test.dart'; - +import '../src/common.dart'; import '../src/context.dart'; const String kExecutable = 'foo'; diff --git a/packages/flutter_tools/test/base/os_utils_test.dart b/packages/flutter_tools/test/base/os_utils_test.dart index 0190b4cedf..5f6987c26b 100644 --- a/packages/flutter_tools/test/base/os_utils_test.dart +++ b/packages/flutter_tools/test/base/os_utils_test.dart @@ -5,8 +5,8 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/os.dart'; import 'package:flutter_tools/src/base/platform.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/base/process_test.dart b/packages/flutter_tools/test/base/process_test.dart index c987671386..5f4aa4d54d 100644 --- a/packages/flutter_tools/test/base/process_test.dart +++ b/packages/flutter_tools/test/base/process_test.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:flutter_tools/src/base/process.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/base/terminal_test.dart b/packages/flutter_tools/test/base/terminal_test.dart index 52e7028300..9660fc0b6e 100644 --- a/packages/flutter_tools/test/base/terminal_test.dart +++ b/packages/flutter_tools/test/base/terminal_test.dart @@ -5,11 +5,10 @@ import 'dart:async'; import 'package:flutter_tools/src/base/terminal.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; - void main() { group('character input prompt', () { AnsiTerminal terminalUnderTest; diff --git a/packages/flutter_tools/test/base_utils_test.dart b/packages/flutter_tools/test/base_utils_test.dart index a1d46f3154..d4d032f171 100644 --- a/packages/flutter_tools/test/base_utils_test.dart +++ b/packages/flutter_tools/test/base_utils_test.dart @@ -5,7 +5,8 @@ import 'dart:async'; import 'package:flutter_tools/src/base/utils.dart'; -import 'package:test/test.dart'; + +import 'src/common.dart'; void main() { group('ItemListNotifier', () { diff --git a/packages/flutter_tools/test/bug_report_test.dart b/packages/flutter_tools/test/bug_report_test.dart index 0bf499a8c1..6f62cca687 100644 --- a/packages/flutter_tools/test/bug_report_test.dart +++ b/packages/flutter_tools/test/bug_report_test.dart @@ -3,13 +3,14 @@ // found in the LICENSE file. import 'package:file_testing/file_testing.dart'; +import 'package:mockito/mockito.dart'; + import 'package:flutter_tools/executable.dart' as tools; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/base/os.dart'; -import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; +import 'src/common.dart'; import 'src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/cache_test.dart b/packages/flutter_tools/test/cache_test.dart index e46c539fa3..4797379735 100644 --- a/packages/flutter_tools/test/cache_test.dart +++ b/packages/flutter_tools/test/cache_test.dart @@ -7,12 +7,12 @@ import 'dart:async'; import 'package:file/file.dart'; import 'package:file/memory.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; import 'package:platform/platform.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/base/io.dart' show InternetAddress, SocketException; +import 'src/common.dart'; import 'src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/channel_test.dart b/packages/flutter_tools/test/channel_test.dart index 66893acf33..dfa6f5e231 100644 --- a/packages/flutter_tools/test/channel_test.dart +++ b/packages/flutter_tools/test/channel_test.dart @@ -10,7 +10,6 @@ import 'package:args/command_runner.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/channel.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; import 'package:process/process.dart'; import 'src/common.dart'; diff --git a/packages/flutter_tools/test/commands/analyze_continuously_test.dart b/packages/flutter_tools/test/commands/analyze_continuously_test.dart index 1e9570789c..dfb1972edf 100644 --- a/packages/flutter_tools/test/commands/analyze_continuously_test.dart +++ b/packages/flutter_tools/test/commands/analyze_continuously_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_tools/src/dart/analysis.dart'; import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/dart/sdk.dart'; import 'package:flutter_tools/src/runner/flutter_command_runner.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/commands/analyze_once_test.dart b/packages/flutter_tools/test/commands/analyze_once_test.dart index b536022721..37360820ba 100644 --- a/packages/flutter_tools/test/commands/analyze_once_test.dart +++ b/packages/flutter_tools/test/commands/analyze_once_test.dart @@ -11,7 +11,6 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/analyze.dart'; import 'package:flutter_tools/src/commands/create.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/analyze_test.dart b/packages/flutter_tools/test/commands/analyze_test.dart index 434f5e27f0..bae562c6ea 100644 --- a/packages/flutter_tools/test/commands/analyze_test.dart +++ b/packages/flutter_tools/test/commands/analyze_test.dart @@ -6,8 +6,8 @@ import 'package:file/file.dart'; import 'package:file/memory.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/analyze_base.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; const String _kFlutterRoot = '/data/flutter'; diff --git a/packages/flutter_tools/test/commands/attach_test.dart b/packages/flutter_tools/test/commands/attach_test.dart index bc362027e3..ed1da2ce39 100644 --- a/packages/flutter_tools/test/commands/attach_test.dart +++ b/packages/flutter_tools/test/commands/attach_test.dart @@ -9,7 +9,6 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/attach.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; @@ -74,7 +73,7 @@ void main() { final AttachCommand command = new AttachCommand(); await expectLater( createTestCommandRunner(command).run(['attach']), - throwsA(const isInstanceOf()), + throwsA(isInstanceOf()), ); expect(testLogger.statusText, contains('No connected devices')); }); @@ -94,7 +93,7 @@ void main() { testDeviceManager.addDevice(aDeviceWithId('yy2')); await expectLater( createTestCommandRunner(command).run(['attach']), - throwsA(const isInstanceOf()), + throwsA(isInstanceOf()), ); expect(testLogger.statusText, contains('More than one device')); expect(testLogger.statusText, contains('xx1')); diff --git a/packages/flutter_tools/test/commands/config_test.dart b/packages/flutter_tools/test/commands/config_test.dart index 9485201cf1..d383da499d 100644 --- a/packages/flutter_tools/test/commands/config_test.dart +++ b/packages/flutter_tools/test/commands/config_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_tools/src/base/context.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/commands/config.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/commands/create_test.dart b/packages/flutter_tools/test/commands/create_test.dart index 96a3bf02b0..d71d4fbd75 100644 --- a/packages/flutter_tools/test/commands/create_test.dart +++ b/packages/flutter_tools/test/commands/create_test.dart @@ -15,7 +15,6 @@ import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/version.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/daemon_test.dart b/packages/flutter_tools/test/commands/daemon_test.dart index 25c8cf58ab..8139187f6b 100644 --- a/packages/flutter_tools/test/commands/daemon_test.dart +++ b/packages/flutter_tools/test/commands/daemon_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_tools/src/commands/daemon.dart'; import 'package:flutter_tools/src/globals.dart'; import 'package:flutter_tools/src/ios/ios_workflow.dart'; import 'package:flutter_tools/src/resident_runner.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; import '../src/mocks.dart'; diff --git a/packages/flutter_tools/test/commands/devices_test.dart b/packages/flutter_tools/test/commands/devices_test.dart index cc0a134b33..14b9087c93 100644 --- a/packages/flutter_tools/test/commands/devices_test.dart +++ b/packages/flutter_tools/test/commands/devices_test.dart @@ -12,7 +12,6 @@ import 'package:flutter_tools/src/commands/devices.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/doctor_test.dart b/packages/flutter_tools/test/commands/doctor_test.dart index 25c2a4e246..658e6e6830 100644 --- a/packages/flutter_tools/test/commands/doctor_test.dart +++ b/packages/flutter_tools/test/commands/doctor_test.dart @@ -8,8 +8,8 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/doctor.dart'; import 'package:flutter_tools/src/vscode/vscode.dart'; import 'package:flutter_tools/src/vscode/vscode_validator.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/commands/drive_test.dart b/packages/flutter_tools/test/commands/drive_test.dart index d5543b6f72..9507805d2a 100644 --- a/packages/flutter_tools/test/commands/drive_test.dart +++ b/packages/flutter_tools/test/commands/drive_test.dart @@ -14,7 +14,6 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/drive.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/format_test.dart b/packages/flutter_tools/test/commands/format_test.dart index e822ad1ee3..43e7b5cecb 100644 --- a/packages/flutter_tools/test/commands/format_test.dart +++ b/packages/flutter_tools/test/commands/format_test.dart @@ -6,7 +6,6 @@ import 'package:args/command_runner.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/format.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/fuchsia_reload_test.dart b/packages/flutter_tools/test/commands/fuchsia_reload_test.dart index c0d3bf5866..8d128cd861 100644 --- a/packages/flutter_tools/test/commands/fuchsia_reload_test.dart +++ b/packages/flutter_tools/test/commands/fuchsia_reload_test.dart @@ -9,8 +9,8 @@ import 'dart:io'; import 'package:flutter_tools/src/commands/fuchsia_reload.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/commands/ide_config_test.dart b/packages/flutter_tools/test/commands/ide_config_test.dart index a12eb79453..aa97518fa1 100644 --- a/packages/flutter_tools/test/commands/ide_config_test.dart +++ b/packages/flutter_tools/test/commands/ide_config_test.dart @@ -9,7 +9,6 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/template.dart'; import 'package:flutter_tools/src/commands/ide_config.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/install_test.dart b/packages/flutter_tools/test/commands/install_test.dart index 2a71342ab2..07d9eb69c4 100644 --- a/packages/flutter_tools/test/commands/install_test.dart +++ b/packages/flutter_tools/test/commands/install_test.dart @@ -4,7 +4,6 @@ import 'package:flutter_tools/src/commands/install.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/packages_test.dart b/packages/flutter_tools/test/commands/packages_test.dart index 1752aa6a99..7d5d67025b 100644 --- a/packages/flutter_tools/test/commands/packages_test.dart +++ b/packages/flutter_tools/test/commands/packages_test.dart @@ -11,7 +11,6 @@ import 'package:flutter_tools/src/base/utils.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/packages.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/run_test.dart b/packages/flutter_tools/test/commands/run_test.dart index 3ac52a6a4a..fde6043d80 100644 --- a/packages/flutter_tools/test/commands/run_test.dart +++ b/packages/flutter_tools/test/commands/run_test.dart @@ -4,7 +4,6 @@ import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/commands/run.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/shell_completion_test.dart b/packages/flutter_tools/test/commands/shell_completion_test.dart index c3f75575d3..c55dc8369a 100644 --- a/packages/flutter_tools/test/commands/shell_completion_test.dart +++ b/packages/flutter_tools/test/commands/shell_completion_test.dart @@ -9,7 +9,6 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/shell_completion.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/commands/test_test.dart b/packages/flutter_tools/test/commands/test_test.dart index 1bed1d5d57..ad3a59eb86 100644 --- a/packages/flutter_tools/test/commands/test_test.dart +++ b/packages/flutter_tools/test/commands/test_test.dart @@ -9,8 +9,8 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/dart/sdk.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; // This test depends on some files in ///dev/automated_tests/flutter_test/* diff --git a/packages/flutter_tools/test/commands/upgrade_test.dart b/packages/flutter_tools/test/commands/upgrade_test.dart index b5be173823..16469bebed 100644 --- a/packages/flutter_tools/test/commands/upgrade_test.dart +++ b/packages/flutter_tools/test/commands/upgrade_test.dart @@ -6,7 +6,6 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/os.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/upgrade.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/compile_test.dart b/packages/flutter_tools/test/compile_test.dart index 4b8e5c3abf..dac6ddf6c1 100644 --- a/packages/flutter_tools/test/compile_test.dart +++ b/packages/flutter_tools/test/compile_test.dart @@ -11,8 +11,8 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import 'src/common.dart'; import 'src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/config_test.dart b/packages/flutter_tools/test/config_test.dart index a46d15ee7c..e476cb8f41 100644 --- a/packages/flutter_tools/test/config_test.dart +++ b/packages/flutter_tools/test/config_test.dart @@ -4,7 +4,8 @@ import 'package:flutter_tools/src/base/config.dart'; import 'package:flutter_tools/src/base/file_system.dart'; -import 'package:test/test.dart'; + +import 'src/common.dart'; void main() { Config config; diff --git a/packages/flutter_tools/test/crash_reporting_test.dart b/packages/flutter_tools/test/crash_reporting_test.dart index 445f9b4e59..d7a7c4f675 100644 --- a/packages/flutter_tools/test/crash_reporting_test.dart +++ b/packages/flutter_tools/test/crash_reporting_test.dart @@ -11,7 +11,6 @@ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:http/http.dart'; import 'package:http/testing.dart'; -import 'package:test/test.dart'; import 'package:flutter_tools/runner.dart' as tools; import 'package:flutter_tools/src/base/context.dart'; @@ -20,6 +19,8 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/crash_reporting.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; + +import 'src/common.dart'; import 'src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/dart/pub_get_test.dart b/packages/flutter_tools/test/dart/pub_get_test.dart index b30b238595..3bbbdf0cd2 100644 --- a/packages/flutter_tools/test/dart/pub_get_test.dart +++ b/packages/flutter_tools/test/dart/pub_get_test.dart @@ -15,7 +15,6 @@ import 'package:flutter_tools/src/dart/pub.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; import 'package:quiver/testing/async.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/dart_dependencies_test.dart b/packages/flutter_tools/test/dart_dependencies_test.dart index 1158b55bb6..0a56c7a9b5 100644 --- a/packages/flutter_tools/test/dart_dependencies_test.dart +++ b/packages/flutter_tools/test/dart_dependencies_test.dart @@ -4,7 +4,6 @@ import 'package:flutter_tools/src/dart/dependencies.dart'; import 'package:flutter_tools/src/base/file_system.dart'; -import 'package:test/test.dart'; import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/dependency_checker_test.dart b/packages/flutter_tools/test/dependency_checker_test.dart index 29f6dd271e..0c55782256 100644 --- a/packages/flutter_tools/test/dependency_checker_test.dart +++ b/packages/flutter_tools/test/dependency_checker_test.dart @@ -8,7 +8,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/devices.dart'; import 'package:flutter_tools/src/dart/dependencies.dart'; import 'package:flutter_tools/src/dependency_checker.dart'; -import 'package:test/test.dart'; + import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/devfs_test.dart b/packages/flutter_tools/test/devfs_test.dart index b4ef653ea3..b2fb44532d 100644 --- a/packages/flutter_tools/test/devfs_test.dart +++ b/packages/flutter_tools/test/devfs_test.dart @@ -14,7 +14,6 @@ import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/vmservice.dart'; import 'package:json_rpc_2/json_rpc_2.dart' as rpc; -import 'package:test/test.dart'; import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/device_test.dart b/packages/flutter_tools/test/device_test.dart index 7f26d4a32f..32a06a565c 100644 --- a/packages/flutter_tools/test/device_test.dart +++ b/packages/flutter_tools/test/device_test.dart @@ -5,8 +5,8 @@ import 'dart:async'; import 'package:flutter_tools/src/device.dart'; -import 'package:test/test.dart'; +import 'src/common.dart'; import 'src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/emulator_test.dart b/packages/flutter_tools/test/emulator_test.dart index 5bdf1fdf28..ffdc7a72db 100644 --- a/packages/flutter_tools/test/emulator_test.dart +++ b/packages/flutter_tools/test/emulator_test.dart @@ -14,8 +14,8 @@ import 'package:flutter_tools/src/ios/ios_emulators.dart'; import 'package:flutter_tools/src/ios/mac.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import 'src/common.dart'; import 'src/context.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/test/flutter_manifest_test.dart b/packages/flutter_tools/test/flutter_manifest_test.dart index bb24c42655..68348f79ca 100644 --- a/packages/flutter_tools/test/flutter_manifest_test.dart +++ b/packages/flutter_tools/test/flutter_manifest_test.dart @@ -9,7 +9,6 @@ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/flutter_manifest.dart'; -import 'package:test/test.dart'; import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/forbidden_imports_test.dart b/packages/flutter_tools/test/forbidden_imports_test.dart index 05a2f49bf0..16efccb076 100644 --- a/packages/flutter_tools/test/forbidden_imports_test.dart +++ b/packages/flutter_tools/test/forbidden_imports_test.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter_tools/src/base/file_system.dart'; -import 'package:test/test.dart'; import 'src/common.dart'; diff --git a/packages/flutter_tools/test/hot_test.dart b/packages/flutter_tools/test/hot_test.dart index 760c460ed5..ac2c83c41f 100644 --- a/packages/flutter_tools/test/hot_test.dart +++ b/packages/flutter_tools/test/hot_test.dart @@ -9,8 +9,8 @@ import 'package:flutter_tools/src/resident_runner.dart'; import 'package:flutter_tools/src/run_hot.dart'; import 'package:meta/meta.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; +import 'src/common.dart'; import 'src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/integration/expression_evaluation_test.dart b/packages/flutter_tools/test/integration/expression_evaluation_test.dart index eae4ef9fa1..677bd29d80 100644 --- a/packages/flutter_tools/test/integration/expression_evaluation_test.dart +++ b/packages/flutter_tools/test/integration/expression_evaluation_test.dart @@ -6,9 +6,10 @@ import 'dart:async'; import 'package:file/file.dart'; import 'package:flutter_tools/src/base/file_system.dart'; -import 'package:test/test.dart'; + import 'package:vm_service_client/vm_service_client.dart'; +import '../src/common.dart'; import 'test_data/basic_project.dart'; import 'test_driver.dart'; diff --git a/packages/flutter_tools/test/integration/flutter_attach_test.dart b/packages/flutter_tools/test/integration/flutter_attach_test.dart index fe1a410a45..6a2bace845 100644 --- a/packages/flutter_tools/test/integration/flutter_attach_test.dart +++ b/packages/flutter_tools/test/integration/flutter_attach_test.dart @@ -5,8 +5,8 @@ import 'package:file/file.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/platform.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; import 'test_data/basic_project.dart'; import 'test_driver.dart'; diff --git a/packages/flutter_tools/test/integration/flutter_tester_test.dart b/packages/flutter_tools/test/integration/flutter_tester_test.dart index 7ccb4a5182..e3d2575cb6 100644 --- a/packages/flutter_tools/test/integration/flutter_tester_test.dart +++ b/packages/flutter_tools/test/integration/flutter_tester_test.dart @@ -9,8 +9,8 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/tester/flutter_tester.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; import 'test_utils.dart'; diff --git a/packages/flutter_tools/test/integration/hot_reload_test.dart b/packages/flutter_tools/test/integration/hot_reload_test.dart index 7c869e90ce..58e6ddff58 100644 --- a/packages/flutter_tools/test/integration/hot_reload_test.dart +++ b/packages/flutter_tools/test/integration/hot_reload_test.dart @@ -5,9 +5,10 @@ import 'package:file/file.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/platform.dart'; -import 'package:test/test.dart'; + import 'package:vm_service_client/vm_service_client.dart'; +import '../src/common.dart'; import 'test_data/basic_project.dart'; import 'test_driver.dart'; @@ -44,7 +45,7 @@ void main() { final VMIsolate isolate = await _flutter.breakAt( new Uri.file(_project.breakpointFile).toString(), _project.breakpointLine); - expect(isolate.pauseEvent, const isInstanceOf()); + expect(isolate.pauseEvent, isInstanceOf()); // TODO(dantup): Unskip after https://github.com/flutter/flutter/issues/18441. }, skip: !platform.isLinux); }, timeout: const Timeout.factor(3)); diff --git a/packages/flutter_tools/test/integration/lifetime_test.dart b/packages/flutter_tools/test/integration/lifetime_test.dart index db39333d68..10336a609a 100644 --- a/packages/flutter_tools/test/integration/lifetime_test.dart +++ b/packages/flutter_tools/test/integration/lifetime_test.dart @@ -7,8 +7,8 @@ import 'dart:async'; import 'package:file/file.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/platform.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import 'test_data/basic_project.dart'; import 'test_driver.dart'; diff --git a/packages/flutter_tools/test/intellij/intellij_test.dart b/packages/flutter_tools/test/intellij/intellij_test.dart index a79a08d95c..2236616359 100644 --- a/packages/flutter_tools/test/intellij/intellij_test.dart +++ b/packages/flutter_tools/test/intellij/intellij_test.dart @@ -9,8 +9,8 @@ import 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/doctor.dart'; import 'package:flutter_tools/src/intellij/intellij.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/ios/cocoapods_test.dart b/packages/flutter_tools/test/ios/cocoapods_test.dart index 7d6d2bac37..e732615441 100644 --- a/packages/flutter_tools/test/ios/cocoapods_test.dart +++ b/packages/flutter_tools/test/ios/cocoapods_test.dart @@ -14,8 +14,8 @@ import 'package:flutter_tools/src/ios/cocoapods.dart'; import 'package:flutter_tools/src/ios/xcodeproj.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; typedef Future InvokeProcess(); @@ -224,7 +224,7 @@ void main() { ); fail('ToolExit expected'); } catch(e) { - expect(e, const isInstanceOf()); + expect(e, isInstanceOf()); verifyNever(mockProcessManager.run( argThat(containsAllInOrder(['pod', 'install'])), workingDirectory: anyNamed('workingDirectory'), @@ -271,7 +271,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by ); fail('ToolExit expected'); } catch (e) { - expect(e, const isInstanceOf()); + expect(e, isInstanceOf()); expect( testLogger.errorText, contains("CocoaPods's specs repository is too out-of-date to satisfy dependencies"), diff --git a/packages/flutter_tools/test/ios/code_signing_test.dart b/packages/flutter_tools/test/ios/code_signing_test.dart index 9d12db225a..dcf4600ec6 100644 --- a/packages/flutter_tools/test/ios/code_signing_test.dart +++ b/packages/flutter_tools/test/ios/code_signing_test.dart @@ -13,8 +13,8 @@ import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/ios/code_signing.dart'; import 'package:flutter_tools/src/globals.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/ios/devices_test.dart b/packages/flutter_tools/test/ios/devices_test.dart index 196fa605c7..0751177a27 100644 --- a/packages/flutter_tools/test/ios/devices_test.dart +++ b/packages/flutter_tools/test/ios/devices_test.dart @@ -14,8 +14,8 @@ import 'package:flutter_tools/src/ios/mac.dart'; import 'package:mockito/mockito.dart'; import 'package:platform/platform.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; class MockIMobileDevice extends Mock implements IMobileDevice {} diff --git a/packages/flutter_tools/test/ios/ios_workflow_test.dart b/packages/flutter_tools/test/ios/ios_workflow_test.dart index 6b2f43a6da..d6b1f8ee17 100644 --- a/packages/flutter_tools/test/ios/ios_workflow_test.dart +++ b/packages/flutter_tools/test/ios/ios_workflow_test.dart @@ -14,8 +14,8 @@ import 'package:flutter_tools/src/ios/ios_workflow.dart'; import 'package:flutter_tools/src/ios/mac.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/ios/mac_test.dart b/packages/flutter_tools/test/ios/mac_test.dart index 9179a97c8c..c30631e541 100644 --- a/packages/flutter_tools/test/ios/mac_test.dart +++ b/packages/flutter_tools/test/ios/mac_test.dart @@ -12,7 +12,6 @@ import 'package:flutter_tools/src/ios/xcodeproj.dart'; import 'package:mockito/mockito.dart'; import 'package:platform/platform.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/ios/simulators_test.dart b/packages/flutter_tools/test/ios/simulators_test.dart index 190f2c08fc..e4edf4ef36 100644 --- a/packages/flutter_tools/test/ios/simulators_test.dart +++ b/packages/flutter_tools/test/ios/simulators_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_tools/src/ios/simulators.dart'; import 'package:mockito/mockito.dart'; import 'package:platform/platform.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; class MockFile extends Mock implements File {} diff --git a/packages/flutter_tools/test/ios/xcodeproj_test.dart b/packages/flutter_tools/test/ios/xcodeproj_test.dart index aecbe583cf..493ac2b7bc 100644 --- a/packages/flutter_tools/test/ios/xcodeproj_test.dart +++ b/packages/flutter_tools/test/ios/xcodeproj_test.dart @@ -15,8 +15,8 @@ import 'package:flutter_tools/src/project.dart'; import 'package:mockito/mockito.dart'; import 'package:platform/platform.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; const String xcodebuild = '/usr/bin/xcodebuild'; diff --git a/packages/flutter_tools/test/project_test.dart b/packages/flutter_tools/test/project_test.dart index 8c53e66786..a8b7388945 100644 --- a/packages/flutter_tools/test/project_test.dart +++ b/packages/flutter_tools/test/project_test.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'dart:async'; + import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/base/context.dart'; import 'package:flutter_tools/src/base/platform.dart'; @@ -10,9 +11,9 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/flutter_manifest.dart'; import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/base/file_system.dart'; -import 'package:test/test.dart'; import 'package:file/file.dart'; import 'package:file/memory.dart'; + import 'src/common.dart'; import 'src/context.dart'; @@ -22,7 +23,7 @@ void main() { testInMemory('fails on null directory', () async { await expectLater( FlutterProject.fromDirectory(null), - throwsA(const isInstanceOf()), + throwsA(isInstanceOf()), ); }); diff --git a/packages/flutter_tools/test/protocol_discovery_test.dart b/packages/flutter_tools/test/protocol_discovery_test.dart index 2849f0b7d9..c89e19ba02 100644 --- a/packages/flutter_tools/test/protocol_discovery_test.dart +++ b/packages/flutter_tools/test/protocol_discovery_test.dart @@ -6,8 +6,8 @@ import 'dart:async'; import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/protocol_discovery.dart'; -import 'package:test/test.dart'; +import 'src/common.dart'; import 'src/context.dart'; import 'src/mocks.dart'; diff --git a/packages/flutter_tools/test/resident_runner_test.dart b/packages/flutter_tools/test/resident_runner_test.dart index 688263dcd0..5a845f582c 100644 --- a/packages/flutter_tools/test/resident_runner_test.dart +++ b/packages/flutter_tools/test/resident_runner_test.dart @@ -6,8 +6,8 @@ import 'dart:async'; import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/resident_runner.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; +import 'src/common.dart'; import 'src/context.dart'; class TestRunner extends ResidentRunner { diff --git a/packages/flutter_tools/test/runner/flutter_command_runner_test.dart b/packages/flutter_tools/test/runner/flutter_command_runner_test.dart index ceaf7649cf..827692a15b 100644 --- a/packages/flutter_tools/test/runner/flutter_command_runner_test.dart +++ b/packages/flutter_tools/test/runner/flutter_command_runner_test.dart @@ -9,7 +9,6 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/version.dart'; import 'package:mockito/mockito.dart'; import 'package:platform/platform.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; diff --git a/packages/flutter_tools/test/runner/flutter_command_test.dart b/packages/flutter_tools/test/runner/flutter_command_test.dart index ed66ea1256..99562fc5ac 100644 --- a/packages/flutter_tools/test/runner/flutter_command_test.dart +++ b/packages/flutter_tools/test/runner/flutter_command_test.dart @@ -10,8 +10,8 @@ import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:mockito/mockito.dart'; import 'package:quiver/time.dart'; -import 'package:test/test.dart'; +import '../src/common.dart'; import '../src/context.dart'; void main() { diff --git a/packages/flutter_tools/test/src/common.dart b/packages/flutter_tools/test/src/common.dart index ccb443b116..3aa0331de2 100644 --- a/packages/flutter_tools/test/src/common.dart +++ b/packages/flutter_tools/test/src/common.dart @@ -5,7 +5,8 @@ import 'dart:async'; import 'package:args/command_runner.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; +import 'package:test/test.dart' as test_package show TypeMatcher; import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/base/file_system.dart'; @@ -15,6 +16,12 @@ import 'package:flutter_tools/src/commands/create.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/runner/flutter_command_runner.dart'; +export 'package:test/test.dart' hide TypeMatcher, isInstanceOf; // Defines a 'package:test' shim. + +/// A matcher that compares the type of the actual value to the type argument T. +// TODO(ianh): Remove this once https://github.com/dart-lang/matcher/issues/98 is fixed +Matcher isInstanceOf() => new test_package.TypeMatcher(); // ignore: prefer_const_constructors, https://github.com/dart-lang/sdk/issues/32544 + /// Gets the path to the root of the Flutter repository. /// /// This will first look for a `FLUTTER_ROOT` environment variable. If the @@ -76,7 +83,7 @@ Matcher throwsToolExit({int exitCode, String message}) { } /// Matcher for [ToolExit]s. -const Matcher isToolExit = isInstanceOf(); +final Matcher isToolExit = isInstanceOf(); /// Matcher for functions that throw [ProcessExit]. Matcher throwsProcessExit([dynamic exitCode]) { @@ -86,7 +93,7 @@ Matcher throwsProcessExit([dynamic exitCode]) { } /// Matcher for [ProcessExit]s. -const Matcher isProcessExit = isInstanceOf(); +final Matcher isProcessExit = isInstanceOf(); /// Creates a flutter project in the [temp] directory using the /// [arguments] list if specified, or `--no-pub` if not. diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart index a809b300df..0136da1427 100644 --- a/packages/flutter_tools/test/src/context.dart +++ b/packages/flutter_tools/test/src/context.dart @@ -23,7 +23,6 @@ import 'package:flutter_tools/src/version.dart'; import 'package:meta/meta.dart'; import 'package:mockito/mockito.dart'; import 'package:quiver/time.dart'; -import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart index 886f8eb1da..19e6e45574 100644 --- a/packages/flutter_tools/test/src/mocks.dart +++ b/packages/flutter_tools/test/src/mocks.dart @@ -19,7 +19,8 @@ import 'package:flutter_tools/src/ios/simulators.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; + +import 'common.dart'; class MockApplicationPackageStore extends ApplicationPackageStore { MockApplicationPackageStore() : super( diff --git a/packages/flutter_tools/test/stop_test.dart b/packages/flutter_tools/test/stop_test.dart index fab854e896..e74e42af85 100644 --- a/packages/flutter_tools/test/stop_test.dart +++ b/packages/flutter_tools/test/stop_test.dart @@ -7,7 +7,6 @@ import 'dart:async'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/stop.dart'; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/tester/flutter_tester_test.dart b/packages/flutter_tools/test/tester/flutter_tester_test.dart index 3d77ca2736..e85edabad9 100644 --- a/packages/flutter_tools/test/tester/flutter_tester_test.dart +++ b/packages/flutter_tools/test/tester/flutter_tester_test.dart @@ -12,7 +12,6 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/tester/flutter_tester.dart'; import 'package:process/process.dart'; -import 'package:test/test.dart'; import '../src/common.dart'; import '../src/context.dart'; @@ -59,7 +58,7 @@ void main() { expect(devices, hasLength(1)); final Device device = devices.single; - expect(device, const isInstanceOf()); + expect(device, isInstanceOf()); expect(device.id, 'flutter-tester'); }); }); diff --git a/packages/flutter_tools/test/trace_test.dart b/packages/flutter_tools/test/trace_test.dart index b823f69634..d824934235 100644 --- a/packages/flutter_tools/test/trace_test.dart +++ b/packages/flutter_tools/test/trace_test.dart @@ -4,7 +4,6 @@ import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/commands/trace.dart'; -import 'package:test/test.dart'; import 'src/common.dart'; import 'src/context.dart'; diff --git a/packages/flutter_tools/test/utils_test.dart b/packages/flutter_tools/test/utils_test.dart index 4b03f09dad..0504cbc10d 100644 --- a/packages/flutter_tools/test/utils_test.dart +++ b/packages/flutter_tools/test/utils_test.dart @@ -6,7 +6,8 @@ import 'dart:async'; import 'package:flutter_tools/src/base/utils.dart'; import 'package:flutter_tools/src/base/version.dart'; -import 'package:test/test.dart'; + +import 'src/common.dart'; void main() { group('SettingsFile', () { diff --git a/packages/flutter_tools/test/version_test.dart b/packages/flutter_tools/test/version_test.dart index 45d67da16c..6060d5f10f 100644 --- a/packages/flutter_tools/test/version_test.dart +++ b/packages/flutter_tools/test/version_test.dart @@ -8,7 +8,6 @@ import 'package:collection/collection.dart' show ListEquality; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; import 'package:quiver/time.dart'; -import 'package:test/test.dart'; import 'package:flutter_tools/src/base/context.dart'; import 'package:flutter_tools/src/base/io.dart'; @@ -16,6 +15,7 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/version.dart'; +import 'src/common.dart'; import 'src/context.dart'; final Clock _testClock = new Clock.fixed(new DateTime(2015, 1, 1)); diff --git a/packages/flutter_tools/test/vmservice_test.dart b/packages/flutter_tools/test/vmservice_test.dart index 34d60cf90c..c96e839f6a 100644 --- a/packages/flutter_tools/test/vmservice_test.dart +++ b/packages/flutter_tools/test/vmservice_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:test/test.dart'; - import 'package:flutter_tools/src/vmservice.dart'; import 'src/common.dart'; diff --git a/packages/fuchsia_remote_debug_protocol/pubspec.yaml b/packages/fuchsia_remote_debug_protocol/pubspec.yaml index a8bf85f02f..2429e993a8 100644 --- a/packages/fuchsia_remote_debug_protocol/pubspec.yaml +++ b/packages/fuchsia_remote_debug_protocol/pubspec.yaml @@ -5,7 +5,7 @@ author: Flutter Authors dependencies: json_rpc_2: 2.0.9 - process: 3.0.3 + process: 3.0.5 meta: 1.1.5 web_socket_channel: 1.0.9 flutter_test: @@ -21,11 +21,11 @@ dependencies: collection: 1.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - csslib: 0.14.4+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - file: 5.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + csslib: 0.14.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + file: 5.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - html: 0.13.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.11.3+17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -34,14 +34,14 @@ dependencies: js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - platform: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" plugin: 0.2.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.3.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -55,7 +55,7 @@ dependencies: source_span: 1.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 1.6.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" utf: 0.9.0+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -66,6 +66,6 @@ dependencies: dev_dependencies: mockito: 3.0.0-beta - test: 0.12.41 + test: 0.12.42 -# PUBSPEC CHECKSUM: 39ca +# PUBSPEC CHECKSUM: dc77 diff --git a/packages/fuchsia_remote_debug_protocol/test/common.dart b/packages/fuchsia_remote_debug_protocol/test/common.dart new file mode 100644 index 0000000000..79d7310b12 --- /dev/null +++ b/packages/fuchsia_remote_debug_protocol/test/common.dart @@ -0,0 +1,14 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Defines a 'package:test' shim. +// TODO(ianh): Remove this file once https://github.com/dart-lang/matcher/issues/98 is fixed + +import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; +import 'package:test/test.dart' as test_package show TypeMatcher; + +export 'package:test/test.dart' hide TypeMatcher, isInstanceOf; + +/// A matcher that compares the type of the actual value to the type argument T. +Matcher isInstanceOf() => new test_package.TypeMatcher(); // ignore: prefer_const_constructors, https://github.com/dart-lang/sdk/issues/32544 diff --git a/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart b/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart index e8294b76a2..40e7de80ff 100644 --- a/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart +++ b/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart @@ -4,12 +4,13 @@ import 'dart:async'; -import 'package:test/test.dart'; import 'package:mockito/mockito.dart'; import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; import 'package:fuchsia_remote_debug_protocol/fuchsia_remote_debug_protocol.dart'; +import 'common.dart'; + void main() { group('FuchsiaRemoteConnection.connect', () { MockSshCommandRunner mockRunner; @@ -152,7 +153,7 @@ void main() { // Should fail as no env variable has been passed. expect(failingFunction, - throwsA(const isInstanceOf())); + throwsA(isInstanceOf())); }); }); } diff --git a/packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart b/packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart index 8dc774a91e..be717c1ff9 100644 --- a/packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart +++ b/packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart @@ -7,7 +7,8 @@ import 'dart:async'; import 'package:fuchsia_remote_debug_protocol/src/dart/dart_vm.dart'; import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; + +import '../../common.dart'; void main() { group('DartVm.connect', () { @@ -203,7 +204,7 @@ void main() { } // Both views should be invalid as they were missing required fields. - expect(failingFunction, throwsA(const isInstanceOf())); + expect(failingFunction, throwsA(isInstanceOf())); }); test('get isolates by pattern', () async { @@ -283,7 +284,7 @@ void main() { } // Both views should be invalid as they were missing required fields. - expect(failingFunction, throwsA(const isInstanceOf())); + expect(failingFunction, throwsA(isInstanceOf())); }); }); @@ -315,7 +316,7 @@ void main() { await vm.invokeRpc('somesillyfunction', timeout: timeoutTime); } - expect(failingFunction, throwsA(const isInstanceOf())); + expect(failingFunction, throwsA(isInstanceOf())); }); }); } diff --git a/packages/fuchsia_remote_debug_protocol/test/src/runners/ssh_command_runner_test.dart b/packages/fuchsia_remote_debug_protocol/test/src/runners/ssh_command_runner_test.dart index 2762515441..2fb9ef6db0 100644 --- a/packages/fuchsia_remote_debug_protocol/test/src/runners/ssh_command_runner_test.dart +++ b/packages/fuchsia_remote_debug_protocol/test/src/runners/ssh_command_runner_test.dart @@ -5,11 +5,12 @@ import 'dart:async'; import 'dart:io' show ProcessResult; -import 'package:test/test.dart'; import 'package:mockito/mockito.dart'; import 'package:process/process.dart'; import 'package:fuchsia_remote_debug_protocol/src/runners/ssh_command_runner.dart'; +import '../../common.dart'; + void main() { group('SshCommandRunner.constructors', () { test('throws exception with invalid address', () async { @@ -99,7 +100,7 @@ void main() { await runner.run('oihaw'); } - expect(failingFunction, throwsA(const isInstanceOf())); + expect(failingFunction, throwsA(isInstanceOf())); }); test('verify correct args with config', () async {