diff --git a/integration_tests/regression/lib/issue_2142/test.dart b/integration_tests/regression/lib/issue_2142/test.dart index 06afc5adc..83fc71547 100644 --- a/integration_tests/regression/lib/issue_2142/test.dart +++ b/integration_tests/regression/lib/issue_2142/test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'import.dart'; diff --git a/integration_tests/regression/pubspec.yaml b/integration_tests/regression/pubspec.yaml index 69b240caf..2f257ceed 100644 --- a/integration_tests/regression/pubspec.yaml +++ b/integration_tests/regression/pubspec.yaml @@ -4,4 +4,5 @@ environment: sdk: ^3.7.0 resolution: workspace dependencies: + matcher: any test: any diff --git a/integration_tests/spawn_hybrid/pubspec.yaml b/integration_tests/spawn_hybrid/pubspec.yaml index 4a3499fe2..32cb2a8be 100644 --- a/integration_tests/spawn_hybrid/pubspec.yaml +++ b/integration_tests/spawn_hybrid/pubspec.yaml @@ -8,6 +8,7 @@ dependencies: path: ^1.8.2 stream_channel: ^2.1.0 dev_dependencies: + matcher: any other_package: path: other_package/ test: any diff --git a/integration_tests/spawn_hybrid/test/hybrid_test.dart b/integration_tests/spawn_hybrid/test/hybrid_test.dart index 3ca222eb6..04516cd42 100644 --- a/integration_tests/spawn_hybrid/test/hybrid_test.dart +++ b/integration_tests/spawn_hybrid/test/hybrid_test.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'package:async/async.dart'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:stream_channel/stream_channel.dart'; import 'package:test/test.dart'; diff --git a/integration_tests/spawn_hybrid/test/hybrid_test_io.dart b/integration_tests/spawn_hybrid/test/hybrid_test_io.dart index 512fc4be6..3c37985ea 100644 --- a/integration_tests/spawn_hybrid/test/hybrid_test_io.dart +++ b/integration_tests/spawn_hybrid/test/hybrid_test_io.dart @@ -7,6 +7,7 @@ library; import 'dart:io'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; diff --git a/integration_tests/spawn_hybrid/test/subdir/hybrid_test.dart b/integration_tests/spawn_hybrid/test/subdir/hybrid_test.dart index 9937f27d1..a7578d813 100644 --- a/integration_tests/spawn_hybrid/test/subdir/hybrid_test.dart +++ b/integration_tests/spawn_hybrid/test/subdir/hybrid_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; void main() { diff --git a/integration_tests/wasm/pubspec.yaml b/integration_tests/wasm/pubspec.yaml index 53f7f7ce7..2df5a39a3 100644 --- a/integration_tests/wasm/pubspec.yaml +++ b/integration_tests/wasm/pubspec.yaml @@ -4,4 +4,5 @@ environment: sdk: ^3.7.0 resolution: workspace dev_dependencies: + matcher: any test: any diff --git a/integration_tests/wasm/test/hello_world_test.dart b/integration_tests/wasm/test/hello_world_test.dart index 0cd79979a..3d0b03cc2 100644 --- a/integration_tests/wasm/test/hello_world_test.dart +++ b/integration_tests/wasm/test/hello_world_test.dart @@ -9,6 +9,7 @@ @Retry(2) library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; void main() { diff --git a/pkgs/fake_async/pubspec.yaml b/pkgs/fake_async/pubspec.yaml index b804d3b51..0485f583f 100644 --- a/pkgs/fake_async/pubspec.yaml +++ b/pkgs/fake_async/pubspec.yaml @@ -16,4 +16,5 @@ dependencies: dev_dependencies: async: ^2.5.0 dart_flutter_team_lints: ^3.0.0 + matcher: any test: ^1.16.0 diff --git a/pkgs/fake_async/test/fake_async_test.dart b/pkgs/fake_async/test/fake_async_test.dart index 8a22d39fc..f52cc8577 100644 --- a/pkgs/fake_async/test/fake_async_test.dart +++ b/pkgs/fake_async/test/fake_async_test.dart @@ -16,6 +16,8 @@ import 'dart:async'; import 'package:clock/clock.dart'; import 'package:fake_async/fake_async.dart'; +// ignore: unnecessary_import +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; void main() { diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md index 4adfc809a..92eb6e6c9 100644 --- a/pkgs/test/CHANGELOG.md +++ b/pkgs/test/CHANGELOG.md @@ -209,6 +209,9 @@ version of the `test_api` package, but `flutter test` does not check the version of packages in the pub solve for user test code. +* Deprecate the export of `package:matcher` APIs. Add an import to + `package:matcher/expect.dart`. + ## 1.24.0 * Support the `--compiler` flag, which can be used to configure which compiler diff --git a/pkgs/test/lib/fix_data/fix_expect_import.yaml b/pkgs/test/lib/fix_data/fix_expect_import.yaml new file mode 100644 index 000000000..f0e0acd40 --- /dev/null +++ b/pkgs/test/lib/fix_data/fix_expect_import.yaml @@ -0,0 +1,1366 @@ +version: 1 +transforms: + - title: 'Replace CustomMatcher' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + class: 'CustomMatcher' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + class: 'CustomMatcher' + - title: 'Replace Description' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + class: 'Description' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + class: 'Description' + - title: 'Replace isInstanceOf' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + class: 'isInstanceOf' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + class: 'isInstanceOf' + - title: 'Replace Matcher' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + class: 'Matcher' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + class: 'Matcher' + - title: 'Replace StreamMatcher' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + class: 'StreamMatcher' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + class: 'StreamMatcher' + - title: 'Replace StringDescription' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + class: 'StringDescription' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + class: 'StringDescription' + - title: 'Replace Throws' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + class: 'Throws' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + class: 'Throws' + - title: 'Replace TypeMatcher' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + class: 'TypeMatcher' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + class: 'TypeMatcher' + - title: 'Replace anything' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'anything' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'anything' + - title: 'Replace isArgumentError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isArgumentError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isArgumentError' + - title: 'Replace isCastError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isCastError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isCastError' + - title: 'Replace isConcurrentModificationError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isConcurrentModificationError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isConcurrentModificationError' + - title: 'Replace isCyclicInitializationError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isCyclicInitializationError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isCyclicInitializationError' + - title: 'Replace isEmpty' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isEmpty' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isEmpty' + - title: 'Replace isException' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isException' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isException' + - title: 'Replace isFalse' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isFalse' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isFalse' + - title: 'Replace isFormatException' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isFormatException' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isFormatException' + - title: 'Replace isList' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isList' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isList' + - title: 'Replace isMap' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isMap' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isMap' + - title: 'Replace isNaN' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNaN' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNaN' + - title: 'Replace isNegative' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNegative' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNegative' + - title: 'Replace isNonNegative' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNonNegative' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNonNegative' + - title: 'Replace isNonPositive' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNonPositive' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNonPositive' + - title: 'Replace isNonZero' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNonZero' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNonZero' + - title: 'Replace isNoSuchMethodError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNoSuchMethodError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNoSuchMethodError' + - title: 'Replace isNotEmpty' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNotEmpty' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNotEmpty' + - title: 'Replace isNotNaN' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNotNaN' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNotNaN' + - title: 'Replace isNotNull' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNotNull' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNotNull' + - title: 'Replace isNull' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNull' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNull' + - title: 'Replace isNullThrownError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isNullThrownError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isNullThrownError' + - title: 'Replace isPositive' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isPositive' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isPositive' + - title: 'Replace isRangeError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isRangeError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isRangeError' + - title: 'Replace isStateError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isStateError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isStateError' + - title: 'Replace isTrue' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isTrue' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isTrue' + - title: 'Replace isUnimplementedError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isUnimplementedError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isUnimplementedError' + - title: 'Replace isUnsupportedError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isUnsupportedError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isUnsupportedError' + - title: 'Replace isZero' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'isZero' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'isZero' + - title: 'Replace returnsNormally' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'returnsNormally' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'returnsNormally' + - title: 'Replace throws' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throws' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throws' + - title: 'Replace throwsArgumentError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsArgumentError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsArgumentError' + - title: 'Replace throwsConcurrentModificationError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsConcurrentModificationError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsConcurrentModificationError' + - title: 'Replace throwsCyclicInitializationError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsCyclicInitializationError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsCyclicInitializationError' + - title: 'Replace throwsException' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsException' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsException' + - title: 'Replace throwsFormatException' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsFormatException' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsFormatException' + - title: 'Replace throwsNoSuchMethodError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsNoSuchMethodError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsNoSuchMethodError' + - title: 'Replace throwsNullThrownError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsNullThrownError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsNullThrownError' + - title: 'Replace throwsRangeError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsRangeError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsRangeError' + - title: 'Replace throwsStateError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsStateError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsStateError' + - title: 'Replace throwsUnimplementedError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsUnimplementedError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsUnimplementedError' + - title: 'Replace throwsUnsupportedError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'throwsUnsupportedError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'throwsUnsupportedError' + - title: 'Replace completes' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'completes' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'completes' + - title: 'Replace doesNotComplete' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'doesNotComplete' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'doesNotComplete' + - title: 'Replace emitsDone' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'emitsDone' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'emitsDone' + - title: 'Replace neverCalled' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + variable: 'neverCalled' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + variable: 'neverCalled' + - title: 'Replace addStateInfo' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'addStateInfo' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'addStateInfo' + - title: 'Replace allOf' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'allOf' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'allOf' + - title: 'Replace anyElement' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'anyElement' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'anyElement' + - title: 'Replace anyOf' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'anyOf' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'anyOf' + - title: 'Replace closeTo' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'closeTo' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'closeTo' + - title: 'Replace collapseWhitespace' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'collapseWhitespace' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'collapseWhitespace' + - title: 'Replace completion' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'completion' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'completion' + - title: 'Replace contains' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'contains' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'contains' + - title: 'Replace containsAll' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'containsAll' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'containsAll' + - title: 'Replace containsAllInOrder' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'containsAllInOrder' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'containsAllInOrder' + - title: 'Replace containsOnce' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'containsOnce' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'containsOnce' + - title: 'Replace containsPair' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'containsPair' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'containsPair' + - title: 'Replace containsValue' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'containsValue' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'containsValue' + - title: 'Replace emits' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'emits' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'emits' + - title: 'Replace emitsAnyOf' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'emitsAnyOf' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'emitsAnyOf' + - title: 'Replace emitsError' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'emitsError' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'emitsError' + - title: 'Replace emitsInAnyOrder' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'emitsInAnyOrder' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'emitsInAnyOrder' + - title: 'Replace emitsInOrder' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'emitsInOrder' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'emitsInOrder' + - title: 'Replace emitsThrough' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'emitsThrough' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'emitsThrough' + - title: 'Replace endsWith' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'endsWith' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'endsWith' + - title: 'Replace equals' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'equals' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'equals' + - title: 'Replace equalsIgnoringCase' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'equalsIgnoringCase' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'equalsIgnoringCase' + - title: 'Replace equalsIgnoringWhitespace' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'equalsIgnoringWhitespace' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'equalsIgnoringWhitespace' + - title: 'Replace escape' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'escape' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'escape' + - title: 'Replace everyElement' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'everyElement' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'everyElement' + - title: 'Replace expect' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expect' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expect' + - title: 'Replace expectAsync' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsync' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsync' + - title: 'Replace expectAsync0' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsync0' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsync0' + - title: 'Replace expectAsync1' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsync1' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsync1' + - title: 'Replace expectAsync2' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsync2' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsync2' + - title: 'Replace expectAsync3' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsync3' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsync3' + - title: 'Replace expectAsync4' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsync4' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsync4' + - title: 'Replace expectAsync5' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsync5' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsync5' + - title: 'Replace expectAsync6' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsync6' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsync6' + - title: 'Replace expectAsyncUntil0' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsyncUntil0' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsyncUntil0' + - title: 'Replace expectAsyncUntil1' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsyncUntil1' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsyncUntil1' + - title: 'Replace expectAsyncUntil2' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsyncUntil2' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsyncUntil2' + - title: 'Replace expectAsyncUntil3' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsyncUntil3' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsyncUntil3' + - title: 'Replace expectAsyncUntil4' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsyncUntil4' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsyncUntil4' + - title: 'Replace expectAsyncUntil5' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsyncUntil5' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsyncUntil5' + - title: 'Replace expectAsyncUntil6' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectAsyncUntil6' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectAsyncUntil6' + - title: 'Replace expectLater' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'expectLater' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'expectLater' + - title: 'Replace fail' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'fail' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'fail' + - title: 'Replace greaterThan' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'greaterThan' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'greaterThan' + - title: 'Replace greaterThanOrEqualTo' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'greaterThanOrEqualTo' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'greaterThanOrEqualTo' + - title: 'Replace hasLength' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'hasLength' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'hasLength' + - title: 'Replace inClosedOpenRange' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'inClosedOpenRange' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'inClosedOpenRange' + - title: 'Replace inExclusiveRange' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'inExclusiveRange' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'inExclusiveRange' + - title: 'Replace inInclusiveRange' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'inInclusiveRange' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'inInclusiveRange' + - title: 'Replace inOpenClosedRange' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'inOpenClosedRange' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'inOpenClosedRange' + - title: 'Replace isA' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'isA' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'isA' + - title: 'Replace isIn' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'isIn' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'isIn' + - title: 'Replace isNot' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'isNot' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'isNot' + - title: 'Replace lessThan' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'lessThan' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'lessThan' + - title: 'Replace lessThanOrEqualTo' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'lessThanOrEqualTo' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'lessThanOrEqualTo' + - title: 'Replace matches' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'matches' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'matches' + - title: 'Replace mayEmit' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'mayEmit' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'mayEmit' + - title: 'Replace mayEmitMultiple' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'mayEmitMultiple' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'mayEmitMultiple' + - title: 'Replace neverEmits' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'neverEmits' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'neverEmits' + - title: 'Replace orderedEquals' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'orderedEquals' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'orderedEquals' + - title: 'Replace pairwiseCompare' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'pairwiseCompare' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'pairwiseCompare' + - title: 'Replace predicate' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'predicate' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'predicate' + - title: 'Replace prints' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'prints' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'prints' + - title: 'Replace same' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'same' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'same' + - title: 'Replace startsWith' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'startsWith' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'startsWith' + - title: 'Replace stringContainsInOrder' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'stringContainsInOrder' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'stringContainsInOrder' + - title: 'Replace throwsA' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'throwsA' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'throwsA' + - title: 'Replace unorderedEquals' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'unorderedEquals' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'unorderedEquals' + - title: 'Replace unorderedMatches' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'unorderedMatches' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'unorderedMatches' + - title: 'Replace wrapMatcher' + date: 2024-11-07 + bulkApply: true + element: + uris: ['package:test/test.dart'] + function: 'wrapMatcher' + changes: + - kind: 'replacedBy' + newElement: + uris: ['package:matcher/expect.dart'] + function: 'wrapMatcher' diff --git a/pkgs/test/lib/test.dart b/pkgs/test/lib/test.dart index 6c756a479..6c141afa0 100644 --- a/pkgs/test/lib/test.dart +++ b/pkgs/test/lib/test.dart @@ -12,6 +12,7 @@ /// `package:test/scaffolding.dart` instead. library; +@Deprecated('import `package:matcher/expect.dart`') export 'package:matcher/expect.dart'; // Deprecated exports not surfaced through focused libraries. // ignore: deprecated_member_use diff --git a/pkgs/test/test/io.dart b/pkgs/test/test/io.dart index 8ad784e08..b258bde91 100644 --- a/pkgs/test/test/io.dart +++ b/pkgs/test/test/io.dart @@ -6,6 +6,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:isolate'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/browser/chrome_test.dart b/pkgs/test/test/runner/browser/chrome_test.dart index 8663d2e26..52c3e4980 100644 --- a/pkgs/test/test/runner/browser/chrome_test.dart +++ b/pkgs/test/test/runner/browser/chrome_test.dart @@ -6,6 +6,7 @@ @Tags(['chrome']) library; +import 'package:matcher/expect.dart'; import 'package:test/src/runner/browser/chrome.dart'; import 'package:test/src/runner/executable_settings.dart'; import 'package:test/test.dart'; diff --git a/pkgs/test/test/runner/browser/compact_reporter_test.dart b/pkgs/test/test/runner/browser/compact_reporter_test.dart index 267fabe2d..ddb435141 100644 --- a/pkgs/test/test/runner/browser/compact_reporter_test.dart +++ b/pkgs/test/test/runner/browser/compact_reporter_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/browser/expanded_reporter_test.dart b/pkgs/test/test/runner/browser/expanded_reporter_test.dart index 7c9a4d01c..375184914 100644 --- a/pkgs/test/test/runner/browser/expanded_reporter_test.dart +++ b/pkgs/test/test/runner/browser/expanded_reporter_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/browser/firefox_html_test.dart b/pkgs/test/test/runner/browser/firefox_html_test.dart index c9a5302ae..a4b860407 100644 --- a/pkgs/test/test/runner/browser/firefox_html_test.dart +++ b/pkgs/test/test/runner/browser/firefox_html_test.dart @@ -5,6 +5,7 @@ @TestOn('firefox') library; +import 'package:matcher/expect.dart'; import 'package:test/src/runner/browser/dom.dart' as dom; import 'package:test/test.dart'; diff --git a/pkgs/test/test/runner/browser/firefox_test.dart b/pkgs/test/test/runner/browser/firefox_test.dart index cf89f9e97..0c60a396b 100644 --- a/pkgs/test/test/runner/browser/firefox_test.dart +++ b/pkgs/test/test/runner/browser/firefox_test.dart @@ -5,6 +5,7 @@ @Tags(['firefox']) library; +import 'package:matcher/expect.dart'; import 'package:test/src/runner/browser/firefox.dart'; import 'package:test/src/runner/executable_settings.dart'; import 'package:test/test.dart'; diff --git a/pkgs/test/test/runner/browser/loader_test.dart b/pkgs/test/test/runner/browser/loader_test.dart index def00702c..c93765181 100644 --- a/pkgs/test/test/runner/browser/loader_test.dart +++ b/pkgs/test/test/runner/browser/loader_test.dart @@ -8,6 +8,7 @@ library; import 'dart:io'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/src/runner/browser/platform.dart'; import 'package:test/test.dart'; diff --git a/pkgs/test/test/runner/browser/microsoft_edge_test.dart b/pkgs/test/test/runner/browser/microsoft_edge_test.dart index d3dad90d3..f9cd52450 100644 --- a/pkgs/test/test/runner/browser/microsoft_edge_test.dart +++ b/pkgs/test/test/runner/browser/microsoft_edge_test.dart @@ -6,6 +6,7 @@ @Tags(['edge']) library; +import 'package:matcher/expect.dart'; import 'package:test/src/runner/browser/microsoft_edge.dart'; import 'package:test/src/runner/executable_settings.dart'; import 'package:test/test.dart'; diff --git a/pkgs/test/test/runner/browser/runner_test.dart b/pkgs/test/test/runner/browser/runner_test.dart index 637970df9..2cc59915f 100644 --- a/pkgs/test/test/runner/browser/runner_test.dart +++ b/pkgs/test/test/runner/browser/runner_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/browser/safari_test.dart b/pkgs/test/test/runner/browser/safari_test.dart index e5212b28e..080807313 100644 --- a/pkgs/test/test/runner/browser/safari_test.dart +++ b/pkgs/test/test/runner/browser/safari_test.dart @@ -6,6 +6,7 @@ @Tags(['safari']) library; +import 'package:matcher/expect.dart'; import 'package:test/src/runner/browser/safari.dart'; import 'package:test/src/runner/executable_settings.dart'; import 'package:test/test.dart'; diff --git a/pkgs/test/test/runner/compact_reporter_test.dart b/pkgs/test/test/runner/compact_reporter_test.dart index d0a646424..f9478c13d 100644 --- a/pkgs/test/test/runner/compact_reporter_test.dart +++ b/pkgs/test/test/runner/compact_reporter_test.dart @@ -8,6 +8,7 @@ library; import 'dart:async'; import 'dart:io'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/compiler_runtime_matrix_test.dart b/pkgs/test/test/runner/compiler_runtime_matrix_test.dart index 312ed428f..5ccb898bc 100644 --- a/pkgs/test/test/runner/compiler_runtime_matrix_test.dart +++ b/pkgs/test/test/runner/compiler_runtime_matrix_test.dart @@ -8,6 +8,7 @@ library; import 'dart:io'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/backend.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/compiler_test.dart b/pkgs/test/test/runner/compiler_test.dart index e3f76f0f9..16d3ba2f8 100644 --- a/pkgs/test/test/runner/compiler_test.dart +++ b/pkgs/test/test/runner/compiler_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/configuration/compiler_test.dart b/pkgs/test/test/runner/configuration/compiler_test.dart index bf11b03e6..797da9e73 100644 --- a/pkgs/test/test/runner/configuration/compiler_test.dart +++ b/pkgs/test/test/runner/configuration/compiler_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/configuration/configuration_test.dart b/pkgs/test/test/runner/configuration/configuration_test.dart index e475e524e..f72378915 100644 --- a/pkgs/test/test/runner/configuration/configuration_test.dart +++ b/pkgs/test/test/runner/configuration/configuration_test.dart @@ -6,6 +6,7 @@ library; import 'package:boolean_selector/boolean_selector.dart'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/runner/configuration/reporters.dart'; import 'package:test_core/src/runner/suite.dart'; diff --git a/pkgs/test/test/runner/configuration/custom_platform_test.dart b/pkgs/test/test/runner/configuration/custom_platform_test.dart index 662acb08d..f6f3f9116 100644 --- a/pkgs/test/test/runner/configuration/custom_platform_test.dart +++ b/pkgs/test/test/runner/configuration/custom_platform_test.dart @@ -7,6 +7,7 @@ library; import 'dart:io'; +import 'package:matcher/expect.dart'; import 'package:test/src/runner/browser/default_settings.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/runtime.dart'; diff --git a/pkgs/test/test/runner/configuration/duplicate_names_test.dart b/pkgs/test/test/runner/configuration/duplicate_names_test.dart index 54c6a552f..c2935120d 100644 --- a/pkgs/test/test/runner/configuration/duplicate_names_test.dart +++ b/pkgs/test/test/runner/configuration/duplicate_names_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/configuration/global_test.dart b/pkgs/test/test/runner/configuration/global_test.dart index 2f319e2d1..73d5f7faa 100644 --- a/pkgs/test/test/runner/configuration/global_test.dart +++ b/pkgs/test/test/runner/configuration/global_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/configuration/include_test.dart b/pkgs/test/test/runner/configuration/include_test.dart index b47462501..8cebba8fb 100644 --- a/pkgs/test/test/runner/configuration/include_test.dart +++ b/pkgs/test/test/runner/configuration/include_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_core/src/runner/configuration.dart'; diff --git a/pkgs/test/test/runner/configuration/platform_test.dart b/pkgs/test/test/runner/configuration/platform_test.dart index 9158a878e..af4e62f26 100644 --- a/pkgs/test/test/runner/configuration/platform_test.dart +++ b/pkgs/test/test/runner/configuration/platform_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; import 'package:test_core/src/util/io.dart'; diff --git a/pkgs/test/test/runner/configuration/presets_test.dart b/pkgs/test/test/runner/configuration/presets_test.dart index 1f46c29cf..e61b51a05 100644 --- a/pkgs/test/test/runner/configuration/presets_test.dart +++ b/pkgs/test/test/runner/configuration/presets_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; import 'package:test_core/src/util/io.dart'; diff --git a/pkgs/test/test/runner/configuration/randomize_order_test.dart b/pkgs/test/test/runner/configuration/randomize_order_test.dart index 85338f98c..2550f9cea 100644 --- a/pkgs/test/test/runner/configuration/randomize_order_test.dart +++ b/pkgs/test/test/runner/configuration/randomize_order_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/configuration/suite_test.dart b/pkgs/test/test/runner/configuration/suite_test.dart index d2336674c..a112569a3 100644 --- a/pkgs/test/test/runner/configuration/suite_test.dart +++ b/pkgs/test/test/runner/configuration/suite_test.dart @@ -6,6 +6,7 @@ library; import 'package:boolean_selector/boolean_selector.dart'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/platform_selector.dart'; import 'package:test_api/src/backend/runtime.dart'; diff --git a/pkgs/test/test/runner/configuration/tags_test.dart b/pkgs/test/test/runner/configuration/tags_test.dart index 0389a4ec5..799068b8b 100644 --- a/pkgs/test/test/runner/configuration/tags_test.dart +++ b/pkgs/test/test/runner/configuration/tags_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/configuration/top_level_error_test.dart b/pkgs/test/test/runner/configuration/top_level_error_test.dart index 721d629a4..650a0c3fd 100644 --- a/pkgs/test/test/runner/configuration/top_level_error_test.dart +++ b/pkgs/test/test/runner/configuration/top_level_error_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/configuration/top_level_test.dart b/pkgs/test/test/runner/configuration/top_level_test.dart index 833dd50e8..7a9dc3c23 100644 --- a/pkgs/test/test/runner/configuration/top_level_test.dart +++ b/pkgs/test/test/runner/configuration/top_level_test.dart @@ -8,6 +8,7 @@ library; import 'dart:async'; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/io.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/coverage_test.dart b/pkgs/test/test/runner/coverage_test.dart index 364597275..7c9a3c97e 100644 --- a/pkgs/test/test/runner/coverage_test.dart +++ b/pkgs/test/test/runner/coverage_test.dart @@ -9,6 +9,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:coverage/coverage.dart'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/engine_test.dart b/pkgs/test/test/runner/engine_test.dart index 7a0ec344d..ab13246f1 100644 --- a/pkgs/test/test/runner/engine_test.dart +++ b/pkgs/test/test/runner/engine_test.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'dart:math'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/group.dart'; import 'package:test_api/src/backend/group_entry.dart'; diff --git a/pkgs/test/test/runner/expanded_reporter_test.dart b/pkgs/test/test/runner/expanded_reporter_test.dart index 896de0d25..c4169da46 100644 --- a/pkgs/test/test/runner/expanded_reporter_test.dart +++ b/pkgs/test/test/runner/expanded_reporter_test.dart @@ -7,6 +7,7 @@ library; import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/failures_only_reporter_test.dart b/pkgs/test/test/runner/failures_only_reporter_test.dart index badb817a5..9e70471b6 100644 --- a/pkgs/test/test/runner/failures_only_reporter_test.dart +++ b/pkgs/test/test/runner/failures_only_reporter_test.dart @@ -7,6 +7,7 @@ library; import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/github_reporter_test.dart b/pkgs/test/test/runner/github_reporter_test.dart index f52ceb510..9feb6a7fc 100644 --- a/pkgs/test/test/runner/github_reporter_test.dart +++ b/pkgs/test/test/runner/github_reporter_test.dart @@ -7,6 +7,7 @@ library; import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/json_file_reporter_test.dart b/pkgs/test/test/runner/json_file_reporter_test.dart index 4ec12fe4a..b734669d4 100644 --- a/pkgs/test/test/runner/json_file_reporter_test.dart +++ b/pkgs/test/test/runner/json_file_reporter_test.dart @@ -8,6 +8,7 @@ library; import 'dart:async'; import 'dart:io'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; diff --git a/pkgs/test/test/runner/json_reporter_test.dart b/pkgs/test/test/runner/json_reporter_test.dart index 580eacfbe..2fad72bb3 100644 --- a/pkgs/test/test/runner/json_reporter_test.dart +++ b/pkgs/test/test/runner/json_reporter_test.dart @@ -7,6 +7,7 @@ library; import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/json_reporter_utils.dart b/pkgs/test/test/runner/json_reporter_utils.dart index eec2808aa..4ed70d44a 100644 --- a/pkgs/test/test/runner/json_reporter_utils.dart +++ b/pkgs/test/test/runner/json_reporter_utils.dart @@ -4,6 +4,7 @@ import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/line_and_col_test.dart b/pkgs/test/test/runner/line_and_col_test.dart index 8e1e04a7d..099b65ae5 100644 --- a/pkgs/test/test/runner/line_and_col_test.dart +++ b/pkgs/test/test/runner/line_and_col_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/load_suite_test.dart b/pkgs/test/test/runner/load_suite_test.dart index 5cfd80b0f..4d2971046 100644 --- a/pkgs/test/test/runner/load_suite_test.dart +++ b/pkgs/test/test/runner/load_suite_test.dart @@ -7,6 +7,7 @@ library; import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/group.dart'; import 'package:test_api/src/backend/runtime.dart'; diff --git a/pkgs/test/test/runner/loader_test.dart b/pkgs/test/test/runner/loader_test.dart index 8a0977791..a91ec7cf8 100644 --- a/pkgs/test/test/runner/loader_test.dart +++ b/pkgs/test/test/runner/loader_test.dart @@ -7,6 +7,7 @@ library; import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_api/src/backend/compiler.dart'; diff --git a/pkgs/test/test/runner/name_test.dart b/pkgs/test/test/runner/name_test.dart index fc1b578d7..3b7b92d29 100644 --- a/pkgs/test/test/runner/name_test.dart +++ b/pkgs/test/test/runner/name_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/node/runner_test.dart b/pkgs/test/test/runner/node/runner_test.dart index ec0a288a3..2e239b58f 100644 --- a/pkgs/test/test/runner/node/runner_test.dart +++ b/pkgs/test/test/runner/node/runner_test.dart @@ -9,6 +9,7 @@ library; import 'dart:convert'; import 'dart:io'; +import 'package:matcher/expect.dart'; import 'package:test/src/runner/executable_settings.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/io.dart'; diff --git a/pkgs/test/test/runner/parse_metadata_test.dart b/pkgs/test/test/runner/parse_metadata_test.dart index 97c6cc621..529b65858 100644 --- a/pkgs/test/test/runner/parse_metadata_test.dart +++ b/pkgs/test/test/runner/parse_metadata_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/platform_selector.dart'; import 'package:test_api/src/backend/runtime.dart'; diff --git a/pkgs/test/test/runner/pause_after_load_test.dart b/pkgs/test/test/runner/pause_after_load_test.dart index 8fd205d3e..33bce3c50 100644 --- a/pkgs/test/test/runner/pause_after_load_test.dart +++ b/pkgs/test/test/runner/pause_after_load_test.dart @@ -9,6 +9,7 @@ library; import 'dart:async'; import 'dart:io'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/precompiled_test.dart b/pkgs/test/test/runner/precompiled_test.dart index e37e38389..3f9342a1d 100644 --- a/pkgs/test/test/runner/precompiled_test.dart +++ b/pkgs/test/test/runner/precompiled_test.dart @@ -10,6 +10,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:isolate'; +import 'package:matcher/expect.dart'; import 'package:node_preamble/preamble.dart' as preamble; import 'package:package_config/package_config.dart'; import 'package:path/path.dart' as p; diff --git a/pkgs/test/test/runner/retry_test.dart b/pkgs/test/test/runner/retry_test.dart index 11c7c9a05..fd10b4f4c 100644 --- a/pkgs/test/test/runner/retry_test.dart +++ b/pkgs/test/test/runner/retry_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/runner_test.dart b/pkgs/test/test/runner/runner_test.dart index de2d808e1..98a3bce80 100644 --- a/pkgs/test/test/runner/runner_test.dart +++ b/pkgs/test/test/runner/runner_test.dart @@ -8,6 +8,7 @@ library; import 'dart:io'; import 'dart:math' as math; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; diff --git a/pkgs/test/test/runner/set_up_all_test.dart b/pkgs/test/test/runner/set_up_all_test.dart index 58c02968d..25a33ba34 100644 --- a/pkgs/test/test/runner/set_up_all_test.dart +++ b/pkgs/test/test/runner/set_up_all_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/shard_test.dart b/pkgs/test/test/runner/shard_test.dart index b255da9c8..198380215 100644 --- a/pkgs/test/test/runner/shard_test.dart +++ b/pkgs/test/test/runner/shard_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/exit_codes.dart' as exit_codes; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/signal_test.dart b/pkgs/test/test/runner/signal_test.dart index 5bda9dd1e..8ecdbe41b 100644 --- a/pkgs/test/test/runner/signal_test.dart +++ b/pkgs/test/test/runner/signal_test.dart @@ -9,6 +9,7 @@ library; import 'dart:async'; import 'dart:io'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/skip_expect_test.dart b/pkgs/test/test/runner/skip_expect_test.dart index 756a78f56..438c9de15 100644 --- a/pkgs/test/test/runner/skip_expect_test.dart +++ b/pkgs/test/test/runner/skip_expect_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/solo_test.dart b/pkgs/test/test/runner/solo_test.dart index 87f6f2588..cbb981f7a 100644 --- a/pkgs/test/test/runner/solo_test.dart +++ b/pkgs/test/test/runner/solo_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/suite_load_timeout_test.dart b/pkgs/test/test/runner/suite_load_timeout_test.dart index 5d7aaff62..6b1129480 100644 --- a/pkgs/test/test/runner/suite_load_timeout_test.dart +++ b/pkgs/test/test/runner/suite_load_timeout_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/tag_test.dart b/pkgs/test/test/runner/tag_test.dart index 76ae314ea..a8f224d42 100644 --- a/pkgs/test/test/runner/tag_test.dart +++ b/pkgs/test/test/runner/tag_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/tear_down_all_test.dart b/pkgs/test/test/runner/tear_down_all_test.dart index aedf794ac..9c99f2d51 100644 --- a/pkgs/test/test/runner/tear_down_all_test.dart +++ b/pkgs/test/test/runner/tear_down_all_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/test_chain_test.dart b/pkgs/test/test/runner/test_chain_test.dart index f3b882f60..fea28359d 100644 --- a/pkgs/test/test/runner/test_chain_test.dart +++ b/pkgs/test/test/runner/test_chain_test.dart @@ -7,6 +7,7 @@ library; import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/runner/test_on_test.dart b/pkgs/test/test/runner/test_on_test.dart index 81744fad4..f2c2c43ae 100644 --- a/pkgs/test/test/runner/test_on_test.dart +++ b/pkgs/test/test/runner/test_on_test.dart @@ -9,6 +9,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:isolate'; +import 'package:matcher/expect.dart'; import 'package:package_config/package_config.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/io.dart'; diff --git a/pkgs/test/test/runner/timeout_test.dart b/pkgs/test/test/runner/timeout_test.dart index b4900fadf..ef5d419a2 100644 --- a/pkgs/test/test/runner/timeout_test.dart +++ b/pkgs/test/test/runner/timeout_test.dart @@ -5,6 +5,7 @@ @TestOn('vm') library; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_descriptor/test_descriptor.dart' as d; diff --git a/pkgs/test/test/util/one_off_handler_test.dart b/pkgs/test/test/util/one_off_handler_test.dart index 5263771c1..0092b2162 100644 --- a/pkgs/test/test/util/one_off_handler_test.dart +++ b/pkgs/test/test/util/one_off_handler_test.dart @@ -4,6 +4,7 @@ import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:shelf/shelf.dart' as shelf; import 'package:test/src/util/one_off_handler.dart'; import 'package:test/test.dart'; diff --git a/pkgs/test/test/util/path_handler_test.dart b/pkgs/test/test/util/path_handler_test.dart index 54a31a6ca..45a9a8ab9 100644 --- a/pkgs/test/test/util/path_handler_test.dart +++ b/pkgs/test/test/util/path_handler_test.dart @@ -4,6 +4,7 @@ import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:shelf/shelf.dart' as shelf; import 'package:test/src/util/path_handler.dart'; import 'package:test/test.dart'; diff --git a/pkgs/test/test/util/string_literal_iterator_test.dart b/pkgs/test/test/util/string_literal_iterator_test.dart index b80f6d9cf..de2d3d37d 100644 --- a/pkgs/test/test/util/string_literal_iterator_test.dart +++ b/pkgs/test/test/util/string_literal_iterator_test.dart @@ -7,6 +7,7 @@ library; import 'package:analyzer/dart/analysis/utilities.dart'; import 'package:analyzer/dart/ast/ast.dart'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/util/string_literal_iterator.dart'; diff --git a/pkgs/test/test/utils.dart b/pkgs/test/test/utils.dart index 26dbd06c9..ac88a3c5a 100644 --- a/pkgs/test/test/utils.dart +++ b/pkgs/test/test/utils.dart @@ -7,6 +7,7 @@ import 'dart:collection'; import 'package:boolean_selector/boolean_selector.dart'; import 'package:glob/glob.dart'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/declarer.dart'; import 'package:test_api/src/backend/group.dart'; diff --git a/pkgs/test_api/pubspec.yaml b/pkgs/test_api/pubspec.yaml index 5d68a608c..e41d660e8 100644 --- a/pkgs/test_api/pubspec.yaml +++ b/pkgs/test_api/pubspec.yaml @@ -25,6 +25,7 @@ dev_dependencies: fake_async: ^1.2.0 glob: ^2.0.0 graphs: ^2.0.0 + matcher: any path: ^1.8.0 test: any test_core: any diff --git a/pkgs/test_api/test/backend/declarer_test.dart b/pkgs/test_api/test/backend/declarer_test.dart index c3963f77f..75370e0de 100644 --- a/pkgs/test_api/test/backend/declarer_test.dart +++ b/pkgs/test_api/test/backend/declarer_test.dart @@ -4,6 +4,7 @@ import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/declarer.dart'; import 'package:test_api/src/backend/group.dart'; diff --git a/pkgs/test_api/test/backend/invoker_test.dart b/pkgs/test_api/test/backend/invoker_test.dart index 868e67844..43841dd1b 100644 --- a/pkgs/test_api/test/backend/invoker_test.dart +++ b/pkgs/test_api/test/backend/invoker_test.dart @@ -4,6 +4,7 @@ import 'dart:async'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/group.dart'; import 'package:test_api/src/backend/invoker.dart'; diff --git a/pkgs/test_api/test/backend/metadata_test.dart b/pkgs/test_api/test/backend/metadata_test.dart index 5c72bb37d..b9c09cb11 100644 --- a/pkgs/test_api/test/backend/metadata_test.dart +++ b/pkgs/test_api/test/backend/metadata_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:boolean_selector/boolean_selector.dart'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/metadata.dart'; import 'package:test_api/src/backend/platform_selector.dart'; diff --git a/pkgs/test_api/test/frontend/add_tear_down_test.dart b/pkgs/test_api/test/frontend/add_tear_down_test.dart index 0cf0fe424..3a4890e0b 100644 --- a/pkgs/test_api/test/frontend/add_tear_down_test.dart +++ b/pkgs/test_api/test/frontend/add_tear_down_test.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'package:async/async.dart'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import '../utils.dart'; diff --git a/pkgs/test_api/test/frontend/fake_test.dart b/pkgs/test_api/test/frontend/fake_test.dart index 7dfb306e1..e298bcefc 100644 --- a/pkgs/test_api/test/frontend/fake_test.dart +++ b/pkgs/test_api/test/frontend/fake_test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/fake.dart' as test_api; diff --git a/pkgs/test_api/test/frontend/set_up_all_test.dart b/pkgs/test_api/test/frontend/set_up_all_test.dart index f88550959..627541c7d 100644 --- a/pkgs/test_api/test/frontend/set_up_all_test.dart +++ b/pkgs/test_api/test/frontend/set_up_all_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:async/async.dart'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import '../utils.dart'; diff --git a/pkgs/test_api/test/frontend/tear_down_all_test.dart b/pkgs/test_api/test/frontend/tear_down_all_test.dart index ac8460a20..66a187723 100644 --- a/pkgs/test_api/test/frontend/tear_down_all_test.dart +++ b/pkgs/test_api/test/frontend/tear_down_all_test.dart @@ -3,6 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:async/async.dart'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import '../utils.dart'; diff --git a/pkgs/test_api/test/frontend/timeout_test.dart b/pkgs/test_api/test/frontend/timeout_test.dart index 42228f6cf..4800feb30 100644 --- a/pkgs/test_api/test/frontend/timeout_test.dart +++ b/pkgs/test_api/test/frontend/timeout_test.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; void main() { diff --git a/pkgs/test_api/test/import_restrictions_test.dart b/pkgs/test_api/test/import_restrictions_test.dart index 5c7134947..3e2d5707e 100644 --- a/pkgs/test_api/test/import_restrictions_test.dart +++ b/pkgs/test_api/test/import_restrictions_test.dart @@ -13,6 +13,7 @@ import 'package:analyzer/dart/ast/ast.dart'; import 'package:glob/glob.dart'; import 'package:glob/list_local_fs.dart'; import 'package:graphs/graphs.dart'; +import 'package:matcher/expect.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; diff --git a/pkgs/test_api/test/utils.dart b/pkgs/test_api/test/utils.dart index 8cd94c3d1..bddbc5f22 100644 --- a/pkgs/test_api/test/utils.dart +++ b/pkgs/test_api/test/utils.dart @@ -4,6 +4,7 @@ import 'dart:collection'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_api/src/backend/declarer.dart'; import 'package:test_api/src/backend/group_entry.dart'; diff --git a/pkgs/test_core/pubspec.yaml b/pkgs/test_core/pubspec.yaml index 0da62e9ab..deec95800 100644 --- a/pkgs/test_core/pubspec.yaml +++ b/pkgs/test_core/pubspec.yaml @@ -33,4 +33,5 @@ dependencies: yaml: ^3.0.0 dev_dependencies: + matcher: any test: any diff --git a/pkgs/test_core/test/runner/vm/test_compiler_test.dart b/pkgs/test_core/test/runner/vm/test_compiler_test.dart index b75a8b726..fd5805339 100644 --- a/pkgs/test_core/test/runner/vm/test_compiler_test.dart +++ b/pkgs/test_core/test/runner/vm/test_compiler_test.dart @@ -4,6 +4,7 @@ import 'dart:convert'; +import 'package:matcher/expect.dart'; import 'package:test/test.dart'; import 'package:test_core/src/runner/vm/test_compiler.dart';