From b684a7be694204e076ee8d6d51aea1da87913201 Mon Sep 17 00:00:00 2001 From: Simon Binder Date: Thu, 26 Sep 2019 22:52:20 +0200 Subject: [PATCH] Replace imports of test_api with test --- moor/pubspec.yaml | 1 - moor/test/columns/datetime_test.dart | 2 +- moor/test/columns/int_column_test.dart | 2 +- moor/test/custom_queries_test.dart | 2 +- moor/test/database_test.dart | 2 +- moor/test/delete_test.dart | 2 +- moor/test/error_handling_test.dart | 2 +- moor/test/expressions/comparable_test.dart | 2 +- moor/test/expressions/constant_test.dart | 2 +- moor/test/expressions/datetime_expression_test.dart | 2 +- moor/test/expressions/in_expression_test.dart | 2 +- moor/test/expressions/is_null_test.dart | 2 +- moor/test/expressions/text_test.dart | 2 +- moor/test/expressions/variable_test.dart | 2 +- moor/test/insert_test.dart | 2 +- moor/test/join_test.dart | 2 +- moor/test/parsed_sql/moor_files_integration_test.dart | 2 +- moor/test/schema_test.dart | 2 +- moor/test/select_test.dart | 2 +- moor/test/serialization_test.dart | 2 +- moor/test/streams_test.dart | 2 +- moor/test/tables_test.dart | 2 +- moor/test/transactions_test.dart | 2 +- moor/test/types/datetime_test.dart | 2 +- moor/test/types/real_type_test.dart | 2 +- moor/test/update_test.dart | 2 +- moor/test/utils/lazy_database_test.dart | 2 +- moor/test/utils/single_transformer_test.dart | 2 +- moor/test/web/binary_string_test.dart | 2 +- moor_generator/pubspec.yaml | 1 - moor_generator/test/parser/moor/moor_parser_test.dart | 2 +- moor_generator/test/writer/utils/hash_code_test.dart | 2 +- sqlparser/test/parser/create_table_test.dart | 2 +- 33 files changed, 31 insertions(+), 33 deletions(-) diff --git a/moor/pubspec.yaml b/moor/pubspec.yaml index de6c8901..5c4f3fa8 100644 --- a/moor/pubspec.yaml +++ b/moor/pubspec.yaml @@ -22,7 +22,6 @@ dev_dependencies: build_runner: '>=1.3.0 <2.0.0' build_test: ^0.10.8 test: ^1.6.4 - test_api: '>=0.2.0 <1.0.0' test_core: '>=0.2.0 <1.0.0' mockito: ^4.1.0 grinder: ^0.8.3 diff --git a/moor/test/columns/datetime_test.dart b/moor/test/columns/datetime_test.dart index d8faf58a..85381f6e 100644 --- a/moor/test/columns/datetime_test.dart +++ b/moor/test/columns/datetime_test.dart @@ -1,6 +1,6 @@ import 'package:moor/moor.dart'; import 'package:moor/src/runtime/components/component.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; void main() { final nullable = GeneratedDateTimeColumn('name', null, true); diff --git a/moor/test/columns/int_column_test.dart b/moor/test/columns/int_column_test.dart index f9d4922a..9e2d9208 100644 --- a/moor/test/columns/int_column_test.dart +++ b/moor/test/columns/int_column_test.dart @@ -1,5 +1,5 @@ import 'package:moor/src/runtime/components/component.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'package:moor/moor.dart'; import '../data/tables/todos.dart'; diff --git a/moor/test/custom_queries_test.dart b/moor/test/custom_queries_test.dart index 2d6d84ac..479b2769 100644 --- a/moor/test/custom_queries_test.dart +++ b/moor/test/custom_queries_test.dart @@ -1,5 +1,5 @@ import 'package:moor/moor.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/database_test.dart b/moor/test/database_test.dart index bf94e08f..df77a773 100644 --- a/moor/test/database_test.dart +++ b/moor/test/database_test.dart @@ -1,4 +1,4 @@ -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'package:moor/moor.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/delete_test.dart b/moor/test/delete_test.dart index 9eeb23a2..33a68a67 100644 --- a/moor/test/delete_test.dart +++ b/moor/test/delete_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:moor/moor.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/error_handling_test.dart b/moor/test/error_handling_test.dart index 84777eb7..cab8128e 100644 --- a/moor/test/error_handling_test.dart +++ b/moor/test/error_handling_test.dart @@ -1,5 +1,5 @@ import 'package:moor/moor.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/expressions/comparable_test.dart b/moor/test/expressions/comparable_test.dart index a182dec3..adc4dc07 100644 --- a/moor/test/expressions/comparable_test.dart +++ b/moor/test/expressions/comparable_test.dart @@ -1,6 +1,6 @@ import 'package:moor/moor.dart'; import 'package:moor/src/runtime/components/component.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import '../data/tables/todos.dart'; diff --git a/moor/test/expressions/constant_test.dart b/moor/test/expressions/constant_test.dart index 38b0818f..f8a16fba 100644 --- a/moor/test/expressions/constant_test.dart +++ b/moor/test/expressions/constant_test.dart @@ -1,6 +1,6 @@ import 'package:moor/moor.dart'; import 'package:moor/src/runtime/components/component.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import '../data/tables/todos.dart'; diff --git a/moor/test/expressions/datetime_expression_test.dart b/moor/test/expressions/datetime_expression_test.dart index 808f43bc..da57ef53 100644 --- a/moor/test/expressions/datetime_expression_test.dart +++ b/moor/test/expressions/datetime_expression_test.dart @@ -1,7 +1,7 @@ import 'package:moor/moor.dart'; import 'package:moor/src/runtime/components/component.dart'; import 'package:moor/src/runtime/expressions/expression.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; typedef Expression _Extractor( Expression d); diff --git a/moor/test/expressions/in_expression_test.dart b/moor/test/expressions/in_expression_test.dart index 12b77840..696edab4 100644 --- a/moor/test/expressions/in_expression_test.dart +++ b/moor/test/expressions/in_expression_test.dart @@ -1,5 +1,5 @@ import 'package:moor/src/runtime/components/component.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'package:moor/moor.dart' as moor; import '../data/tables/todos.dart'; diff --git a/moor/test/expressions/is_null_test.dart b/moor/test/expressions/is_null_test.dart index d2826903..b3cf2d73 100644 --- a/moor/test/expressions/is_null_test.dart +++ b/moor/test/expressions/is_null_test.dart @@ -1,5 +1,5 @@ import 'package:moor/src/runtime/components/component.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'package:moor/moor.dart' as moor; import '../data/tables/todos.dart'; diff --git a/moor/test/expressions/text_test.dart b/moor/test/expressions/text_test.dart index 5a941b81..77799707 100644 --- a/moor/test/expressions/text_test.dart +++ b/moor/test/expressions/text_test.dart @@ -1,6 +1,6 @@ import 'package:moor/moor.dart'; import 'package:moor/src/runtime/components/component.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import '../data/tables/todos.dart'; diff --git a/moor/test/expressions/variable_test.dart b/moor/test/expressions/variable_test.dart index fbe0ca0e..17581deb 100644 --- a/moor/test/expressions/variable_test.dart +++ b/moor/test/expressions/variable_test.dart @@ -1,5 +1,5 @@ import 'package:moor/src/runtime/components/component.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'package:moor/moor.dart'; import '../data/tables/todos.dart'; diff --git a/moor/test/insert_test.dart b/moor/test/insert_test.dart index edce6b80..cd708a1f 100644 --- a/moor/test/insert_test.dart +++ b/moor/test/insert_test.dart @@ -1,5 +1,5 @@ import 'package:moor/moor.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/join_test.dart b/moor/test/join_test.dart index 1504e37b..731b6953 100644 --- a/moor/test/join_test.dart +++ b/moor/test/join_test.dart @@ -1,5 +1,5 @@ import 'package:moor/moor.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/parsed_sql/moor_files_integration_test.dart b/moor/test/parsed_sql/moor_files_integration_test.dart index d933925b..da35e314 100644 --- a/moor/test/parsed_sql/moor_files_integration_test.dart +++ b/moor/test/parsed_sql/moor_files_integration_test.dart @@ -1,5 +1,5 @@ import 'package:moor/moor.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import '../data/tables/custom_tables.dart'; import '../data/utils/mocks.dart'; diff --git a/moor/test/schema_test.dart b/moor/test/schema_test.dart index 645d6297..7f513544 100644 --- a/moor/test/schema_test.dart +++ b/moor/test/schema_test.dart @@ -1,5 +1,5 @@ import 'package:moor/moor.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/select_test.dart b/moor/test/select_test.dart index 1391b764..fd34f066 100644 --- a/moor/test/select_test.dart +++ b/moor/test/select_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:moor/moor.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/serialization_test.dart b/moor/test/serialization_test.dart index 5aa0ef3e..6f6d6e2c 100644 --- a/moor/test/serialization_test.dart +++ b/moor/test/serialization_test.dart @@ -1,6 +1,6 @@ import 'package:moor/moor.dart'; import 'package:moor/src/runtime/data_class.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; final someDate = DateTime(2019, 06, 08); diff --git a/moor/test/streams_test.dart b/moor/test/streams_test.dart index 7a4d25e6..52e276b6 100644 --- a/moor/test/streams_test.dart +++ b/moor/test/streams_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:moor/moor.dart'; import 'package:moor/src/runtime/executor/stream_queries.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/tables_test.dart b/moor/test/tables_test.dart index d2d1ad97..cffe3c36 100644 --- a/moor/test/tables_test.dart +++ b/moor/test/tables_test.dart @@ -1,4 +1,4 @@ -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/transactions_test.dart b/moor/test/transactions_test.dart index db15bb64..13ef6685 100644 --- a/moor/test/transactions_test.dart +++ b/moor/test/transactions_test.dart @@ -14,7 +14,7 @@ test/data/utils/mocks.dart 22:20 Mo package:mockito/src/mock.dart 128:22 MockExecutor.noSuchMethod */ -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'package:moor/moor.dart'; import 'data/tables/todos.dart'; diff --git a/moor/test/types/datetime_test.dart b/moor/test/types/datetime_test.dart index 097acd91..0b1bf60a 100644 --- a/moor/test/types/datetime_test.dart +++ b/moor/test/types/datetime_test.dart @@ -1,5 +1,5 @@ import 'package:moor/moor.dart' as moor; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; const _exampleUnixSqlite = 1550172560; const _exampleUnixMillis = 1550172560000; diff --git a/moor/test/types/real_type_test.dart b/moor/test/types/real_type_test.dart index 55a759de..19fc591a 100644 --- a/moor/test/types/real_type_test.dart +++ b/moor/test/types/real_type_test.dart @@ -1,5 +1,5 @@ import 'package:moor/moor.dart' as moor; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; void main() { final type = const moor.RealType(); diff --git a/moor/test/update_test.dart b/moor/test/update_test.dart index 5fa3e6fc..173477ba 100644 --- a/moor/test/update_test.dart +++ b/moor/test/update_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:moor/moor.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import 'data/tables/todos.dart'; import 'data/utils/mocks.dart'; diff --git a/moor/test/utils/lazy_database_test.dart b/moor/test/utils/lazy_database_test.dart index 2ce480f1..a856d99c 100644 --- a/moor/test/utils/lazy_database_test.dart +++ b/moor/test/utils/lazy_database_test.dart @@ -1,6 +1,6 @@ import 'package:moor/moor.dart'; import 'package:pedantic/pedantic.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; import '../data/tables/todos.dart'; import '../data/utils/mocks.dart'; diff --git a/moor/test/utils/single_transformer_test.dart b/moor/test/utils/single_transformer_test.dart index bc400269..e1c8b9d0 100644 --- a/moor/test/utils/single_transformer_test.dart +++ b/moor/test/utils/single_transformer_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:moor/src/utils/single_transformer.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; void main() { test('transforms simple values', () { diff --git a/moor/test/web/binary_string_test.dart b/moor/test/web/binary_string_test.dart index 9dc9d320..7c24b1f9 100644 --- a/moor/test/web/binary_string_test.dart +++ b/moor/test/web/binary_string_test.dart @@ -1,7 +1,7 @@ import 'dart:typed_data'; import 'package:moor/src/web/binary_string_conversion.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; void main() { final data = Uint8List(256 * 2); diff --git a/moor_generator/pubspec.yaml b/moor_generator/pubspec.yaml index d1f68a8e..725d9f6d 100644 --- a/moor_generator/pubspec.yaml +++ b/moor_generator/pubspec.yaml @@ -27,7 +27,6 @@ dependencies: sqlparser: ^0.2.0 dev_dependencies: test: ^1.6.0 - test_api: ^0.2.0 test_core: ^0.2.0 build_runner: ^1.6.7 built_value_generator: ^6.3.0 diff --git a/moor_generator/test/parser/moor/moor_parser_test.dart b/moor_generator/test/parser/moor/moor_parser_test.dart index 70f214ba..35371a98 100644 --- a/moor_generator/test/parser/moor/moor_parser_test.dart +++ b/moor_generator/test/parser/moor/moor_parser_test.dart @@ -1,5 +1,5 @@ import 'package:moor_generator/src/analyzer/runner/steps.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; void main() { final content = ''' diff --git a/moor_generator/test/writer/utils/hash_code_test.dart b/moor_generator/test/writer/utils/hash_code_test.dart index 3431933c..15f565da 100644 --- a/moor_generator/test/writer/utils/hash_code_test.dart +++ b/moor_generator/test/writer/utils/hash_code_test.dart @@ -1,5 +1,5 @@ import 'package:moor_generator/src/writer/utils/hash_code.dart'; -import 'package:test_api/test_api.dart'; +import 'package:test/test.dart'; void main() { test('hash code for no fields', () { diff --git a/sqlparser/test/parser/create_table_test.dart b/sqlparser/test/parser/create_table_test.dart index 7a5c2fe3..50d74b87 100644 --- a/sqlparser/test/parser/create_table_test.dart +++ b/sqlparser/test/parser/create_table_test.dart @@ -1,7 +1,7 @@ import 'package:sqlparser/sqlparser.dart'; import 'package:sqlparser/src/ast/ast.dart'; import 'package:sqlparser/src/utils/ast_equality.dart'; -import 'package:test_core/test_core.dart'; +import 'package:test/test.dart'; import '../common_data.dart'; import 'utils.dart';