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 6ef1bb936..7d0e16a43 100644 --- a/integration_tests/regression/pubspec.yaml +++ b/integration_tests/regression/pubspec.yaml @@ -4,4 +4,5 @@ environment: sdk: ^3.5.0-311.0.dev resolution: workspace dependencies: + matcher: any test: any diff --git a/integration_tests/spawn_hybrid/pubspec.yaml b/integration_tests/spawn_hybrid/pubspec.yaml index 0f1d6f7d0..8bc49ca7d 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 1493e23f2..3bc97c95d 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 0e454db19..a04281619 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 088375cf4..40fe11fe0 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 8dc9ef989..bb5aa2898 100644 --- a/integration_tests/wasm/pubspec.yaml +++ b/integration_tests/wasm/pubspec.yaml @@ -4,4 +4,5 @@ environment: sdk: ^3.5.0-311.0.dev 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 9ddd5116b..3b5fb0d9e 100644 --- a/integration_tests/wasm/test/hello_world_test.dart +++ b/integration_tests/wasm/test/hello_world_test.dart @@ -7,6 +7,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 f345860ba..1805efa14 100644 --- a/pkgs/fake_async/pubspec.yaml +++ b/pkgs/fake_async/pubspec.yaml @@ -14,4 +14,5 @@ dependencies: dev_dependencies: async: ^2.5.0 dart_flutter_team_lints: ^2.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 463eecdb8..4981f155e 100644 --- a/pkgs/fake_async/test/fake_async_test.dart +++ b/pkgs/fake_async/test/fake_async_test.dart @@ -16,6 +16,7 @@ import 'dart:async'; import 'package:clock/clock.dart'; import 'package:fake_async/fake_async.dart'; +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 04ef333c1..19926b560 100644 --- a/pkgs/test/CHANGELOG.md +++ b/pkgs/test/CHANGELOG.md @@ -131,6 +131,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 7bcc67378..7c65734dd 100644 --- a/pkgs/test/lib/test.dart +++ b/pkgs/test/lib/test.dart @@ -2,6 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// Library directive avoids confusing the deprecation for the entire library. +// ignore: unnecessary_library_directive +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 b13f8bdda..6250152a5 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 ffec2279e..49c2975ec 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 753ffa127..2a3f73ae8 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 875aaba0f..e9725a403 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 864f49c49..cf99b728c 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 17cdb9a6b..7af068ae6 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 a48bfd2d4..91d7da597 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 c55cbb884..e3b9a8460 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 28f402210..41a62bdc5 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 c935e026f..dd5746e02 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 74d880239..06a911d1b 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 5cf7a476d..7f12b3169 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 d8f8d33fa..c65f3e910 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 03cc7283c..f3aa8a67a 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 ca9ec051d..ae4966237 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 5a02f5232..d91e8815f 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 98e87416a..edb2e6704 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 5d064cfe9..05fc4099b 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 014c0ed43..81f683974 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 193f12ed9..de5825051 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 690f54b1f..0c34f8916 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 1c2fc62b2..5b02509f2 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 bbdb1d1ce..5ef06a1e0 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 56a717cf0..a1a665b26 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 9c749a46e..aa88b3595 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 b149345e4..2ecfa1f3e 100644 --- a/pkgs/test/test/runner/coverage_test.dart +++ b/pkgs/test/test/runner/coverage_test.dart @@ -8,6 +8,7 @@ library; import 'dart:convert'; 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/engine_test.dart b/pkgs/test/test/runner/engine_test.dart index 6b7df23e8..d93d8a33b 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/state.dart'; diff --git a/pkgs/test/test/runner/expanded_reporter_test.dart b/pkgs/test/test/runner/expanded_reporter_test.dart index 1c116869a..466649de5 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 3e2690abc..51b028d4a 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 db50058ae..82e73bbb0 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 ce3bd4274..a2da472b4 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 a771438ef..92d6faaeb 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 bbdbb78f0..c10301383 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_core/src/runner/version.dart'; diff --git a/pkgs/test/test/runner/line_and_col_test.dart b/pkgs/test/test/runner/line_and_col_test.dart index c513cefc6..cd5e4a732 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 ab5fc790a..a9428e960 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 8d1d4ada6..82caa5915 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 bd4dc2138..a5362f39c 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 82d2321b8..28dd7e257 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 a8ffa9c7c..89bbe7125 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 faba441ee..6293d71ba 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 8eb135d55..9ba89321f 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 0e16fefe9..1dbec396b 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 379e2a7f1..afec33f91 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 d1259e1aa..1f59b5dbc 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 8d4be8604..6c8267b9d 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 d14ee9722..05193ca6a 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 e22332ce2..114903039 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/tag_test.dart b/pkgs/test/test/runner/tag_test.dart index da9dca76f..1ace61bbe 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 93ede4f50..196578079 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 ad814de76..3dd4e15ee 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 96baf0ba4..2423fced2 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 6f4b0e7b9..e52d26300 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 c10a7af9a..2c6542c89 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 9a5d98bf5..6665ed439 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 03c8e34ef..b8c87e3bb 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 23d5b7e14..42e3622f1 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 0b8e712c6..5b899531a 100644 --- a/pkgs/test_api/pubspec.yaml +++ b/pkgs/test_api/pubspec.yaml @@ -24,6 +24,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 f095ad046..b6f08bfc7 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 ef08b387a..7658bd2b2 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 f42a5357b..a23b596ee 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 de4bb5549..5f5100f91 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 60d4dc808..2c36e3154 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 d6d209fd5..995047384 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 fdfd61184..d6c50c40b 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 3fd9ffda4..f24cdbc44 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 97058e3ff..d36bfa829 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 35b030bc2..2c758e3f6 100644 --- a/pkgs/test_core/pubspec.yaml +++ b/pkgs/test_core/pubspec.yaml @@ -32,4 +32,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 a6e50efe6..f112c476e 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';