From c9a3138895fd1c535706829ea71611dc99d806fc Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Mon, 24 Apr 2023 14:44:29 -0700 Subject: [PATCH] Remove ignores for undeprecated libraries (#2000) The `scaffolding.dart` and `backend.dart` libraries are no longer deprecated in the latest release of `test_api`. --- pkgs/test/CHANGELOG.md | 2 ++ pkgs/test/lib/src/runner/browser/browser_manager.dart | 1 - pkgs/test/lib/src/runner/browser/platform.dart | 1 - pkgs/test/lib/src/runner/node/platform.dart | 1 - pkgs/test/lib/src/runner/wasm/platform.dart | 1 - pkgs/test/pubspec.yaml | 2 +- pkgs/test/test/runner/compiler_runtime_matrix_test.dart | 2 +- pkgs/test_core/lib/backend.dart | 1 - pkgs/test_core/lib/scaffolding.dart | 2 +- pkgs/test_core/lib/src/direct_run.dart | 2 +- pkgs/test_core/lib/src/platform.dart | 1 - pkgs/test_core/lib/src/runner.dart | 1 - pkgs/test_core/lib/src/runner/compiler_selection.dart | 1 - pkgs/test_core/lib/src/runner/configuration.dart | 4 +--- pkgs/test_core/lib/src/runner/configuration/args.dart | 6 ++---- pkgs/test_core/lib/src/runner/configuration/load.dart | 4 +--- pkgs/test_core/lib/src/runner/hybrid_listener.dart | 1 - pkgs/test_core/lib/src/runner/load_suite.dart | 1 - pkgs/test_core/lib/src/runner/parse_metadata.dart | 4 +--- pkgs/test_core/lib/src/runner/plugin/platform_helpers.dart | 1 - .../lib/src/runner/plugin/remote_platform_helpers.dart | 1 - pkgs/test_core/lib/src/runner/runner_test.dart | 1 - pkgs/test_core/lib/src/runner/spawn_hybrid.dart | 1 - pkgs/test_core/lib/src/runner/suite.dart | 4 +--- pkgs/test_core/lib/src/runner/vm/platform.dart | 2 +- pkgs/test_core/lib/src/runner/vm/test_compiler.dart | 2 +- pkgs/test_core/lib/src/util/stack_trace_mapper.dart | 1 - 27 files changed, 14 insertions(+), 37 deletions(-) diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md index 3959b89b2..828fb16fd 100644 --- a/pkgs/test/CHANGELOG.md +++ b/pkgs/test/CHANGELOG.md @@ -1,3 +1,5 @@ +## 1.24.3-wip + ## 1.24.2 * Copy an existing nonce from a script on the test HTML page to the script diff --git a/pkgs/test/lib/src/runner/browser/browser_manager.dart b/pkgs/test/lib/src/runner/browser/browser_manager.dart index a080ad0d2..0975689c8 100644 --- a/pkgs/test/lib/src/runner/browser/browser_manager.dart +++ b/pkgs/test/lib/src/runner/browser/browser_manager.dart @@ -8,7 +8,6 @@ import 'dart:convert'; import 'package:async/async.dart'; import 'package:pool/pool.dart'; import 'package:stream_channel/stream_channel.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show Compiler, Runtime, StackTraceMapper; import 'package:test_core/src/runner/application_exception.dart'; // ignore: implementation_imports import 'package:test_core/src/runner/configuration.dart'; // ignore: implementation_imports diff --git a/pkgs/test/lib/src/runner/browser/platform.dart b/pkgs/test/lib/src/runner/browser/platform.dart index 80fd0dfd7..1972406ed 100644 --- a/pkgs/test/lib/src/runner/browser/platform.dart +++ b/pkgs/test/lib/src/runner/browser/platform.dart @@ -15,7 +15,6 @@ import 'package:shelf/shelf_io.dart' as shelf_io; import 'package:shelf_packages_handler/shelf_packages_handler.dart'; import 'package:shelf_static/shelf_static.dart'; import 'package:shelf_web_socket/shelf_web_socket.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show Compiler, Runtime, StackTraceMapper, SuitePlatform; import 'package:test_core/src/runner/configuration.dart'; // ignore: implementation_imports diff --git a/pkgs/test/lib/src/runner/node/platform.dart b/pkgs/test/lib/src/runner/node/platform.dart index 23a362a74..9e42fa8a1 100644 --- a/pkgs/test/lib/src/runner/node/platform.dart +++ b/pkgs/test/lib/src/runner/node/platform.dart @@ -11,7 +11,6 @@ import 'package:node_preamble/preamble.dart' as preamble; import 'package:package_config/package_config.dart'; import 'package:path/path.dart' as p; import 'package:stream_channel/stream_channel.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show Compiler, Runtime, StackTraceMapper, SuitePlatform; import 'package:test_core/src/runner/application_exception.dart'; // ignore: implementation_imports diff --git a/pkgs/test/lib/src/runner/wasm/platform.dart b/pkgs/test/lib/src/runner/wasm/platform.dart index 01031711c..803927c62 100644 --- a/pkgs/test/lib/src/runner/wasm/platform.dart +++ b/pkgs/test/lib/src/runner/wasm/platform.dart @@ -14,7 +14,6 @@ import 'package:shelf/shelf_io.dart' as shelf_io; import 'package:shelf_packages_handler/shelf_packages_handler.dart'; import 'package:shelf_static/shelf_static.dart'; import 'package:shelf_web_socket/shelf_web_socket.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show Compiler, Runtime, SuitePlatform; import 'package:test_core/src/runner/configuration.dart'; // ignore: implementation_imports import 'package:test_core/src/runner/package_version.dart'; // ignore: implementation_imports diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml index 97d75eec9..58cb29648 100644 --- a/pkgs/test/pubspec.yaml +++ b/pkgs/test/pubspec.yaml @@ -1,5 +1,5 @@ name: test -version: 1.24.2 +version: 1.24.3-wip description: >- A full featured library for writing and running Dart tests across platforms. repository: https://github.com/dart-lang/test/tree/master/pkgs/test diff --git a/pkgs/test/test/runner/compiler_runtime_matrix_test.dart b/pkgs/test/test/runner/compiler_runtime_matrix_test.dart index 3dfe7358b..2fc90bd3a 100644 --- a/pkgs/test/test/runner/compiler_runtime_matrix_test.dart +++ b/pkgs/test/test/runner/compiler_runtime_matrix_test.dart @@ -6,7 +6,7 @@ import 'dart:io'; import 'package:test/test.dart'; -import 'package:test_api/backend.dart'; // ignore: deprecated_member_use +import 'package:test_api/backend.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; import '../io.dart'; diff --git a/pkgs/test_core/lib/backend.dart b/pkgs/test_core/lib/backend.dart index f287e80a6..69f655247 100644 --- a/pkgs/test_core/lib/backend.dart +++ b/pkgs/test_core/lib/backend.dart @@ -6,7 +6,6 @@ 'Please use package:test.') library test_core.backend; -//ignore: deprecated_member_use export 'package:test_api/backend.dart' show Compiler, Metadata, PlatformSelector, Runtime, SuitePlatform; diff --git a/pkgs/test_core/lib/scaffolding.dart b/pkgs/test_core/lib/scaffolding.dart index ab2f96103..ab1ec5985 100644 --- a/pkgs/test_core/lib/scaffolding.dart +++ b/pkgs/test_core/lib/scaffolding.dart @@ -10,7 +10,7 @@ import 'dart:async'; import 'package:meta/meta.dart' show isTest, isTestGroup; import 'package:path/path.dart' as p; -import 'package:test_api/backend.dart'; //ignore: deprecated_member_use +import 'package:test_api/backend.dart'; import 'package:test_api/scaffolding.dart' show Timeout, pumpEventQueue; import 'package:test_api/src/backend/declarer.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/invoker.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/direct_run.dart b/pkgs/test_core/lib/src/direct_run.dart index 838a8804f..c5742579c 100644 --- a/pkgs/test_core/lib/src/direct_run.dart +++ b/pkgs/test_core/lib/src/direct_run.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:collection'; import 'package:path/path.dart' as p; -import 'package:test_api/backend.dart'; //ignore: deprecated_member_use +import 'package:test_api/backend.dart'; import 'package:test_api/src/backend/declarer.dart'; //ignore: implementation_imports import 'package:test_api/src/backend/group.dart'; //ignore: implementation_imports import 'package:test_api/src/backend/group_entry.dart'; //ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/platform.dart b/pkgs/test_core/lib/src/platform.dart index f1fc22b59..a70c05a1e 100644 --- a/pkgs/test_core/lib/src/platform.dart +++ b/pkgs/test_core/lib/src/platform.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -// ignore: deprecated_member_use export 'package:test_api/backend.dart' show SuitePlatform, Runtime; export 'package:test_core/src/runner/configuration.dart' show Configuration; export 'package:test_core/src/runner/environment.dart' diff --git a/pkgs/test_core/lib/src/runner.dart b/pkgs/test_core/lib/src/runner.dart index 8f09cf1c9..05531368a 100644 --- a/pkgs/test_core/lib/src/runner.dart +++ b/pkgs/test_core/lib/src/runner.dart @@ -8,7 +8,6 @@ import 'dart:io'; import 'package:async/async.dart'; import 'package:boolean_selector/boolean_selector.dart'; import 'package:stack_trace/stack_trace.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show PlatformSelector, Runtime, SuitePlatform; import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/compiler_selection.dart b/pkgs/test_core/lib/src/runner/compiler_selection.dart index f474d6bff..5f7df78f7 100644 --- a/pkgs/test_core/lib/src/runner/compiler_selection.dart +++ b/pkgs/test_core/lib/src/runner/compiler_selection.dart @@ -3,7 +3,6 @@ // BSD-style license that can be found in the LICENSE file. import 'package:source_span/source_span.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart'; /// A compiler with which the user has chosen to run tests. diff --git a/pkgs/test_core/lib/src/runner/configuration.dart b/pkgs/test_core/lib/src/runner/configuration.dart index 793f43adc..b8d568c0a 100644 --- a/pkgs/test_core/lib/src/runner/configuration.dart +++ b/pkgs/test_core/lib/src/runner/configuration.dart @@ -10,9 +10,7 @@ import 'package:collection/collection.dart'; import 'package:glob/glob.dart'; import 'package:path/path.dart' as p; import 'package:source_span/source_span.dart'; -import 'package:test_api/scaffolding.dart' // ignore: deprecated_member_use - show - Timeout; +import 'package:test_api/scaffolding.dart' show Timeout; import 'package:test_api/src/backend/platform_selector.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/configuration/args.dart b/pkgs/test_core/lib/src/runner/configuration/args.dart index 8be159c56..c31a2536f 100644 --- a/pkgs/test_core/lib/src/runner/configuration/args.dart +++ b/pkgs/test_core/lib/src/runner/configuration/args.dart @@ -7,10 +7,8 @@ import 'dart:math'; import 'package:args/args.dart'; import 'package:boolean_selector/boolean_selector.dart'; -import 'package:test_api/backend.dart'; // ignore: deprecated_member_use -import 'package:test_api/scaffolding.dart' // ignore: deprecated_member_use - show - Timeout; +import 'package:test_api/backend.dart'; +import 'package:test_api/scaffolding.dart' show Timeout; import '../../util/io.dart'; import '../compiler_selection.dart'; diff --git a/pkgs/test_core/lib/src/runner/configuration/load.dart b/pkgs/test_core/lib/src/runner/configuration/load.dart index 77e9ee75b..02073cd8a 100644 --- a/pkgs/test_core/lib/src/runner/configuration/load.dart +++ b/pkgs/test_core/lib/src/runner/configuration/load.dart @@ -8,9 +8,7 @@ import 'package:boolean_selector/boolean_selector.dart'; import 'package:glob/glob.dart'; import 'package:path/path.dart' as p; import 'package:source_span/source_span.dart'; -import 'package:test_api/scaffolding.dart' // ignore: deprecated_member_use - show - Timeout; +import 'package:test_api/scaffolding.dart' show Timeout; import 'package:test_api/src/backend/operating_system.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/platform_selector.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/util/identifier_regex.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/hybrid_listener.dart b/pkgs/test_core/lib/src/runner/hybrid_listener.dart index f7fdb8608..bf2daa2b5 100644 --- a/pkgs/test_core/lib/src/runner/hybrid_listener.dart +++ b/pkgs/test_core/lib/src/runner/hybrid_listener.dart @@ -9,7 +9,6 @@ import 'package:async/async.dart'; import 'package:stack_trace/stack_trace.dart'; import 'package:stream_channel/isolate_channel.dart'; import 'package:stream_channel/stream_channel.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show RemoteException; import 'package:test_api/src/utils.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/load_suite.dart b/pkgs/test_core/lib/src/runner/load_suite.dart index 2c29bc2c0..db6b12e95 100644 --- a/pkgs/test_core/lib/src/runner/load_suite.dart +++ b/pkgs/test_core/lib/src/runner/load_suite.dart @@ -5,7 +5,6 @@ import 'dart:async'; import 'package:stack_trace/stack_trace.dart'; -// ignore: deprecated_member_use import 'package:test_api/scaffolding.dart' show Timeout; import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/invoker.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/parse_metadata.dart b/pkgs/test_core/lib/src/runner/parse_metadata.dart index 451f17570..8dc60e674 100644 --- a/pkgs/test_core/lib/src/runner/parse_metadata.dart +++ b/pkgs/test_core/lib/src/runner/parse_metadata.dart @@ -6,9 +6,7 @@ import 'package:analyzer/dart/analysis/utilities.dart'; import 'package:analyzer/dart/ast/ast.dart'; import 'package:path/path.dart' as p; import 'package:source_span/source_span.dart'; -import 'package:test_api/scaffolding.dart' // ignore: deprecated_member_use - show - Timeout; +import 'package:test_api/scaffolding.dart' show Timeout; import 'package:test_api/src/backend/metadata.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/platform_selector.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/util/identifier_regex.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/plugin/platform_helpers.dart b/pkgs/test_core/lib/src/runner/plugin/platform_helpers.dart index f40a71cd4..660c4374b 100644 --- a/pkgs/test_core/lib/src/runner/plugin/platform_helpers.dart +++ b/pkgs/test_core/lib/src/runner/plugin/platform_helpers.dart @@ -7,7 +7,6 @@ import 'dart:io'; import 'package:stack_trace/stack_trace.dart'; import 'package:stream_channel/stream_channel.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show Metadata, RemoteException, SuitePlatform; import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/plugin/remote_platform_helpers.dart b/pkgs/test_core/lib/src/runner/plugin/remote_platform_helpers.dart index 7e502079f..8eb2b76ca 100644 --- a/pkgs/test_core/lib/src/runner/plugin/remote_platform_helpers.dart +++ b/pkgs/test_core/lib/src/runner/plugin/remote_platform_helpers.dart @@ -3,7 +3,6 @@ // BSD-style license that can be found in the LICENSE file. import 'package:stream_channel/stream_channel.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show RemoteListener, StackTraceFormatter, StackTraceMapper; diff --git a/pkgs/test_core/lib/src/runner/runner_test.dart b/pkgs/test_core/lib/src/runner/runner_test.dart index 10ef8bc50..68658da9f 100644 --- a/pkgs/test_core/lib/src/runner/runner_test.dart +++ b/pkgs/test_core/lib/src/runner/runner_test.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:stack_trace/stack_trace.dart'; import 'package:stream_channel/stream_channel.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show Metadata, RemoteException, SuitePlatform; import 'package:test_api/src/backend/group.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/spawn_hybrid.dart b/pkgs/test_core/lib/src/runner/spawn_hybrid.dart index e21b8f80c..e49f63e7c 100644 --- a/pkgs/test_core/lib/src/runner/spawn_hybrid.dart +++ b/pkgs/test_core/lib/src/runner/spawn_hybrid.dart @@ -10,7 +10,6 @@ import 'package:async/async.dart'; import 'package:path/path.dart' as p; import 'package:stream_channel/isolate_channel.dart'; import 'package:stream_channel/stream_channel.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show RemoteException; import 'package:test_api/src/backend/suite.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/suite.dart b/pkgs/test_core/lib/src/runner/suite.dart index 32a425b70..c5175b65d 100644 --- a/pkgs/test_core/lib/src/runner/suite.dart +++ b/pkgs/test_core/lib/src/runner/suite.dart @@ -5,9 +5,7 @@ import 'package:boolean_selector/boolean_selector.dart'; import 'package:collection/collection.dart'; import 'package:source_span/source_span.dart'; -import 'package:test_api/scaffolding.dart' // ignore: deprecated_member_use - show - Timeout; +import 'package:test_api/scaffolding.dart' show Timeout; import 'package:test_api/src/backend/metadata.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/platform_selector.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports diff --git a/pkgs/test_core/lib/src/runner/vm/platform.dart b/pkgs/test_core/lib/src/runner/vm/platform.dart index c260c9cd0..0a8402388 100644 --- a/pkgs/test_core/lib/src/runner/vm/platform.dart +++ b/pkgs/test_core/lib/src/runner/vm/platform.dart @@ -13,7 +13,7 @@ import 'package:coverage/coverage.dart'; import 'package:path/path.dart' as p; import 'package:stream_channel/isolate_channel.dart'; import 'package:stream_channel/stream_channel.dart'; -import 'package:test_api/backend.dart'; // ignore: deprecated_member_use +import 'package:test_api/backend.dart'; import 'package:test_core/src/runner/vm/test_compiler.dart'; import 'package:vm_service/vm_service.dart' hide Isolate; import 'package:vm_service/vm_service_io.dart'; diff --git a/pkgs/test_core/lib/src/runner/vm/test_compiler.dart b/pkgs/test_core/lib/src/runner/vm/test_compiler.dart index 66c3bb837..ba3c4b7a3 100644 --- a/pkgs/test_core/lib/src/runner/vm/test_compiler.dart +++ b/pkgs/test_core/lib/src/runner/vm/test_compiler.dart @@ -10,7 +10,7 @@ import 'package:async/async.dart'; import 'package:frontend_server_client/frontend_server_client.dart'; import 'package:path/path.dart' as p; import 'package:pool/pool.dart'; -import 'package:test_api/backend.dart'; // ignore: deprecated_member_use +import 'package:test_api/backend.dart'; import '../../util/dart.dart'; import '../../util/io.dart'; diff --git a/pkgs/test_core/lib/src/util/stack_trace_mapper.dart b/pkgs/test_core/lib/src/util/stack_trace_mapper.dart index 9e8650a3a..70acf59c6 100644 --- a/pkgs/test_core/lib/src/util/stack_trace_mapper.dart +++ b/pkgs/test_core/lib/src/util/stack_trace_mapper.dart @@ -4,7 +4,6 @@ import 'package:source_map_stack_trace/source_map_stack_trace.dart' as mapper; import 'package:source_maps/source_maps.dart'; -// ignore: deprecated_member_use import 'package:test_api/backend.dart' show StackTraceMapper; /// A class for mapping JS stack traces to Dart stack traces using source maps.