diff --git a/pkg/expect/lib/async_minitest.dart b/pkg/async_helper/lib/async_minitest.dart similarity index 100% rename from pkg/expect/lib/async_minitest.dart rename to pkg/async_helper/lib/async_minitest.dart diff --git a/pkg/async_helper/pubspec.yaml b/pkg/async_helper/pubspec.yaml index ceb26344594..df92b533c57 100644 --- a/pkg/async_helper/pubspec.yaml +++ b/pkg/async_helper/pubspec.yaml @@ -7,3 +7,6 @@ description: >- language tests. Third parties are discouraged from using this, and should use the facilities provided in package:test. + +dependencies: + expect: any diff --git a/pkg/modular_test/test/loader/default_package_dependency_error/expectation.txt b/pkg/modular_test/test/loader/default_package_dependency_error/expectation.txt index 43c7dac5251..891da787288 100644 --- a/pkg/modular_test/test/loader/default_package_dependency_error/expectation.txt +++ b/pkg/modular_test/test/loader/default_package_dependency_error/expectation.txt @@ -3,7 +3,6 @@ expect is package? yes dependencies: meta - async_minitest.dart expect.dart matchers_lite.dart minitest.dart diff --git a/pkg/modular_test/test/loader/valid_packages/expectation.txt b/pkg/modular_test/test/loader/valid_packages/expectation.txt index a81d4ecb275..e549eaa1da4 100644 --- a/pkg/modular_test/test/loader/valid_packages/expectation.txt +++ b/pkg/modular_test/test/loader/valid_packages/expectation.txt @@ -3,7 +3,6 @@ expect is package? yes dependencies: meta - async_minitest.dart expect.dart matchers_lite.dart minitest.dart diff --git a/tests/language_2/async_star_error_test.dart b/tests/language_2/async_star_error_test.dart index 4bf2433180a..dc06e5ae4c1 100644 --- a/tests/language_2/async_star_error_test.dart +++ b/tests/language_2/async_star_error_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import "dart:async"; -import "package:expect/async_minitest.dart"; +import "package:async_helper/async_minitest.dart"; /// Tests for exceptions raised in async* main() { diff --git a/tests/language_2/async_star_test.dart b/tests/language_2/async_star_test.dart index 4828485272e..72d772e4fff 100644 --- a/tests/language_2/async_star_test.dart +++ b/tests/language_2/async_star_test.dart @@ -6,7 +6,7 @@ library async_start_test; import "dart:async"; -import "package:expect/async_minitest.dart"; +import "package:async_helper/async_minitest.dart"; main() { group("basic", () { diff --git a/tests/language_2/vm/causal_async_exception_stack2_test.dart b/tests/language_2/vm/causal_async_exception_stack2_test.dart index a92ab7fb24b..94dda4b8bd2 100644 --- a/tests/language_2/vm/causal_async_exception_stack2_test.dart +++ b/tests/language_2/vm/causal_async_exception_stack2_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'causal_async_exception_stack_helper.dart' as h; diff --git a/tests/language_2/vm/causal_async_exception_stack_test.dart b/tests/language_2/vm/causal_async_exception_stack_test.dart index 3500facd9f8..b4059e9d8f4 100644 --- a/tests/language_2/vm/causal_async_exception_stack_test.dart +++ b/tests/language_2/vm/causal_async_exception_stack_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'causal_async_exception_stack_helper.dart' as h; diff --git a/tests/lib_2/async/stream_controller_async_test.dart b/tests/lib_2/async/stream_controller_async_test.dart index 3ee17257038..a0792509134 100644 --- a/tests/lib_2/async/stream_controller_async_test.dart +++ b/tests/lib_2/async/stream_controller_async_test.dart @@ -8,7 +8,7 @@ library stream_controller_async_test; import 'dart:async'; import 'package:expect/expect.dart'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'event_helper.dart'; import 'stream_state_helper.dart'; diff --git a/tests/lib_2/async/stream_from_iterable_test.dart b/tests/lib_2/async/stream_from_iterable_test.dart index b8317f05147..d80d9897674 100644 --- a/tests/lib_2/async/stream_from_iterable_test.dart +++ b/tests/lib_2/async/stream_from_iterable_test.dart @@ -8,7 +8,7 @@ import 'dart:async'; import 'package:async_helper/async_helper.dart'; import 'package:expect/expect.dart'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'event_helper.dart'; diff --git a/tests/lib_2/async/stream_iterator_test.dart b/tests/lib_2/async/stream_iterator_test.dart index b4a65967d96..c50f53edcae 100644 --- a/tests/lib_2/async/stream_iterator_test.dart +++ b/tests/lib_2/async/stream_iterator_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { test("stream iterator basic", () async { diff --git a/tests/lib_2/async/stream_join_test.dart b/tests/lib_2/async/stream_join_test.dart index aeac53c6df0..6e3a98b7194 100644 --- a/tests/lib_2/async/stream_join_test.dart +++ b/tests/lib_2/async/stream_join_test.dart @@ -8,7 +8,7 @@ library stream_join_test; import 'dart:async'; import 'package:expect/expect.dart'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'event_helper.dart'; diff --git a/tests/lib_2/async/stream_periodic2_test.dart b/tests/lib_2/async/stream_periodic2_test.dart index a69568d27e0..1250131c643 100644 --- a/tests/lib_2/async/stream_periodic2_test.dart +++ b/tests/lib_2/async/stream_periodic2_test.dart @@ -7,7 +7,7 @@ library dart.test.stream_from_iterable; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { test("stream-periodic2", () { diff --git a/tests/lib_2/async/stream_periodic3_test.dart b/tests/lib_2/async/stream_periodic3_test.dart index ab1adc2e30a..a1fbbd07a7b 100644 --- a/tests/lib_2/async/stream_periodic3_test.dart +++ b/tests/lib_2/async/stream_periodic3_test.dart @@ -7,7 +7,7 @@ library dart.test.stream_from_iterable; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; // The stopwatch is more precise than the Timer. // Some browsers (Firefox and IE so far) can trigger too early. So we add more diff --git a/tests/lib_2/async/stream_periodic4_test.dart b/tests/lib_2/async/stream_periodic4_test.dart index cbdc78080f1..e687786b030 100644 --- a/tests/lib_2/async/stream_periodic4_test.dart +++ b/tests/lib_2/async/stream_periodic4_test.dart @@ -7,7 +7,7 @@ library dart.test.stream_from_iterable; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; void runTest(period, maxElapsed, pauseDuration) { Function done = expectAsync(() {}); diff --git a/tests/lib_2/async/stream_periodic5_test.dart b/tests/lib_2/async/stream_periodic5_test.dart index 2a2f900b169..2be1c96f382 100644 --- a/tests/lib_2/async/stream_periodic5_test.dart +++ b/tests/lib_2/async/stream_periodic5_test.dart @@ -7,7 +7,7 @@ library dart.test.stream_from_iterable; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; watchMs(Stopwatch watch) { int microsecs = watch.elapsedMicroseconds; diff --git a/tests/lib_2/async/stream_periodic6_test.dart b/tests/lib_2/async/stream_periodic6_test.dart index 8b51ca8a462..0ef154e5e2f 100644 --- a/tests/lib_2/async/stream_periodic6_test.dart +++ b/tests/lib_2/async/stream_periodic6_test.dart @@ -7,7 +7,7 @@ library dart.test.stream_from_iterable; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { test("stream-periodic1", () { diff --git a/tests/lib_2/async/stream_periodic_test.dart b/tests/lib_2/async/stream_periodic_test.dart index c8ea5a7f39f..43a06d087ec 100644 --- a/tests/lib_2/async/stream_periodic_test.dart +++ b/tests/lib_2/async/stream_periodic_test.dart @@ -7,7 +7,7 @@ library dart.test.stream_from_iterable; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { test("stream-periodic1", () { diff --git a/tests/lib_2/async/stream_single_test.dart b/tests/lib_2/async/stream_single_test.dart index 57bf54c14f3..0156d71e275 100644 --- a/tests/lib_2/async/stream_single_test.dart +++ b/tests/lib_2/async/stream_single_test.dart @@ -8,7 +8,7 @@ library stream_single_test; import 'dart:async'; import 'package:expect/expect.dart'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'event_helper.dart'; diff --git a/tests/lib_2/async/stream_single_to_multi_subscriber_test.dart b/tests/lib_2/async/stream_single_to_multi_subscriber_test.dart index 9cedef05f03..e422a8d9eeb 100644 --- a/tests/lib_2/async/stream_single_to_multi_subscriber_test.dart +++ b/tests/lib_2/async/stream_single_to_multi_subscriber_test.dart @@ -8,7 +8,7 @@ library stream_single_test; import 'dart:async'; import 'package:expect/expect.dart'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'event_helper.dart'; diff --git a/tests/lib_2/async/stream_state_helper.dart b/tests/lib_2/async/stream_state_helper.dart index 2bd412fd7df..6178495e067 100644 --- a/tests/lib_2/async/stream_state_helper.dart +++ b/tests/lib_2/async/stream_state_helper.dart @@ -7,7 +7,7 @@ library stream_state_helper; import 'dart:async'; import 'dart:collection'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; class SubscriptionProtocolTest { final StreamProtocolTest _streamTest; diff --git a/tests/lib_2/async/stream_state_nonzero_timer_test.dart b/tests/lib_2/async/stream_state_nonzero_timer_test.dart index ff6cebbf107..8c7c11551ae 100644 --- a/tests/lib_2/async/stream_state_nonzero_timer_test.dart +++ b/tests/lib_2/async/stream_state_nonzero_timer_test.dart @@ -9,7 +9,7 @@ library stream_state_nonzero_timer_test; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'stream_state_helper.dart'; diff --git a/tests/lib_2/async/stream_state_test.dart b/tests/lib_2/async/stream_state_test.dart index b56f37f61dc..651f74d8bfb 100644 --- a/tests/lib_2/async/stream_state_test.dart +++ b/tests/lib_2/async/stream_state_test.dart @@ -5,7 +5,7 @@ // Test the event/callback protocol of the stream implementations. library stream_state_test; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'stream_state_helper.dart'; diff --git a/tests/lib_2/async/stream_subscription_as_future_test.dart b/tests/lib_2/async/stream_subscription_as_future_test.dart index 5dc109d9d81..5be5c91d2a8 100644 --- a/tests/lib_2/async/stream_subscription_as_future_test.dart +++ b/tests/lib_2/async/stream_subscription_as_future_test.dart @@ -8,7 +8,7 @@ library stream_single_test; import 'dart:async'; import 'package:expect/expect.dart'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { test("subscription.asFuture success", () { diff --git a/tests/lib_2/async/stream_subscription_cancel_test.dart b/tests/lib_2/async/stream_subscription_cancel_test.dart index 6ad6b566fa2..017bac53a73 100644 --- a/tests/lib_2/async/stream_subscription_cancel_test.dart +++ b/tests/lib_2/async/stream_subscription_cancel_test.dart @@ -7,7 +7,7 @@ library stream_subscription_cancel; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; void main() { test('subscription.cancel', () { diff --git a/tests/lib_2/async/stream_timeout_test.dart b/tests/lib_2/async/stream_timeout_test.dart index 876a767e98e..eb33ad25b17 100644 --- a/tests/lib_2/async/stream_timeout_test.dart +++ b/tests/lib_2/async/stream_timeout_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { const ms5 = const Duration(milliseconds: 5); diff --git a/tests/lib_2/async/stream_transform_test.dart b/tests/lib_2/async/stream_transform_test.dart index f08f037b15e..e8ac505415b 100644 --- a/tests/lib_2/async/stream_transform_test.dart +++ b/tests/lib_2/async/stream_transform_test.dart @@ -7,7 +7,7 @@ library stream_transform_test; import 'dart:async'; import 'package:expect/expect.dart'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'event_helper.dart'; diff --git a/tests/lib_2/async/stream_transformation_broadcast_test.dart b/tests/lib_2/async/stream_transformation_broadcast_test.dart index 3bb9667918b..839933f6e28 100644 --- a/tests/lib_2/async/stream_transformation_broadcast_test.dart +++ b/tests/lib_2/async/stream_transformation_broadcast_test.dart @@ -8,7 +8,7 @@ library stream_join_test; import 'dart:async'; import 'package:expect/expect.dart'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'event_helper.dart'; diff --git a/tests/lib_2/async/timer_cancel1_test.dart b/tests/lib_2/async/timer_cancel1_test.dart index 49fb647da9b..1295e9608a3 100644 --- a/tests/lib_2/async/timer_cancel1_test.dart +++ b/tests/lib_2/async/timer_cancel1_test.dart @@ -6,7 +6,7 @@ library timer_cancel1_test; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { // Test that a timeout handler can cancel another. diff --git a/tests/lib_2/async/timer_isActive_test.dart b/tests/lib_2/async/timer_isActive_test.dart index 84f872f52c4..b688b21ee21 100644 --- a/tests/lib_2/async/timer_isActive_test.dart +++ b/tests/lib_2/async/timer_isActive_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { test("timer isActive test", () { diff --git a/tests/lib_2/async/timer_test.dart b/tests/lib_2/async/timer_test.dart index 052ff637d84..220ac051f33 100644 --- a/tests/lib_2/async/timer_test.dart +++ b/tests/lib_2/async/timer_test.dart @@ -6,7 +6,7 @@ library timer_test; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; const int STARTTIMEOUT = 1050; const int DECREASE = 200; diff --git a/tests/lib_2/html/websql_test.dart b/tests/lib_2/html/websql_test.dart index 07f9ff238d6..4c1e34dda53 100644 --- a/tests/lib_2/html/websql_test.dart +++ b/tests/lib_2/html/websql_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:html'; import 'dart:web_sql'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; Future createTable( SqlTransaction transaction, String tableName, String columnName) async { diff --git a/tests/lib_2/isolate/deferred_in_isolate2_test.dart b/tests/lib_2/isolate/deferred_in_isolate2_test.dart index 636eb732750..47d401ad37a 100644 --- a/tests/lib_2/isolate/deferred_in_isolate2_test.dart +++ b/tests/lib_2/isolate/deferred_in_isolate2_test.dart @@ -6,7 +6,7 @@ library deferred_in_isolate2_test; import 'dart:isolate'; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; import 'deferred_in_isolate2_lib.dart' deferred as lib; diff --git a/tests/lib_2/isolate/spawn_uri_multi_test.dart b/tests/lib_2/isolate/spawn_uri_multi_test.dart index c74c51767cd..60766177ace 100644 --- a/tests/lib_2/isolate/spawn_uri_multi_test.dart +++ b/tests/lib_2/isolate/spawn_uri_multi_test.dart @@ -9,7 +9,7 @@ library spawn_tests; import 'dart:isolate'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; /* Dummy import so multi-test copies the file. import 'spawn_uri_child_isolate.dart'; diff --git a/tests/lib_2/isolate/spawn_uri_nested_vm_test.dart b/tests/lib_2/isolate/spawn_uri_nested_vm_test.dart index b13aff1fa71..6d37e262e51 100644 --- a/tests/lib_2/isolate/spawn_uri_nested_vm_test.dart +++ b/tests/lib_2/isolate/spawn_uri_nested_vm_test.dart @@ -9,7 +9,7 @@ library NestedSpawnUriLibrary; import 'dart:isolate'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { test('isolate fromUri - nested send and reply', () { diff --git a/tests/lib_2/isolate/spawn_uri_test.dart b/tests/lib_2/isolate/spawn_uri_test.dart index a4d89c30968..3f522154bd4 100644 --- a/tests/lib_2/isolate/spawn_uri_test.dart +++ b/tests/lib_2/isolate/spawn_uri_test.dart @@ -9,7 +9,7 @@ library spawn_tests; import 'dart:isolate'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { test('isolate fromUri - send and reply', () async { diff --git a/tests/lib_2/isolate/spawn_uri_vm_test.dart b/tests/lib_2/isolate/spawn_uri_vm_test.dart index a61c2f97bdf..6bc2e6e3670 100644 --- a/tests/lib_2/isolate/spawn_uri_vm_test.dart +++ b/tests/lib_2/isolate/spawn_uri_vm_test.dart @@ -9,7 +9,7 @@ library spawn_tests; import 'dart:isolate'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; main() { test('isolate fromUri - send and reply', () { diff --git a/tests/lib_2/isolate/timer_isolate_test.dart b/tests/lib_2/isolate/timer_isolate_test.dart index cf7fb26e67d..a34005a6b89 100644 --- a/tests/lib_2/isolate/timer_isolate_test.dart +++ b/tests/lib_2/isolate/timer_isolate_test.dart @@ -6,7 +6,7 @@ library multiple_timer_test; import 'dart:isolate'; import 'dart:async'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; const Duration TIMEOUT = const Duration(milliseconds: 100); diff --git a/tests/lib_2/mirrors/library_uri_io_test.dart b/tests/lib_2/mirrors/library_uri_io_test.dart index 74553b4bea3..e072a836e14 100644 --- a/tests/lib_2/mirrors/library_uri_io_test.dart +++ b/tests/lib_2/mirrors/library_uri_io_test.dart @@ -9,7 +9,7 @@ library MirrorsTest; import 'dart:io'; import 'dart:mirrors'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; class Class {} diff --git a/tests/lib_2/mirrors/library_uri_package_test.dart b/tests/lib_2/mirrors/library_uri_package_test.dart index f9db81d266f..a8be56dd122 100644 --- a/tests/lib_2/mirrors/library_uri_package_test.dart +++ b/tests/lib_2/mirrors/library_uri_package_test.dart @@ -8,7 +8,7 @@ library MirrorsTest; import 'dart:mirrors'; import 'package:args/args.dart'; -import 'package:expect/async_minitest.dart'; +import 'package:async_helper/async_minitest.dart'; testLibraryUri(var value, Uri expectedUri) { var valueMirror = reflect(value);