Restructure drift test files

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;

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', () {

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);

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<int>('foo', precedence: Precedence.primary);

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<int>('i1', precedence: Precedence.primary);

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<bool>('a', precedence: Precedence.primary);

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', () {

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 =

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', () {

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<int?> Function(Expression<DateTime?> d);
 

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', () {

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

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;

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();

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 =

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 =

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', () {

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<String>('x');

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
 

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;

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;

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;

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;

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,

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;

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;

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;

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;

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', () {

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));

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() {

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

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() {

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() {

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() {

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';
 

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 =

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';
 

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() {

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 {

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() {

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', () {

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() {

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;

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() {

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() {

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(

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);
 

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', () {

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 {

examples/app/analysis_options.yaml

@@ -5,3 +5,4 @@ analyzer:
   exclude:
     - "**/*.g.dart"
     - "**/*.freezed.dart"
+    - "**/generated_migrations/**"