Issue #4: Verschiebe Backend-Methode in EinzelempfehlungAnalyzer

2 files changed, 37 insertions, 33 deletions

diff --git a/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java b/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java
index f72159d..8812442 100644
--- a/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java
+++ b/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java
@@ -2,17 +2,21 @@ package DNPM.analyzer;
 
 import DNPM.security.PermissionType;
 import DNPM.security.PersonPoolBasedPermissionEvaluator;
+import DNPM.services.StudienService;
 import DNPM.services.molekulargenetik.MolekulargenetikFormService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.util.HashMap;
 import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
@@ -21,6 +25,8 @@ class EinzelempfehlungAnalyzerTest {
 
     private IOnkostarApi onkostarApi;
 
+    private StudienService studienService;
+
     private MolekulargenetikFormService molekulargenetikFormService;
 
     private PersonPoolBasedPermissionEvaluator permissionEvaluator;
@@ -30,13 +36,15 @@ class EinzelempfehlungAnalyzerTest {
     @BeforeEach
     void setup(
             @Mock IOnkostarApi onkostarApi,
+            @Mock StudienService studienService,
             @Mock MolekulargenetikFormService molekulargenetikFormService,
             @Mock PersonPoolBasedPermissionEvaluator permissionEvaluator
     ) {
         this.onkostarApi = onkostarApi;
+        this.studienService = studienService;
         this.molekulargenetikFormService = molekulargenetikFormService;
         this.permissionEvaluator = permissionEvaluator;
-        this.analyzer = new EinzelempfehlungAnalyzer(onkostarApi, molekulargenetikFormService, permissionEvaluator);
+        this.analyzer = new EinzelempfehlungAnalyzer(onkostarApi, studienService, molekulargenetikFormService, permissionEvaluator);
     }
 
     @Test
@@ -49,4 +57,30 @@ class EinzelempfehlungAnalyzerTest {
         verify(molekulargenetikFormService, times(1)).getVariants(any(Procedure.class));
     }
 
+    @Test
+    void shouldRequestAllStudienForEmptyQueryString() {
+        var input = Map.of("q", (Object) "   ");
+        this.analyzer.getStudien(input);
+
+        verify(studienService, times(1)).findAll();
+    }
+
+    @Test
+    void shouldRequestAllStudienForEmptyInputMap() {
+        var input = new HashMap<String, Object>();
+        this.analyzer.getStudien(input);
+
+        verify(studienService, times(1)).findAll();
+    }
+
+    @Test
+    void shouldRequestFilteredStudien() {
+        var input = Map.of("q", (Object) "NCT-123");
+        this.analyzer.getStudien(input);
+
+        var captor = ArgumentCaptor.forClass(String.class);
+        verify(studienService, times(1)).findByQuery(captor.capture());
+        assertThat(captor.getValue()).isEqualTo("NCT-123");
+    }
+
 }
diff --git a/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java b/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java
index ffd886b..cd5aee1 100644
--- a/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java
+++ b/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java
@@ -2,7 +2,7 @@ package DNPM.analyzer;
 
 import DNPM.security.DelegatingDataBasedPermissionEvaluator;
 import DNPM.security.PermissionType;
-import DNPM.services.*;
+import DNPM.services.FormService;
 import DNPM.services.mtb.MtbService;
 import DNPM.services.therapieplan.MultipleMtbTherapieplanService;
 import DNPM.services.therapieplan.TherapieplanService;
@@ -17,7 +17,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,9 +33,6 @@ class TherapieplanAnalyzerTest {
     private FormService formService;
 
     @Mock
-    private StudienService studienService;
-
-    @Mock
     private TherapieplanServiceFactory therapieplanServiceFactory;
 
     @Mock
@@ -52,7 +48,7 @@ class TherapieplanAnalyzerTest {
 
     @BeforeEach
     void setUp() {
-        this.therapieplanAnalyzer = new TherapieplanAnalyzer(studienService, therapieplanServiceFactory, mtbService, permissionEvaluator);
+        this.therapieplanAnalyzer = new TherapieplanAnalyzer(therapieplanServiceFactory, mtbService, permissionEvaluator);
     }
 
     @Test
@@ -66,32 +62,6 @@ class TherapieplanAnalyzerTest {
     }
 
     @Test
-    void shouldRequestAllStudienForEmptyQueryString() {
-        var input = Map.of("q", (Object) "   ");
-        this.therapieplanAnalyzer.getStudien(input);
-
-        verify(studienService, times(1)).findAll();
-    }
-
-    @Test
-    void shouldRequestAllStudienForEmptyInputMap() {
-        var input = new HashMap<String, Object>();
-        this.therapieplanAnalyzer.getStudien(input);
-
-        verify(studienService, times(1)).findAll();
-    }
-
-    @Test
-    void shouldRequestFilteredStudien() {
-        var input = Map.of("q", (Object) "NCT-123");
-        this.therapieplanAnalyzer.getStudien(input);
-
-        var captor = ArgumentCaptor.forClass(String.class);
-        verify(studienService, times(1)).findByQuery(captor.capture());
-        assertThat(captor.getValue()).isEqualTo("NCT-123");
-    }
-
-    @Test
     void shouldRequestProtokollauszug() {
         doAnswer(invocationOnMock -> {
             var procedure = new Procedure(onkostarApi);