fix: Set explicit return types in test tools code. (serverpod#2892)

SandPod · Oct 22, 2024 · aefba28 · aefba28
1 parent 37faa92
commit aefba28
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/...module/serverpod_test_module_server/test/integration/test_tools/serverpod_test_tools.dart b/...module/serverpod_test_module_server/test/integration/test_tools/serverpod_test_tools.dart
@@ -21,7 +21,7 @@ import 'package:serverpod_test_module_server/src/generated/endpoints.dart';
 export 'package:serverpod_test/serverpod_test_public_exports.dart';
 
 @_i1.isTestGroup
-withServerpod(
+void withServerpod(
   String testGroupName,
   _i1.TestClosure<TestEndpoints> testClosure, {
   String? runMode,
@@ -55,7 +55,7 @@ class TestEndpoints {
 class _InternalTestEndpoints extends TestEndpoints
     implements _i1.InternalTestEndpoints {
   @override
-  initialize(
+  void initialize(
     _i2.SerializationManager serializationManager,
     _i2.EndpointDispatch endpoints,
   ) {

diff --git a/tests/serverpod_test_server/test_integration/test_tools/serverpod_test_tools.dart b/tests/serverpod_test_server/test_integration/test_tools/serverpod_test_tools.dart
@@ -45,7 +45,7 @@ import 'package:serverpod_test_server/src/generated/endpoints.dart';
 export 'package:serverpod_test/serverpod_test_public_exports.dart';
 
 @_i1.isTestGroup
-withServerpod(
+void withServerpod(
   String testGroupName,
   _i1.TestClosure<TestEndpoints> testClosure, {
   String? runMode,
@@ -156,7 +156,7 @@ class TestEndpoints {
 class _InternalTestEndpoints extends TestEndpoints
     implements _i1.InternalTestEndpoints {
   @override
-  initialize(
+  void initialize(
     _i2.SerializationManager serializationManager,
     _i2.EndpointDispatch endpoints,
   ) {

diff --git a/.../serverpod_cli/lib/src/generator/dart/library_generators/server_test_tools_generator.dart b/.../serverpod_cli/lib/src/generator/dart/library_generators/server_test_tools_generator.dart
@@ -345,6 +345,7 @@ class ServerTestToolsGenerator {
           (methodBuilder) {
             methodBuilder
               ..name = 'initialize'
+              ..returns = refer('void')
               ..annotations.add(refer('override'))
               ..requiredParameters.add(
                 Parameter(
@@ -384,6 +385,7 @@ class ServerTestToolsGenerator {
     return Method((methodBuilder) {
       methodBuilder
         ..name = 'withServerpod'
+        ..returns = refer('void')
         ..annotations.add(refer('isTestGroup', serverpodTestUrl))
         ..requiredParameters.addAll([
           Parameter((p) => p

diff --git a/tools/serverpod_cli/test/generator/dart/server_code_generator/test_tools_test.dart b/tools/serverpod_cli/test/generator/dart/server_code_generator/test_tools_test.dart
@@ -66,7 +66,7 @@ void main() {
             testToolsFile,
             matches(
               r'@_i\d\.isTestGroup\n'
-              r'withServerpod\(\n'
+              r'void withServerpod\(\n'
               r'  String testGroupName,\n'
               r'  _i\d\.TestClosure<TestEndpoints> testClosure, \{\n'
               r'  String\? runMode,\n'
@@ -138,7 +138,7 @@ void main() {
             testToolsFile,
             matches(
               r'@_i\d\.isTestGroup\n'
-              r'withServerpod\(\n'
+              r'void withServerpod\(\n'
               r'  String testGroupName,\n'
               r'  _i\d\.TestClosure<TestEndpoints> testClosure, \{\n'
               r'  String\? runMode,\n'
@@ -183,7 +183,7 @@ void main() {
             testToolsFile,
             matches(
               r'@_i\d\.isTestGroup\n'
-              r'withServerpod\(\n'
+              r'void withServerpod\(\n'
               r'  String testGroupName,\n'
               r'  _i\d\.TestClosure<TestEndpoints> testClosure, \{\n'
               r'  String\? runMode,\n'
@@ -263,7 +263,7 @@ void main() {
             testToolsFile,
             matches(
               r'@_i\d\.isTestGroup\n'
-              r'withServerpod\(\n'
+              r'void withServerpod\(\n'
               r'  String testGroupName,\n'
               r'  _i\d\.TestClosure<TestEndpoints> testClosure, \{\n'
               r'  String\? runMode,\n'