From 3627a9e898b39c7dfd48ea3315637bfc7a9dbbac Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer
Date: Sat, 1 Apr 2023 21:28:07 +0200
Subject: Testcode aufgeräumt

---
 .../DNPM/services/mtb/DefaultMtbServiceTest.java   |  2 +-
 .../mtb/MrMtbAnmeldungToProtocolMapperTest.java    | 25 ++++++++++++----------
 .../mtb/OsTumorkonferenzToProtocolMapperTest.java  |  7 +++---
 ...orkonferenzVarianteUkwToProtocolMapperTest.java |  7 +++---
 4 files changed, 23 insertions(+), 18 deletions(-)

(limited to 'src/test/java/DNPM/services/mtb')

diff --git a/src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java b/src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java
index f5bc374..6721ba3 100644
--- a/src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java
+++ b/src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java
@@ -17,7 +17,7 @@ import java.util.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(MockitoExtension.class)
-public class DefaultMtbServiceTest {
+class DefaultMtbServiceTest {
 
     private IOnkostarApi onkostarApi;
 
diff --git a/src/test/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java b/src/test/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java
index 3f2857b..c6d34dc 100644
--- a/src/test/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java
+++ b/src/test/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java
@@ -16,7 +16,7 @@ import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doAnswer;
 
 @ExtendWith(MockitoExtension.class)
-public class MrMtbAnmeldungToProtocolMapperTest {
+class MrMtbAnmeldungToProtocolMapperTest {
 
     private IOnkostarApi onkostarApi;
 
@@ -76,12 +76,13 @@ public class MrMtbAnmeldungToProtocolMapperTest {
 
         var actual = this.mapper.apply(anmeldung);
 
-        assertThat(actual).isPresent();
-        assertThat(actual.get()).isEqualTo(
-                "Fragestellung:\nFrage?\n\n" +
-                "Empfehlung:\nEmpfehlung1\n\n" +
-                "Empfehlung:\nEmpfehlung2"
-        );
+        assertThat(actual)
+                .isPresent()
+                .contains(
+                        "Fragestellung:\nFrage?\n\n"
+                                + "Empfehlung:\nEmpfehlung1\n\n"
+                                + "Empfehlung:\nEmpfehlung2"
+                );
     }
 
     @Test
@@ -106,8 +107,9 @@ public class MrMtbAnmeldungToProtocolMapperTest {
 
         var actual = this.mapper.apply(anmeldung);
 
-        assertThat(actual).isPresent();
-        assertThat(actual.get()).isEqualTo("Fragestellung:\nFrage?");
+        assertThat(actual)
+                .isPresent()
+                .contains("Fragestellung:\nFrage?");
     }
 
     @Test
@@ -119,8 +121,9 @@ public class MrMtbAnmeldungToProtocolMapperTest {
 
         var actual = this.mapper.apply(anmeldung);
 
-        assertThat(actual).isPresent();
-        assertThat(actual.get()).isEqualTo("Fragestellung:\nFrage?");
+        assertThat(actual)
+                .isPresent()
+                .contains("Fragestellung:\nFrage?");
     }
 
     @Test
diff --git a/src/test/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapperTest.java b/src/test/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapperTest.java
index 639edac..962c032 100644
--- a/src/test/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapperTest.java
+++ b/src/test/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapperTest.java
@@ -15,7 +15,7 @@ import java.util.Date;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(MockitoExtension.class)
-public class OsTumorkonferenzToProtocolMapperTest {
+class OsTumorkonferenzToProtocolMapperTest {
 
     private IOnkostarApi onkostarApi;
 
@@ -39,8 +39,9 @@ public class OsTumorkonferenzToProtocolMapperTest {
 
         var actual = mapper.apply(procedure);
 
-        assertThat(actual).isPresent();
-        assertThat(actual.get()).isEqualTo("Fragestellung:\nTest ok?\n\nEmpfehlung:\nRerun Test if not ok!");
+        assertThat(actual)
+                .isPresent()
+                .contains("Fragestellung:\nTest ok?\n\nEmpfehlung:\nRerun Test if not ok!");
     }
 
 }
diff --git a/src/test/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java b/src/test/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java
index 03f151c..b462c89 100644
--- a/src/test/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java
+++ b/src/test/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java
@@ -15,7 +15,7 @@ import java.util.Date;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(MockitoExtension.class)
-public class OsTumorkonferenzVarianteUkwToProtocolMapperTest {
+class OsTumorkonferenzVarianteUkwToProtocolMapperTest {
 
     private IOnkostarApi onkostarApi;
 
@@ -39,8 +39,9 @@ public class OsTumorkonferenzVarianteUkwToProtocolMapperTest {
 
         var actual = mapper.apply(procedure);
 
-        assertThat(actual).isPresent();
-        assertThat(actual.get()).isEqualTo("Fragestellung:\nTest ok?\n\nEmpfehlung:\nRerun Test if not ok!");
+        assertThat(actual)
+                .isPresent()
+                .contains("Fragestellung:\nTest ok?\n\nEmpfehlung:\nRerun Test if not ok!");
     }
 
 }
-- 
cgit v1.2.3