chore: Move test_util directory under test (serverpod#3269)

Author: nielsenko

tools/serverpod_cli/analysis_options.yaml

@@ -12,7 +12,6 @@ linter:
   rules:
     # Temporary disable the following so that each can be fixed one by one.
     avoid_escaping_inner_quotes: false
-    directives_ordering: false
     prefer_final_in_for_each: false
     prefer_final_locals: false
     prefer_final_parameters: false

tools/serverpod_cli/bin/serverpod_cli.dart

@@ -5,11 +5,11 @@ import 'package:cli_tools/cli_tools.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:serverpod_cli/src/commands/analyze_pubspecs.dart';
 import 'package:serverpod_cli/src/commands/create.dart';
+import 'package:serverpod_cli/src/commands/create_migration.dart';
 import 'package:serverpod_cli/src/commands/create_repair_migration.dart';
-import 'package:serverpod_cli/src/commands/generate_pubspecs.dart';
 import 'package:serverpod_cli/src/commands/generate.dart';
+import 'package:serverpod_cli/src/commands/generate_pubspecs.dart';
 import 'package:serverpod_cli/src/commands/language_server.dart';
-import 'package:serverpod_cli/src/commands/create_migration.dart';
 import 'package:serverpod_cli/src/commands/upgrade.dart';
 import 'package:serverpod_cli/src/commands/version.dart';
 import 'package:serverpod_cli/src/downloads/resource_manager.dart';

tools/serverpod_cli/lib/analyzer.dart

@@ -1,13 +1,11 @@
 /// Tools for analyzing the protocol files of a Serverpod project.
 library;
 
-export 'src/analyzer/protocol_definition.dart' show ProtocolDefinition;
-export 'src/config/config.dart' show GeneratorConfig, PackageType;
-export 'src/analyzer/models/model_analyzer.dart' show SerializableModelAnalyzer;
-export 'src/analyzer/dart/endpoints_analyzer.dart' show EndpointsAnalyzer;
-export 'src/analyzer/code_analysis_collector.dart' show CodeAnalysisCollector;
 export 'package:source_span/source_span.dart'
     show SourceSpanException; // The collector uses them.
+
+export 'src/analyzer/code_analysis_collector.dart' show CodeAnalysisCollector;
+export 'src/analyzer/dart/endpoints_analyzer.dart' show EndpointsAnalyzer;
 export 'src/analyzer/models/definitions.dart'
     show
         SerializableModelDefinition,
@@ -16,7 +14,10 @@ export 'src/analyzer/models/definitions.dart'
         ModelFieldScopeDefinition,
         SerializableModelIndexDefinition,
         EnumDefinition;
+export 'src/analyzer/models/model_analyzer.dart' show SerializableModelAnalyzer;
+export 'src/analyzer/protocol_definition.dart' show ProtocolDefinition;
+export 'src/config/config.dart' show GeneratorConfig, PackageType;
+export 'src/database/extensions.dart';
 export 'src/database/migration.dart';
 export 'src/generator/types.dart' show TypeDefinition;
 export 'src/migrations/generator.dart';
-export 'src/database/extensions.dart';

tools/serverpod_cli/lib/src/analyzer/dart/endpoint_analyzers/endpoint_method_analyzer.dart

@@ -1,11 +1,12 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
-import 'package:serverpod_cli/src/analyzer/dart/endpoint_analyzers/endpoint_class_analyzer.dart';
-import 'package:serverpod_cli/src/analyzer/dart/endpoint_analyzers/endpoint_parameter_analyzer.dart';
 import 'package:serverpod_cli/src/analyzer/dart/definitions.dart';
 import 'package:serverpod_cli/src/analyzer/dart/element_extensions.dart';
+import 'package:serverpod_cli/src/analyzer/dart/endpoint_analyzers/endpoint_class_analyzer.dart';
+import 'package:serverpod_cli/src/analyzer/dart/endpoint_analyzers/endpoint_parameter_analyzer.dart';
 import 'package:serverpod_cli/src/generator/types.dart';
+
 import 'extension/endpoint_parameters_extension.dart';
 
 const _excludedMethodNameSet = {

tools/serverpod_cli/lib/src/analyzer/models/converter/converter.dart

@@ -1,9 +1,8 @@
 import 'package:serverpod_cli/src/util/string_manipulation.dart';
 import 'package:source_span/source_span.dart';
-import 'package:yaml/yaml.dart';
-
 // ignore: implementation_imports
 import 'package:yaml/src/equality.dart';
+import 'package:yaml/yaml.dart';
 
 List<String> convertIndexList(String stringifiedFields) {
   return stringifiedFields.split(',').map((field) => field.trim()).toList();

tools/serverpod_cli/lib/src/analyzer/models/entity_dependency_resolver.dart

@@ -403,7 +403,9 @@ class ModelDependencyResolver {
       var foreignFields = referenceClass.fields.where((field) {
         var fieldRelation = field.relation;
         if (!(fieldRelation is UnresolvedObjectRelationDefinition ||
-            fieldRelation is ForeignRelationDefinition)) return false;
+            fieldRelation is ForeignRelationDefinition)) {
+          return false;
+        }
         return fieldRelation?.name == relation.name;
       });
 

tools/serverpod_cli/lib/src/analyzer/models/model_analyzer.dart

@@ -1,23 +1,23 @@
+import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
+import 'package:serverpod_cli/src/analyzer/models/definitions.dart';
 import 'package:serverpod_cli/src/analyzer/models/entity_dependency_resolver.dart';
-import 'package:serverpod_cli/src/analyzer/models/validation/model_relations.dart';
-import 'package:serverpod_cli/src/analyzer/models/validation/validate_node.dart';
+import 'package:serverpod_cli/src/analyzer/models/model_parser/model_parser.dart';
 import 'package:serverpod_cli/src/analyzer/models/validation/keywords.dart';
+import 'package:serverpod_cli/src/analyzer/models/validation/model_relations.dart';
 import 'package:serverpod_cli/src/analyzer/models/validation/model_validator.dart';
+import 'package:serverpod_cli/src/analyzer/models/validation/restrictions.dart';
+import 'package:serverpod_cli/src/analyzer/models/validation/validate_node.dart';
 import 'package:serverpod_cli/src/analyzer/models/yaml_definitions/class_yaml_definition.dart';
 import 'package:serverpod_cli/src/analyzer/models/yaml_definitions/enum_yaml_definition.dart';
 import 'package:serverpod_cli/src/analyzer/models/yaml_definitions/exception_yaml_definition.dart';
 import 'package:serverpod_cli/src/config/config.dart';
 import 'package:serverpod_cli/src/generator/types.dart';
 import 'package:serverpod_cli/src/util/model_helper.dart';
+import 'package:serverpod_cli/src/util/yaml_docs.dart';
 import 'package:source_span/source_span.dart';
 // ignore: implementation_imports
 import 'package:yaml/src/error_listener.dart';
 import 'package:yaml/yaml.dart';
-import 'package:serverpod_cli/src/util/yaml_docs.dart';
-import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
-import 'package:serverpod_cli/src/analyzer/models/definitions.dart';
-import 'package:serverpod_cli/src/analyzer/models/model_parser/model_parser.dart';
-import 'package:serverpod_cli/src/analyzer/models/validation/restrictions.dart';
 
 String _transformFileNameWithoutPathOrExtension(Uri path) {
   var fileName = path.pathSegments.last;

tools/serverpod_cli/lib/src/analyzer/models/validation/model_validator.dart

@@ -1,12 +1,11 @@
 import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
+import 'package:serverpod_cli/src/analyzer/models/converter/converter.dart';
 import 'package:serverpod_cli/src/analyzer/models/validation/keywords.dart';
 import 'package:serverpod_cli/src/analyzer/models/validation/restrictions.dart';
+import 'package:serverpod_cli/src/analyzer/models/validation/validate_node.dart';
 import 'package:serverpod_cli/src/util/extensions.dart';
 import 'package:yaml/yaml.dart';
 
-import 'package:serverpod_cli/src/analyzer/models/converter/converter.dart';
-import 'package:serverpod_cli/src/analyzer/models/validation/validate_node.dart';
-
 /// Validates that only one top level model type is defined.
 List<SourceSpanSeverityException> validateTopLevelModelType(
   YamlNode documentContents,

tools/serverpod_cli/lib/src/downloads/resource_manager.dart

@@ -4,12 +4,11 @@ import 'package:archive/archive.dart';
 import 'package:cli_tools/cli_tools.dart';
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as p;
-import 'package:serverpod_cli/src/util/serverpod_cli_logger.dart';
-import 'package:uuid/uuid.dart';
-
 import 'package:serverpod_cli/src/downloads/resource_manager_constants.dart';
 import 'package:serverpod_cli/src/generated/version.dart';
 import 'package:serverpod_cli/src/shared/environment.dart';
+import 'package:serverpod_cli/src/util/serverpod_cli_logger.dart';
+import 'package:uuid/uuid.dart';
 
 final resourceManager = ResourceManager();
 

tools/serverpod_cli/lib/src/generator/generator_continuous.dart

@@ -4,13 +4,12 @@ import 'dart:io';
 import 'package:async/async.dart';
 import 'package:intl/intl.dart';
 import 'package:path/path.dart' as p;
+import 'package:serverpod_cli/analyzer.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/util/model_helper.dart';
 import 'package:serverpod_cli/src/util/serverpod_cli_logger.dart';
 import 'package:watcher/watcher.dart';
 
-import 'package:serverpod_cli/analyzer.dart';
-
 import 'generator.dart';
 
 /// Continuously generate code when files change.

tools/serverpod_cli/lib/src/generator/yaml/endpoint_description_generator.dart

@@ -1,6 +1,6 @@
+import 'package:path/path.dart' as p;
 import 'package:serverpod_cli/analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generator.dart';
-import 'package:path/path.dart' as p;
 
 class EndpointDescriptionGenerator extends CodeGenerator {
   const EndpointDescriptionGenerator();

tools/serverpod_cli/lib/src/migrations/generator.dart

@@ -12,8 +12,8 @@ import 'package:serverpod_cli/src/migrations/migration_registry.dart';
 import 'package:serverpod_cli/src/util/model_helper.dart';
 import 'package:serverpod_cli/src/util/serverpod_cli_logger.dart';
 import 'package:serverpod_serialization/serverpod_serialization.dart';
-import 'package:serverpod_shared/serverpod_shared.dart';
 import 'package:serverpod_service_client/serverpod_service_client.dart';
+import 'package:serverpod_shared/serverpod_shared.dart';
 
 class MigrationGenerator {
   MigrationGenerator({

tools/serverpod_cli/lib/src/serverpod_packages_version_check/serverpod_packages_version_check.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
-import 'package:pubspec_parse/pubspec_parse.dart';
 import 'package:pub_semver/pub_semver.dart';
+import 'package:pubspec_parse/pubspec_parse.dart';
 import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
 import 'package:serverpod_cli/src/util/pubspec_helpers.dart';
 import 'package:yaml/yaml.dart';
@@ -78,7 +78,9 @@ List<MapEntry<String, HostedDependency>> _getHostedServerpodDependencies(
 ) {
   return dependencies.entries.fold([], (hostedDependencies, dependency) {
     if (!dependency.key.startsWith('serverpod') ||
-        dependency.value is! HostedDependency) return hostedDependencies;
+        dependency.value is! HostedDependency) {
+      return hostedDependencies;
+    }
 
     // Cast dependencies to HostedDependency type
     return [

tools/serverpod_cli/lib/src/util/locate_modules.dart

@@ -1,11 +1,11 @@
 import 'dart:io';
 
 import 'package:package_config/package_config.dart';
+import 'package:path/path.dart' as path;
 import 'package:serverpod_cli/src/config/config.dart';
 import 'package:serverpod_cli/src/util/serverpod_cli_logger.dart';
 import 'package:serverpod_shared/serverpod_shared.dart';
 import 'package:yaml/yaml.dart';
-import 'package:path/path.dart' as path;
 
 const _serverSuffix = '_server';
 

tools/serverpod_cli/lib/src/util/model_helper.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
-import 'package:serverpod_cli/src/config/config.dart';
+
 import 'package:path/path.dart';
+import 'package:serverpod_cli/src/config/config.dart';
 import 'package:super_string/super_string.dart';
 
 const String defaultModuleAlias = 'protocol';

tools/serverpod_cli/lib/src/util/project_name.dart

@@ -1,8 +1,9 @@
 import 'dart:io';
+
+import 'package:path/path.dart' as path;
 import 'package:serverpod_cli/src/util/locate_modules.dart';
 import 'package:serverpod_cli/src/util/serverpod_cli_logger.dart';
 import 'package:yaml/yaml.dart';
-import 'package:path/path.dart' as path;
 
 Future<String?> getProjectName([Directory? projectDirectory]) async {
   projectDirectory ??= Directory.current;

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/class_conflicts_test.dart

@@ -1,10 +1,11 @@
 import 'package:serverpod_cli/analyzer.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/class_type_test.dart

@@ -1,10 +1,11 @@
 import 'package:serverpod_cli/analyzer.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/documentation_test.dart

@@ -1,9 +1,10 @@
 import 'package:serverpod_cli/src/analyzer/models/definitions.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/enum_serialized_as_test.dart

@@ -1,11 +1,12 @@
 import 'package:serverpod_cli/src/analyzer/models/definitions.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:serverpod_service_client/serverpod_service_client.dart';
 import 'package:test/test.dart';
 
+import '../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/enum_values_test.dart

@@ -1,10 +1,11 @@
 import 'package:serverpod_cli/src/analyzer/models/definitions.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/extra_properties_test.dart

@@ -2,10 +2,11 @@ import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
 import 'package:serverpod_cli/src/analyzer/models/definitions.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/field/default/bool/field_bool_default_model_test.dart

@@ -2,10 +2,11 @@ import 'package:serverpod_cli/analyzer.dart';
 import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/field/default/bool/field_bool_default_persist_test.dart

@@ -2,10 +2,11 @@ import 'package:serverpod_cli/analyzer.dart';
 import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/field/default/bool/field_bool_default_test.dart

@@ -2,10 +2,11 @@ import 'package:serverpod_cli/analyzer.dart';
 import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/field/default/datetime/field_datetime_default_model_test.dart

@@ -2,10 +2,11 @@ import 'package:serverpod_cli/analyzer.dart';
 import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();
 

tools/serverpod_cli/test/analyzer/models/stateful_analyzer/model_validation/field/default/datetime/field_datetime_default_persist_test.dart

@@ -2,10 +2,11 @@ import 'package:serverpod_cli/analyzer.dart';
 import 'package:serverpod_cli/src/analyzer/code_analysis_collector.dart';
 import 'package:serverpod_cli/src/analyzer/models/stateful_analyzer.dart';
 import 'package:serverpod_cli/src/generator/code_generation_collector.dart';
-import 'package:serverpod_cli/src/test_util/builders/generator_config_builder.dart';
-import 'package:serverpod_cli/src/test_util/builders/model_source_builder.dart';
 import 'package:test/test.dart';
 
+import '../../../../../../../test_util/builders/generator_config_builder.dart';
+import '../../../../../../../test_util/builders/model_source_builder.dart';
+
 void main() {
   var config = GeneratorConfigBuilder().build();