From 389811496291c2305f91a3ec9e628db5d5dadbb9 Mon Sep 17 00:00:00 2001 From: Simon Binder Date: Sun, 3 Apr 2022 00:58:12 +0200 Subject: [PATCH] Restructure drift test files --- drift/test/{ => database}/batch_test.dart | 4 ++-- drift/test/{ => database}/data_class_test.dart | 2 +- drift/test/{ => database}/database_test.dart | 4 ++-- drift/test/{ => database}/expressions/aggregate_test.dart | 2 +- drift/test/{ => database}/expressions/algebra_test.dart | 2 +- drift/test/{ => database}/expressions/bools_test.dart | 2 +- .../{ => database/expressions}/columns/datetime_test.dart | 0 .../{ => database/expressions}/columns/int_column_test.dart | 2 +- drift/test/{ => database}/expressions/comparable_test.dart | 4 ++-- drift/test/{ => database}/expressions/constant_test.dart | 4 ++-- .../expressions/datetime_expression_test.dart | 2 +- drift/test/{ => database}/expressions/exists_test.dart | 4 ++-- drift/test/{ => database}/expressions/expression_test.dart | 6 +++--- .../expressions/expressions_integration_test.dart | 4 ++-- .../test/{ => database}/expressions/in_expression_test.dart | 4 ++-- drift/test/{ => database}/expressions/null_check_test.dart | 2 +- drift/test/{ => database}/expressions/text_test.dart | 4 ++-- drift/test/{ => database}/expressions/variable_test.dart | 4 ++-- drift/test/{ => database}/expressions/when_test.dart | 2 +- .../test/{ => database/statements}/custom_queries_test.dart | 4 ++-- drift/test/{ => database/statements}/delete_test.dart | 4 ++-- drift/test/{ => database/statements}/insert_test.dart | 4 ++-- drift/test/{ => database/statements}/join_test.dart | 4 ++-- drift/test/{ => database/statements}/schema_test.dart | 4 ++-- drift/test/{ => database/statements}/select_test.dart | 4 ++-- drift/test/{ => database/statements}/update_test.dart | 4 ++-- drift/test/{ => database}/streams_test.dart | 6 +++--- drift/test/{ => database}/tables_test.dart | 4 ++-- drift/test/{ => database}/transactions_test.dart | 4 ++-- drift/test/{ => database}/types/blob_test.dart | 0 drift/test/{ => database}/types/datetime_test.dart | 0 .../{ => database}/types/enum_index_converter_test.dart | 0 .../types/non_nullable_type_converter_test.dart | 2 +- drift/test/{ => database}/types/real_type_test.dart | 0 drift/test/{ => database}/types/sql_type_test.dart | 0 drift/test/engines/connection_pool_integration_test.dart | 2 +- drift/test/engines/connection_pool_test.dart | 2 +- drift/test/error_handling_test.dart | 2 +- drift/test/extensions/fts5_integration_test.dart | 2 +- drift/test/extensions/json1_integration_test.dart | 2 +- drift/test/extensions/moor_ffi_functions_test.dart | 2 +- drift/test/{data/tables => generated}/converter.dart | 0 drift/test/{data/tables => generated}/custom_tables.dart | 0 drift/test/{data/tables => generated}/custom_tables.g.dart | 0 drift/test/{data/tables => generated}/data_classes.dart | 0 drift/test/{data/tables => generated}/tables.drift | 0 drift/test/{data/tables => generated}/todos.dart | 0 drift/test/{data/tables => generated}/todos.g.dart | 0 .../integration_tests/drift_files_integration_test.dart | 4 ++-- drift/test/integration_tests/drift_files_test.dart | 4 ++-- drift/test/integration_tests/insert_integration_test.dart | 2 +- .../integration_tests/list_subquery_integration_test.dart | 2 +- .../test/integration_tests/migrations_integration_test.dart | 4 ++-- drift/test/integration_tests/regress_1232_test.dart | 2 +- drift/test/integration_tests/regress_1235_test.dart | 2 +- drift/test/integration_tests/regress_1599_test.dart | 4 ++-- drift/test/{ => integration_tests}/rx_streams_test.dart | 4 ++-- drift/test/integration_tests/select_integration_test.dart | 2 +- drift/test/isolate_test.dart | 2 +- drift/test/{ => platforms}/ffi/close_existing_test.dart | 0 drift/test/{ => platforms}/ffi/moor_functions_test.dart | 0 drift/test/{ => platforms}/ffi/setup_test.dart | 2 +- drift/test/{ => platforms}/ffi/vm_database_test.dart | 0 drift/test/{ => platforms}/web/binary_string_test.dart | 0 .../web/local_storage_to_indexed_db_test.dart | 0 drift/test/serialization_test.dart | 2 +- drift/test/utils/expand_variables_test.dart | 2 +- drift/test/utils/lazy_database_test.dart | 2 +- examples/app/analysis_options.yaml | 1 + 69 files changed, 78 insertions(+), 77 deletions(-) rename drift/test/{ => database}/batch_test.dart (98%) rename drift/test/{ => database}/data_class_test.dart (99%) rename drift/test/{ => database}/database_test.dart (97%) rename drift/test/{ => database}/expressions/aggregate_test.dart (97%) rename drift/test/{ => database}/expressions/algebra_test.dart (95%) rename drift/test/{ => database}/expressions/bools_test.dart (91%) rename drift/test/{ => database/expressions}/columns/datetime_test.dart (100%) rename drift/test/{ => database/expressions}/columns/int_column_test.dart (95%) rename drift/test/{ => database}/expressions/comparable_test.dart (96%) rename drift/test/{ => database}/expressions/constant_test.dart (92%) rename drift/test/{ => database}/expressions/datetime_expression_test.dart (97%) rename drift/test/{ => database}/expressions/exists_test.dart (89%) rename drift/test/{ => database}/expressions/expression_test.dart (96%) rename drift/test/{ => database}/expressions/expressions_integration_test.dart (98%) rename drift/test/{ => database}/expressions/in_expression_test.dart (94%) rename drift/test/{ => database}/expressions/null_check_test.dart (96%) rename drift/test/{ => database}/expressions/text_test.dart (94%) rename drift/test/{ => database}/expressions/variable_test.dart (95%) rename drift/test/{ => database}/expressions/when_test.dart (94%) rename drift/test/{ => database/statements}/custom_queries_test.dart (97%) rename drift/test/{ => database/statements}/delete_test.dart (97%) rename drift/test/{ => database/statements}/insert_test.dart (99%) rename drift/test/{ => database/statements}/join_test.dart (99%) rename drift/test/{ => database/statements}/schema_test.dart (98%) rename drift/test/{ => database/statements}/select_test.dart (98%) rename drift/test/{ => database/statements}/update_test.dart (98%) rename drift/test/{ => database}/streams_test.dart (99%) rename drift/test/{ => database}/tables_test.dart (95%) rename drift/test/{ => database}/transactions_test.dart (98%) rename drift/test/{ => database}/types/blob_test.dart (100%) rename drift/test/{ => database}/types/datetime_test.dart (100%) rename drift/test/{ => database}/types/enum_index_converter_test.dart (100%) rename drift/test/{ => database}/types/non_nullable_type_converter_test.dart (95%) rename drift/test/{ => database}/types/real_type_test.dart (100%) rename drift/test/{ => database}/types/sql_type_test.dart (100%) rename drift/test/{data/tables => generated}/converter.dart (100%) rename drift/test/{data/tables => generated}/custom_tables.dart (100%) rename drift/test/{data/tables => generated}/custom_tables.g.dart (100%) rename drift/test/{data/tables => generated}/data_classes.dart (100%) rename drift/test/{data/tables => generated}/tables.drift (100%) rename drift/test/{data/tables => generated}/todos.dart (100%) rename drift/test/{data/tables => generated}/todos.g.dart (100%) rename drift/test/{ => integration_tests}/rx_streams_test.dart (93%) rename drift/test/{ => platforms}/ffi/close_existing_test.dart (100%) rename drift/test/{ => platforms}/ffi/moor_functions_test.dart (100%) rename drift/test/{ => platforms}/ffi/setup_test.dart (96%) rename drift/test/{ => platforms}/ffi/vm_database_test.dart (100%) rename drift/test/{ => platforms}/web/binary_string_test.dart (100%) rename drift/test/{ => platforms}/web/local_storage_to_indexed_db_test.dart (100%) diff --git a/drift/test/batch_test.dart b/drift/test/database/batch_test.dart similarity index 98% rename from drift/test/batch_test.dart rename to drift/test/database/batch_test.dart index e4da5344..4a229afb 100644 --- a/drift/test/batch_test.dart +++ b/drift/test/database/batch_test.dart @@ -2,8 +2,8 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../generated/todos.dart'; +import '../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/data_class_test.dart b/drift/test/database/data_class_test.dart similarity index 99% rename from drift/test/data_class_test.dart rename to drift/test/database/data_class_test.dart index d2a25f83..5c7e2e31 100644 --- a/drift/test/data_class_test.dart +++ b/drift/test/database/data_class_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; +import '../generated/todos.dart'; void main() { test('data classes can be serialized', () { diff --git a/drift/test/database_test.dart b/drift/test/database/database_test.dart similarity index 97% rename from drift/test/database_test.dart rename to drift/test/database/database_test.dart index de4364b1..4c7e5f94 100644 --- a/drift/test/database_test.dart +++ b/drift/test/database/database_test.dart @@ -2,8 +2,8 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../generated/todos.dart'; +import '../test_utils/test_utils.dart'; class _FakeDb extends GeneratedDatabase { _FakeDb(SqlTypeSystem types, QueryExecutor executor) : super(types, executor); diff --git a/drift/test/expressions/aggregate_test.dart b/drift/test/database/expressions/aggregate_test.dart similarity index 97% rename from drift/test/expressions/aggregate_test.dart rename to drift/test/database/expressions/aggregate_test.dart index 84daa9a0..3b17914d 100644 --- a/drift/test/expressions/aggregate_test.dart +++ b/drift/test/database/expressions/aggregate_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../test_utils/test_utils.dart'; +import '../../test_utils/test_utils.dart'; void main() { const foo = CustomExpression('foo', precedence: Precedence.primary); diff --git a/drift/test/expressions/algebra_test.dart b/drift/test/database/expressions/algebra_test.dart similarity index 95% rename from drift/test/expressions/algebra_test.dart rename to drift/test/database/expressions/algebra_test.dart index a3f91063..71090327 100644 --- a/drift/test/expressions/algebra_test.dart +++ b/drift/test/database/expressions/algebra_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../test_utils/test_utils.dart'; +import '../../test_utils/test_utils.dart'; void main() { const i1 = CustomExpression('i1', precedence: Precedence.primary); diff --git a/drift/test/expressions/bools_test.dart b/drift/test/database/expressions/bools_test.dart similarity index 91% rename from drift/test/expressions/bools_test.dart rename to drift/test/database/expressions/bools_test.dart index 4a2e849c..1239b096 100644 --- a/drift/test/expressions/bools_test.dart +++ b/drift/test/database/expressions/bools_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../test_utils/test_utils.dart'; +import '../../test_utils/test_utils.dart'; void main() { const a = CustomExpression('a', precedence: Precedence.primary); diff --git a/drift/test/columns/datetime_test.dart b/drift/test/database/expressions/columns/datetime_test.dart similarity index 100% rename from drift/test/columns/datetime_test.dart rename to drift/test/database/expressions/columns/datetime_test.dart diff --git a/drift/test/columns/int_column_test.dart b/drift/test/database/expressions/columns/int_column_test.dart similarity index 95% rename from drift/test/columns/int_column_test.dart rename to drift/test/database/expressions/columns/int_column_test.dart index aa5d91fd..0e2c7a41 100644 --- a/drift/test/columns/int_column_test.dart +++ b/drift/test/database/expressions/columns/int_column_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../../../generated/todos.dart'; void main() { test('int column writes AUTOINCREMENT constraint', () { diff --git a/drift/test/expressions/comparable_test.dart b/drift/test/database/expressions/comparable_test.dart similarity index 96% rename from drift/test/expressions/comparable_test.dart rename to drift/test/database/expressions/comparable_test.dart index a5f595d6..da28f5bc 100644 --- a/drift/test/expressions/comparable_test.dart +++ b/drift/test/database/expressions/comparable_test.dart @@ -1,8 +1,8 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; -import '../test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { const expression = diff --git a/drift/test/expressions/constant_test.dart b/drift/test/database/expressions/constant_test.dart similarity index 92% rename from drift/test/expressions/constant_test.dart rename to drift/test/database/expressions/constant_test.dart index fcb37359..3c857868 100644 --- a/drift/test/expressions/constant_test.dart +++ b/drift/test/database/expressions/constant_test.dart @@ -1,8 +1,8 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; -import '../test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { group('string literals', () { diff --git a/drift/test/expressions/datetime_expression_test.dart b/drift/test/database/expressions/datetime_expression_test.dart similarity index 97% rename from drift/test/expressions/datetime_expression_test.dart rename to drift/test/database/expressions/datetime_expression_test.dart index 2971ccd1..748b2eb9 100644 --- a/drift/test/expressions/datetime_expression_test.dart +++ b/drift/test/database/expressions/datetime_expression_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../test_utils/test_utils.dart'; +import '../../test_utils/test_utils.dart'; typedef _Extractor = Expression Function(Expression d); diff --git a/drift/test/expressions/exists_test.dart b/drift/test/database/expressions/exists_test.dart similarity index 89% rename from drift/test/expressions/exists_test.dart rename to drift/test/database/expressions/exists_test.dart index 4237b4a5..dd81c72e 100644 --- a/drift/test/expressions/exists_test.dart +++ b/drift/test/database/expressions/exists_test.dart @@ -1,8 +1,8 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; -import '../test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { test('exists expressions are generated', () { diff --git a/drift/test/expressions/expression_test.dart b/drift/test/database/expressions/expression_test.dart similarity index 96% rename from drift/test/expressions/expression_test.dart rename to drift/test/database/expressions/expression_test.dart index 03b26bc1..24b1adfc 100644 --- a/drift/test/expressions/expression_test.dart +++ b/drift/test/database/expressions/expression_test.dart @@ -2,9 +2,9 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import '../data/tables/custom_tables.dart'; -import '../data/tables/todos.dart'; -import '../test_utils/test_utils.dart'; +import '../../generated/custom_tables.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; class _UnknownExpr extends Expression { @override diff --git a/drift/test/expressions/expressions_integration_test.dart b/drift/test/database/expressions/expressions_integration_test.dart similarity index 98% rename from drift/test/expressions/expressions_integration_test.dart rename to drift/test/database/expressions/expressions_integration_test.dart index 732bc7e4..63c3b922 100644 --- a/drift/test/expressions/expressions_integration_test.dart +++ b/drift/test/database/expressions/expressions_integration_test.dart @@ -1,8 +1,8 @@ import 'package:drift/drift.dart' hide isNull; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; -import '../test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/expressions/in_expression_test.dart b/drift/test/database/expressions/in_expression_test.dart similarity index 94% rename from drift/test/expressions/in_expression_test.dart rename to drift/test/database/expressions/in_expression_test.dart index 326d031e..9d84ffcf 100644 --- a/drift/test/expressions/in_expression_test.dart +++ b/drift/test/database/expressions/in_expression_test.dart @@ -1,8 +1,8 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; -import '../test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { final db = TodoDb(); diff --git a/drift/test/expressions/null_check_test.dart b/drift/test/database/expressions/null_check_test.dart similarity index 96% rename from drift/test/expressions/null_check_test.dart rename to drift/test/database/expressions/null_check_test.dart index 6d4cdedf..39e46d9e 100644 --- a/drift/test/expressions/null_check_test.dart +++ b/drift/test/database/expressions/null_check_test.dart @@ -2,7 +2,7 @@ import 'package:drift/drift.dart'; import 'package:drift/drift.dart' as drift; import 'package:test/test.dart'; -import '../test_utils/test_utils.dart'; +import '../../test_utils/test_utils.dart'; void main() { const innerExpression = diff --git a/drift/test/expressions/text_test.dart b/drift/test/database/expressions/text_test.dart similarity index 94% rename from drift/test/expressions/text_test.dart rename to drift/test/database/expressions/text_test.dart index fbc97408..dd322d16 100644 --- a/drift/test/expressions/text_test.dart +++ b/drift/test/database/expressions/text_test.dart @@ -1,8 +1,8 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; -import '../test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { const expression = diff --git a/drift/test/expressions/variable_test.dart b/drift/test/database/expressions/variable_test.dart similarity index 95% rename from drift/test/expressions/variable_test.dart rename to drift/test/database/expressions/variable_test.dart index 2e2c2c8e..89e6f05a 100644 --- a/drift/test/expressions/variable_test.dart +++ b/drift/test/database/expressions/variable_test.dart @@ -1,8 +1,8 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; -import '../test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { test('maps the variable to sql', () { diff --git a/drift/test/expressions/when_test.dart b/drift/test/database/expressions/when_test.dart similarity index 94% rename from drift/test/expressions/when_test.dart rename to drift/test/database/expressions/when_test.dart index d584498f..64a2f425 100644 --- a/drift/test/expressions/when_test.dart +++ b/drift/test/database/expressions/when_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../test_utils/test_utils.dart'; +import '../../test_utils/test_utils.dart'; void main() { const x = CustomExpression('x'); diff --git a/drift/test/custom_queries_test.dart b/drift/test/database/statements/custom_queries_test.dart similarity index 97% rename from drift/test/custom_queries_test.dart rename to drift/test/database/statements/custom_queries_test.dart index cec58549..3b76b894 100644 --- a/drift/test/custom_queries_test.dart +++ b/drift/test/database/statements/custom_queries_test.dart @@ -2,8 +2,8 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; // ignore_for_file: lines_longer_than_80_chars diff --git a/drift/test/delete_test.dart b/drift/test/database/statements/delete_test.dart similarity index 97% rename from drift/test/delete_test.dart rename to drift/test/database/statements/delete_test.dart index 7e77ef0a..3ef23135 100644 --- a/drift/test/delete_test.dart +++ b/drift/test/database/statements/delete_test.dart @@ -4,8 +4,8 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/insert_test.dart b/drift/test/database/statements/insert_test.dart similarity index 99% rename from drift/test/insert_test.dart rename to drift/test/database/statements/insert_test.dart index 18e45f77..f175c602 100644 --- a/drift/test/insert_test.dart +++ b/drift/test/database/statements/insert_test.dart @@ -2,8 +2,8 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/join_test.dart b/drift/test/database/statements/join_test.dart similarity index 99% rename from drift/test/join_test.dart rename to drift/test/database/statements/join_test.dart index e09fedd1..9a957abb 100644 --- a/drift/test/join_test.dart +++ b/drift/test/database/statements/join_test.dart @@ -2,8 +2,8 @@ import 'package:drift/drift.dart' hide isNull; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/schema_test.dart b/drift/test/database/statements/schema_test.dart similarity index 98% rename from drift/test/schema_test.dart rename to drift/test/database/statements/schema_test.dart index dd1135c2..2ff55027 100644 --- a/drift/test/schema_test.dart +++ b/drift/test/database/statements/schema_test.dart @@ -2,8 +2,8 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/select_test.dart b/drift/test/database/statements/select_test.dart similarity index 98% rename from drift/test/select_test.dart rename to drift/test/database/statements/select_test.dart index 82a05b10..41c8ef71 100644 --- a/drift/test/select_test.dart +++ b/drift/test/database/statements/select_test.dart @@ -4,8 +4,8 @@ import 'package:drift/drift.dart' hide isNull; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; final _dataOfTodoEntry = { 'id': 10, diff --git a/drift/test/update_test.dart b/drift/test/database/statements/update_test.dart similarity index 98% rename from drift/test/update_test.dart rename to drift/test/database/statements/update_test.dart index cc67f57e..1d0da16d 100644 --- a/drift/test/update_test.dart +++ b/drift/test/database/statements/update_test.dart @@ -4,8 +4,8 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../../generated/todos.dart'; +import '../../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/streams_test.dart b/drift/test/database/streams_test.dart similarity index 99% rename from drift/test/streams_test.dart rename to drift/test/database/streams_test.dart index a5ae2e01..46969c6e 100644 --- a/drift/test/streams_test.dart +++ b/drift/test/database/streams_test.dart @@ -6,9 +6,9 @@ import 'package:drift/src/runtime/executor/stream_queries.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/custom_tables.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../generated/custom_tables.dart'; +import '../generated/todos.dart'; +import '../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/tables_test.dart b/drift/test/database/tables_test.dart similarity index 95% rename from drift/test/tables_test.dart rename to drift/test/database/tables_test.dart index 8f1f1d44..183f04aa 100644 --- a/drift/test/tables_test.dart +++ b/drift/test/database/tables_test.dart @@ -1,8 +1,8 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../generated/todos.dart'; +import '../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/transactions_test.dart b/drift/test/database/transactions_test.dart similarity index 98% rename from drift/test/transactions_test.dart rename to drift/test/database/transactions_test.dart index 0e13f577..3efc6287 100644 --- a/drift/test/transactions_test.dart +++ b/drift/test/database/transactions_test.dart @@ -5,8 +5,8 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../generated/todos.dart'; +import '../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/types/blob_test.dart b/drift/test/database/types/blob_test.dart similarity index 100% rename from drift/test/types/blob_test.dart rename to drift/test/database/types/blob_test.dart diff --git a/drift/test/types/datetime_test.dart b/drift/test/database/types/datetime_test.dart similarity index 100% rename from drift/test/types/datetime_test.dart rename to drift/test/database/types/datetime_test.dart diff --git a/drift/test/types/enum_index_converter_test.dart b/drift/test/database/types/enum_index_converter_test.dart similarity index 100% rename from drift/test/types/enum_index_converter_test.dart rename to drift/test/database/types/enum_index_converter_test.dart diff --git a/drift/test/types/non_nullable_type_converter_test.dart b/drift/test/database/types/non_nullable_type_converter_test.dart similarity index 95% rename from drift/test/types/non_nullable_type_converter_test.dart rename to drift/test/database/types/non_nullable_type_converter_test.dart index bb60a898..a4634c85 100644 --- a/drift/test/types/non_nullable_type_converter_test.dart +++ b/drift/test/database/types/non_nullable_type_converter_test.dart @@ -1,6 +1,6 @@ import 'package:test/test.dart'; -import '../data/tables/converter.dart'; +import '../../generated/converter.dart'; void main() { test('test null in null aware type converters', () { diff --git a/drift/test/types/real_type_test.dart b/drift/test/database/types/real_type_test.dart similarity index 100% rename from drift/test/types/real_type_test.dart rename to drift/test/database/types/real_type_test.dart diff --git a/drift/test/types/sql_type_test.dart b/drift/test/database/types/sql_type_test.dart similarity index 100% rename from drift/test/types/sql_type_test.dart rename to drift/test/database/types/sql_type_test.dart diff --git a/drift/test/engines/connection_pool_integration_test.dart b/drift/test/engines/connection_pool_integration_test.dart index 8b893141..46d9dab7 100644 --- a/drift/test/engines/connection_pool_integration_test.dart +++ b/drift/test/engines/connection_pool_integration_test.dart @@ -7,7 +7,7 @@ import 'package:drift/native.dart'; import 'package:path/path.dart' show join; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; String fileName = 'drift-wal-integration-test.db'; final _file = File(join(Directory.systemTemp.path, fileName)); diff --git a/drift/test/engines/connection_pool_test.dart b/drift/test/engines/connection_pool_test.dart index 938e663c..6bac4ea0 100644 --- a/drift/test/engines/connection_pool_test.dart +++ b/drift/test/engines/connection_pool_test.dart @@ -2,7 +2,7 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; import '../test_utils/test_utils.dart'; void main() { diff --git a/drift/test/error_handling_test.dart b/drift/test/error_handling_test.dart index f2dafaa8..b0e2fab1 100644 --- a/drift/test/error_handling_test.dart +++ b/drift/test/error_handling_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; +import 'generated/todos.dart'; import 'test_utils/test_utils.dart'; // the content is set to non-null and the title must be between 4 and 16 chars diff --git a/drift/test/extensions/fts5_integration_test.dart b/drift/test/extensions/fts5_integration_test.dart index f0ffe579..5c10d7d1 100644 --- a/drift/test/extensions/fts5_integration_test.dart +++ b/drift/test/extensions/fts5_integration_test.dart @@ -1,7 +1,7 @@ @Tags(['integration']) import 'package:test/test.dart'; -import '../data/tables/custom_tables.dart'; +import '../generated/custom_tables.dart'; import '../test_utils/test_utils.dart'; void main() { diff --git a/drift/test/extensions/json1_integration_test.dart b/drift/test/extensions/json1_integration_test.dart index b8c7a2f8..669e726f 100644 --- a/drift/test/extensions/json1_integration_test.dart +++ b/drift/test/extensions/json1_integration_test.dart @@ -5,7 +5,7 @@ import 'package:drift/drift.dart'; import 'package:drift/extensions/json1.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; import '../test_utils/test_utils.dart'; void main() { diff --git a/drift/test/extensions/moor_ffi_functions_test.dart b/drift/test/extensions/moor_ffi_functions_test.dart index a8eb2b13..c75870fe 100644 --- a/drift/test/extensions/moor_ffi_functions_test.dart +++ b/drift/test/extensions/moor_ffi_functions_test.dart @@ -2,7 +2,7 @@ import 'package:drift/drift.dart'; import 'package:drift/extensions/native.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; import '../test_utils/test_utils.dart'; void main() { diff --git a/drift/test/data/tables/converter.dart b/drift/test/generated/converter.dart similarity index 100% rename from drift/test/data/tables/converter.dart rename to drift/test/generated/converter.dart diff --git a/drift/test/data/tables/custom_tables.dart b/drift/test/generated/custom_tables.dart similarity index 100% rename from drift/test/data/tables/custom_tables.dart rename to drift/test/generated/custom_tables.dart diff --git a/drift/test/data/tables/custom_tables.g.dart b/drift/test/generated/custom_tables.g.dart similarity index 100% rename from drift/test/data/tables/custom_tables.g.dart rename to drift/test/generated/custom_tables.g.dart diff --git a/drift/test/data/tables/data_classes.dart b/drift/test/generated/data_classes.dart similarity index 100% rename from drift/test/data/tables/data_classes.dart rename to drift/test/generated/data_classes.dart diff --git a/drift/test/data/tables/tables.drift b/drift/test/generated/tables.drift similarity index 100% rename from drift/test/data/tables/tables.drift rename to drift/test/generated/tables.drift diff --git a/drift/test/data/tables/todos.dart b/drift/test/generated/todos.dart similarity index 100% rename from drift/test/data/tables/todos.dart rename to drift/test/generated/todos.dart diff --git a/drift/test/data/tables/todos.g.dart b/drift/test/generated/todos.g.dart similarity index 100% rename from drift/test/data/tables/todos.g.dart rename to drift/test/generated/todos.g.dart diff --git a/drift/test/integration_tests/drift_files_integration_test.dart b/drift/test/integration_tests/drift_files_integration_test.dart index 80a40f4e..06ba938d 100644 --- a/drift/test/integration_tests/drift_files_integration_test.dart +++ b/drift/test/integration_tests/drift_files_integration_test.dart @@ -3,8 +3,8 @@ import 'package:drift/drift.dart' hide isNull; import 'package:test/test.dart'; -import '../data/tables/converter.dart'; -import '../data/tables/custom_tables.dart'; +import '../generated/converter.dart'; +import '../generated/custom_tables.dart'; import '../skips.dart'; import '../test_utils/test_utils.dart'; diff --git a/drift/test/integration_tests/drift_files_test.dart b/drift/test/integration_tests/drift_files_test.dart index 36df0ebc..c71b8b00 100644 --- a/drift/test/integration_tests/drift_files_test.dart +++ b/drift/test/integration_tests/drift_files_test.dart @@ -2,8 +2,8 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import '../data/tables/converter.dart'; -import '../data/tables/custom_tables.dart'; +import '../generated/converter.dart'; +import '../generated/custom_tables.dart'; import '../test_utils/test_utils.dart'; const _createNoIds = diff --git a/drift/test/integration_tests/insert_integration_test.dart b/drift/test/integration_tests/insert_integration_test.dart index 254353fc..ae2fc2a1 100644 --- a/drift/test/integration_tests/insert_integration_test.dart +++ b/drift/test/integration_tests/insert_integration_test.dart @@ -2,7 +2,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; import '../skips.dart'; import '../test_utils/test_utils.dart'; diff --git a/drift/test/integration_tests/list_subquery_integration_test.dart b/drift/test/integration_tests/list_subquery_integration_test.dart index 23185268..013499a1 100644 --- a/drift/test/integration_tests/list_subquery_integration_test.dart +++ b/drift/test/integration_tests/list_subquery_integration_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/custom_tables.dart'; +import '../generated/custom_tables.dart'; import '../test_utils/test_utils.dart'; void main() { diff --git a/drift/test/integration_tests/migrations_integration_test.dart b/drift/test/integration_tests/migrations_integration_test.dart index d58ae64a..46cc48a9 100644 --- a/drift/test/integration_tests/migrations_integration_test.dart +++ b/drift/test/integration_tests/migrations_integration_test.dart @@ -5,8 +5,8 @@ import 'package:drift_dev/api/migrations.dart'; import 'package:sqlite3/sqlite3.dart'; import 'package:test/test.dart'; -import '../data/tables/custom_tables.dart'; -import '../data/tables/todos.dart'; +import '../generated/custom_tables.dart'; +import '../generated/todos.dart'; void main() { test('change column types', () async { diff --git a/drift/test/integration_tests/regress_1232_test.dart b/drift/test/integration_tests/regress_1232_test.dart index 159b887a..23e87e53 100644 --- a/drift/test/integration_tests/regress_1232_test.dart +++ b/drift/test/integration_tests/regress_1232_test.dart @@ -1,7 +1,7 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; import '../test_utils/test_utils.dart'; void main() { diff --git a/drift/test/integration_tests/regress_1235_test.dart b/drift/test/integration_tests/regress_1235_test.dart index 059d4194..1f8e7be4 100644 --- a/drift/test/integration_tests/regress_1235_test.dart +++ b/drift/test/integration_tests/regress_1235_test.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:test/scaffolding.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; void main() { test('creating a database instance does not schedule async work', () { diff --git a/drift/test/integration_tests/regress_1599_test.dart b/drift/test/integration_tests/regress_1599_test.dart index 329a9ecc..a325b48c 100644 --- a/drift/test/integration_tests/regress_1599_test.dart +++ b/drift/test/integration_tests/regress_1599_test.dart @@ -1,8 +1,8 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/converter.dart'; -import '../data/tables/custom_tables.dart'; +import '../generated/converter.dart'; +import '../generated/custom_tables.dart'; import '../test_utils/test_utils.dart'; void main() { diff --git a/drift/test/rx_streams_test.dart b/drift/test/integration_tests/rx_streams_test.dart similarity index 93% rename from drift/test/rx_streams_test.dart rename to drift/test/integration_tests/rx_streams_test.dart index 4923ddb5..270e11ae 100644 --- a/drift/test/rx_streams_test.dart +++ b/drift/test/integration_tests/rx_streams_test.dart @@ -2,8 +2,8 @@ import 'package:mockito/mockito.dart'; import 'package:rxdart/rxdart.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; -import 'test_utils/test_utils.dart'; +import '../generated/todos.dart'; +import '../test_utils/test_utils.dart'; void main() { late TodoDb db; diff --git a/drift/test/integration_tests/select_integration_test.dart b/drift/test/integration_tests/select_integration_test.dart index 736c935a..c9fccaf7 100644 --- a/drift/test/integration_tests/select_integration_test.dart +++ b/drift/test/integration_tests/select_integration_test.dart @@ -2,7 +2,7 @@ import 'package:collection/collection.dart'; import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; import '../test_utils/test_utils.dart'; void main() { diff --git a/drift/test/isolate_test.dart b/drift/test/isolate_test.dart index 9388558d..0aeb3a9f 100644 --- a/drift/test/isolate_test.dart +++ b/drift/test/isolate_test.dart @@ -8,7 +8,7 @@ import 'package:drift/native.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; +import 'generated/todos.dart'; import 'test_utils/test_utils.dart'; void main() { diff --git a/drift/test/ffi/close_existing_test.dart b/drift/test/platforms/ffi/close_existing_test.dart similarity index 100% rename from drift/test/ffi/close_existing_test.dart rename to drift/test/platforms/ffi/close_existing_test.dart diff --git a/drift/test/ffi/moor_functions_test.dart b/drift/test/platforms/ffi/moor_functions_test.dart similarity index 100% rename from drift/test/ffi/moor_functions_test.dart rename to drift/test/platforms/ffi/moor_functions_test.dart diff --git a/drift/test/ffi/setup_test.dart b/drift/test/platforms/ffi/setup_test.dart similarity index 96% rename from drift/test/ffi/setup_test.dart rename to drift/test/platforms/ffi/setup_test.dart index 9db0f2d6..a2e424ef 100644 --- a/drift/test/ffi/setup_test.dart +++ b/drift/test/platforms/ffi/setup_test.dart @@ -3,7 +3,7 @@ import 'package:drift/native.dart'; import 'package:sqlite3/sqlite3.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../../generated/todos.dart'; void _setup(Database db) { db.createFunction( diff --git a/drift/test/ffi/vm_database_test.dart b/drift/test/platforms/ffi/vm_database_test.dart similarity index 100% rename from drift/test/ffi/vm_database_test.dart rename to drift/test/platforms/ffi/vm_database_test.dart diff --git a/drift/test/web/binary_string_test.dart b/drift/test/platforms/web/binary_string_test.dart similarity index 100% rename from drift/test/web/binary_string_test.dart rename to drift/test/platforms/web/binary_string_test.dart diff --git a/drift/test/web/local_storage_to_indexed_db_test.dart b/drift/test/platforms/web/local_storage_to_indexed_db_test.dart similarity index 100% rename from drift/test/web/local_storage_to_indexed_db_test.dart rename to drift/test/platforms/web/local_storage_to_indexed_db_test.dart diff --git a/drift/test/serialization_test.dart b/drift/test/serialization_test.dart index 888c8b36..43f49bfb 100644 --- a/drift/test/serialization_test.dart +++ b/drift/test/serialization_test.dart @@ -1,6 +1,6 @@ import 'package:drift/drift.dart'; import 'package:test/test.dart'; -import 'data/tables/todos.dart'; +import 'generated/todos.dart'; final DateTime someDate = DateTime(2019, 06, 08); diff --git a/drift/test/utils/expand_variables_test.dart b/drift/test/utils/expand_variables_test.dart index 3c63e6cb..5efa624d 100644 --- a/drift/test/utils/expand_variables_test.dart +++ b/drift/test/utils/expand_variables_test.dart @@ -1,6 +1,6 @@ import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; void main() { test('\$expandVar test', () { diff --git a/drift/test/utils/lazy_database_test.dart b/drift/test/utils/lazy_database_test.dart index fd6fb736..6cd60257 100644 --- a/drift/test/utils/lazy_database_test.dart +++ b/drift/test/utils/lazy_database_test.dart @@ -4,7 +4,7 @@ import 'package:drift/drift.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; -import '../data/tables/todos.dart'; +import '../generated/todos.dart'; import '../test_utils/test_utils.dart'; class _LazyQueryUserForTest extends QueryExecutorUser { diff --git a/examples/app/analysis_options.yaml b/examples/app/analysis_options.yaml index f68ee5c6..eac114f1 100644 --- a/examples/app/analysis_options.yaml +++ b/examples/app/analysis_options.yaml @@ -5,3 +5,4 @@ analyzer: exclude: - "**/*.g.dart" - "**/*.freezed.dart" + - "**/generated_migrations/**"