2 files changed, 12 insertions, 31 deletions

diff --git a/src/test/java/DNPM/config/PluginConfigurationTest.java b/src/test/java/DNPM/config/PluginConfigurationTest.java
index 77c95e7..d94b3c7 100644
--- a/src/test/java/DNPM/config/PluginConfigurationTest.java
+++ b/src/test/java/DNPM/config/PluginConfigurationTest.java
@@ -1,6 +1,7 @@
 package DNPM.config;
 
 import DNPM.services.FormService;
+import DNPM.services.SettingsService;
 import DNPM.services.TherapieplanServiceFactory;
 import de.itc.onkostar.api.IOnkostarApi;
 import org.junit.jupiter.api.BeforeEach;
@@ -18,6 +19,9 @@ public class PluginConfigurationTest {
     private IOnkostarApi onkostarApi;
 
     @Mock
+    private SettingsService settingsService;
+
+    @Mock
     private FormService formService;
 
     private PluginConfiguration configuration;
@@ -29,7 +33,7 @@ public class PluginConfigurationTest {
 
     @Test
     void testShouldReturnTherapieplanServiceFactory() {
-        var actual = this.configuration.therapieplanServiceFactory(onkostarApi, formService);
+        var actual = this.configuration.therapieplanServiceFactory(onkostarApi, settingsService, formService);
         assertThat(actual).isInstanceOf(TherapieplanServiceFactory.class);
     }
 }
diff --git a/src/test/java/DNPM/config/TherapieplanServiceFactoryTest.java b/src/test/java/DNPM/config/TherapieplanServiceFactoryTest.java
index f974dcf..ea9ff42 100644
--- a/src/test/java/DNPM/config/TherapieplanServiceFactoryTest.java
+++ b/src/test/java/DNPM/config/TherapieplanServiceFactoryTest.java
@@ -1,9 +1,6 @@
 package DNPM.config;
 
-import DNPM.services.DefaultTherapieplanService;
-import DNPM.services.FormService;
-import DNPM.services.MultipleMtbTherapieplanService;
-import DNPM.services.TherapieplanServiceFactory;
+import DNPM.services.*;
 import de.itc.onkostar.api.IOnkostarApi;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -12,8 +9,6 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
@@ -25,31 +20,19 @@ public class TherapieplanServiceFactoryTest {
     @Mock
     private FormService formService;
 
+    @Mock
+    private SettingsService settingsService;
+
     private TherapieplanServiceFactory therapieplanServiceFactory;
 
     @BeforeEach
     void setup() {
-        this.therapieplanServiceFactory = new TherapieplanServiceFactory(onkostarApi, formService);
+        this.therapieplanServiceFactory = new TherapieplanServiceFactory(onkostarApi, settingsService, formService);
     }
 
     @Test
     void testShouldReturnDefaultTherapieplanServiceIfSettingIsFalse() {
-        doAnswer(invocationOnMock -> {
-            var settingName = invocationOnMock.getArgument(0, String.class);
-            if (settingName.equals("mehrere_mtb_in_mtbepisode")) {
-                return "false";
-            }
-            return null;
-        }).when(onkostarApi).getGlobalSetting(anyString());
-
-        var actual = this.therapieplanServiceFactory.currentUsableInstance();
-
-        assertThat(actual).isInstanceOf(DefaultTherapieplanService.class);
-    }
-
-    @Test
-    void testShouldReturnDefaultTherapieplanServiceIfNoSetting() {
-        when(onkostarApi.getGlobalSetting(anyString())).thenReturn(null);
+        when(settingsService.multipleMtbsInMtbEpisode()).thenReturn(false);
 
         var actual = this.therapieplanServiceFactory.currentUsableInstance();
 
@@ -58,13 +41,7 @@ public class TherapieplanServiceFactoryTest {
 
     @Test
     void testShouldReturnMultipleMtbTherapieplanServiceIfSettingIsTrue() {
-        doAnswer(invocationOnMock -> {
-            var settingName = invocationOnMock.getArgument(0, String.class);
-            if (settingName.equals("mehrere_mtb_in_mtbepisode")) {
-                return "true";
-            }
-            return null;
-        }).when(onkostarApi).getGlobalSetting(anyString());
+        when(settingsService.multipleMtbsInMtbEpisode()).thenReturn(true);
 
         var actual = this.therapieplanServiceFactory.currentUsableInstance();