test: cleanup test classes

6 files changed, 21 insertions, 21 deletions

diff --git a/src/test/java/dev/dnpm/services/SettingsServiceTest.java b/src/test/java/dev/dnpm/services/SettingsServiceTest.java
index c5fd26e..4a5e10e 100644
--- a/src/test/java/dev/dnpm/services/SettingsServiceTest.java
+++ b/src/test/java/dev/dnpm/services/SettingsServiceTest.java
@@ -1,7 +1,7 @@
 package dev.dnpm.services;
 
-import dev.dnpm.database.SettingsRepository;
 import de.itc.db.dnpm.Setting;
+import dev.dnpm.database.SettingsRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,13 +15,15 @@ import static org.mockito.Mockito.doAnswer;
 @ExtendWith(MockitoExtension.class)
 class SettingsServiceTest {
 
-    @Mock
     private SettingsRepository settingsRepository;
 
     private SettingsService service;
 
     @BeforeEach
-    void setUp() {
+    void setUp(
+            @Mock SettingsRepository settingsRepository
+    ) {
+        this.settingsRepository = settingsRepository;
         this.service = new SettingsService(settingsRepository);
     }
 
diff --git a/src/test/java/dev/dnpm/services/consent/MrConsentManagerServiceTest.java b/src/test/java/dev/dnpm/services/consent/MrConsentManagerServiceTest.java
index 0f06dc4..bcecbf6 100644
--- a/src/test/java/dev/dnpm/services/consent/MrConsentManagerServiceTest.java
+++ b/src/test/java/dev/dnpm/services/consent/MrConsentManagerServiceTest.java
@@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
-public class MrConsentManagerServiceTest {
+class MrConsentManagerServiceTest {
 
     private IOnkostarApi onkostarApi;
 
diff --git a/src/test/java/dev/dnpm/services/consent/UkwConsentManagerServiceTest.java b/src/test/java/dev/dnpm/services/consent/UkwConsentManagerServiceTest.java
index 28a76e0..e0485db 100644
--- a/src/test/java/dev/dnpm/services/consent/UkwConsentManagerServiceTest.java
+++ b/src/test/java/dev/dnpm/services/consent/UkwConsentManagerServiceTest.java
@@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
-public class UkwConsentManagerServiceTest {
+class UkwConsentManagerServiceTest {
 
     private IOnkostarApi onkostarApi;
 
diff --git a/src/test/java/dev/dnpm/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java b/src/test/java/dev/dnpm/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java
index 5f2b30d..23c1e8e 100644
--- a/src/test/java/dev/dnpm/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java
+++ b/src/test/java/dev/dnpm/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class OsMolekluargenetikFormServiceTest {
+class OsMolekluargenetikFormServiceTest {
 
     private OsMolekulargenetikFormService service;
 
diff --git a/src/test/java/dev/dnpm/services/therapieplan/DefaultTherapieplanServiceTest.java b/src/test/java/dev/dnpm/services/therapieplan/DefaultTherapieplanServiceTest.java
index 0dff0ea..4554c0a 100644
--- a/src/test/java/dev/dnpm/services/therapieplan/DefaultTherapieplanServiceTest.java
+++ b/src/test/java/dev/dnpm/services/therapieplan/DefaultTherapieplanServiceTest.java
@@ -1,10 +1,10 @@
 package dev.dnpm.services.therapieplan;
 
-import dev.dnpm.services.FormService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
 import de.itc.onkostar.api.Procedure;
 import de.itc.onkostar.api.constants.JaNeinUnbekannt;
+import dev.dnpm.services.FormService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -22,16 +22,16 @@ import static org.mockito.Mockito.*;
 @ExtendWith(MockitoExtension.class)
 class DefaultTherapieplanServiceTest {
 
-    @Mock
     private IOnkostarApi onkostarApi;
 
-    @Mock
-    private FormService formService;
-
     private TherapieplanService service;
 
     @BeforeEach
-    void setUp() {
+    void setUp(
+            @Mock IOnkostarApi onkostarApi,
+            @Mock FormService formService
+    ) {
+        this.onkostarApi = onkostarApi;
         this.service = new DefaultTherapieplanService(onkostarApi, formService);
     }
 
diff --git a/src/test/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactoryTest.java b/src/test/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactoryTest.java
index e8d3600..0a341a3 100644
--- a/src/test/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactoryTest.java
+++ b/src/test/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactoryTest.java
@@ -1,8 +1,8 @@
 package dev.dnpm.services.therapieplan;
 
+import de.itc.onkostar.api.IOnkostarApi;
 import dev.dnpm.services.FormService;
 import dev.dnpm.services.SettingsService;
-import de.itc.onkostar.api.IOnkostarApi;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,19 +15,17 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 class TherapieplanServiceFactoryTest {
 
-    @Mock
-    private IOnkostarApi onkostarApi;
-
-    @Mock
-    private FormService formService;
-
-    @Mock
     private SettingsService settingsService;
 
     private TherapieplanServiceFactory therapieplanServiceFactory;
 
     @BeforeEach
-    void setup() {
+    void setup(
+            @Mock IOnkostarApi onkostarApi,
+            @Mock SettingsService settingsService,
+            @Mock FormService formService
+    ) {
+        this.settingsService = settingsService;
         this.therapieplanServiceFactory = new TherapieplanServiceFactory(onkostarApi, settingsService, formService);
     }