2 files changed, 15 insertions, 30 deletions
diff --git a/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java b/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java
index fdf8f8d..3e63fa6 100644
--- a/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java
+++ b/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java
@@ -20,7 +20,7 @@ import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-public class DefaultSystemtherapieServiceTest {
+class DefaultSystemtherapieServiceTest {
 
     private IOnkostarApi onkostarApi;
 
@@ -29,20 +29,14 @@ public class DefaultSystemtherapieServiceTest {
     private DefaultSystemtherapieService service;
 
     @BeforeEach
-    void setup(
-            @Mock IOnkostarApi onkostarApi,
-            @Mock SettingsService settingsService
-    ) {
+    void setup(@Mock IOnkostarApi onkostarApi, @Mock SettingsService settingsService) {
         this.onkostarApi = onkostarApi;
         this.settingsService = settingsService;
         this.service = new DefaultSystemtherapieService(onkostarApi, settingsService);
     }
 
     private static Set<Map.Entry<String, Class<OsSystemischeTherapieToProzedurwerteMapper>>> expectedMapperMappings() {
-        return Map.ofEntries(
-                Map.entry("OS.Systemische Therapie", OsSystemischeTherapieToProzedurwerteMapper.class),
-                Map.entry("OS.Systemische Therapie.VarianteUKW", OsSystemischeTherapieToProzedurwerteMapper.class)
-        ).entrySet();
+        return Map.ofEntries(Map.entry("OS.Systemische Therapie", OsSystemischeTherapieToProzedurwerteMapper.class), Map.entry("OS.Systemische Therapie.VarianteUKW", OsSystemischeTherapieToProzedurwerteMapper.class)).entrySet();
     }
 
     @ParameterizedTest
@@ -57,11 +51,7 @@ public class DefaultSystemtherapieServiceTest {
     }
 
     private static Set<Map.Entry<String, String>> expectedFormnameMappings() {
-        return Map.ofEntries(
-                Map.entry("2011", "OS.Systemische Therapie.VarianteUKW"),
-                Map.entry("20119", "OS.Systemische Therapie.VarianteUKW"),
-                Map.entry("Defaultwert", "OS.Systemische Therapie")
-        ).entrySet();
+        return Map.ofEntries(Map.entry("2011", "OS.Systemische Therapie.VarianteUKW"), Map.entry("20119", "OS.Systemische Therapie.VarianteUKW"), Map.entry("Defaultwert", "OS.Systemische Therapie")).entrySet();
     }
 
     @ParameterizedTest
@@ -83,8 +73,9 @@ public class DefaultSystemtherapieServiceTest {
 
         var actual = service.getSystemischeTherapienFromDiagnose(1);
 
-        assertThat(actual).isNotNull();
-        assertThat(actual).isExactlyInstanceOf(ArrayList.class);
-        assertThat(actual).hasSize(1);
+        assertThat(actual)
+                .isNotNull()
+                .isExactlyInstanceOf(ArrayList.class)
+                .hasSize(1);
     }
 }
diff --git a/src/test/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java b/src/test/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java
index 8804a52..c3b154e 100644
--- a/src/test/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java
+++ b/src/test/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java
@@ -17,7 +17,7 @@ import java.util.Map;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(MockitoExtension.class)
-public class ProzedurToProzedurwerteMapperTest {
+class ProzedurToProzedurwerteMapperTest {
 
     private IOnkostarApi onkostarApi;
 
@@ -55,18 +55,12 @@ public class ProzedurToProzedurwerteMapperTest {
 
         assertThat(actual).isPresent();
 
-        assertThat(actual.get().get("Beginn"))
-                .isEqualTo(Date.from(Instant.parse("2023-01-01T00:00:00Z")).toString());
-        assertThat(actual.get().get("Ende"))
-                .isEqualTo(Date.from(Instant.parse("2023-01-31T00:00:00Z")).toString());
-        assertThat(actual.get().get("Beendigung"))
-                .isEqualTo("E");
-        assertThat(actual.get().get("Ergebnis"))
-                .isEqualTo("T");
-        assertThat(actual.get().get("Wirkstoffe"))
-                .isEqualTo("Testsubstanz, cyclophosphamide");
-        assertThat(actual.get().get("WirkstoffCodes"))
-                .isEqualTo(
+        assertThat(actual.get()).containsEntry("Beginn", Date.from(Instant.parse("2023-01-01T00:00:00Z")).toString());
+        assertThat(actual.get()).containsEntry("Ende", Date.from(Instant.parse("2023-01-31T00:00:00Z")).toString());
+        assertThat(actual.get()).containsEntry("Beendigung", "E");
+        assertThat(actual.get()).containsEntry("Ergebnis", "T");
+        assertThat(actual.get()).containsEntry("Wirkstoffe", "Testsubstanz, cyclophosphamide");
+        assertThat(actual.get()).containsEntry("WirkstoffCodes",
                         "[" +
                                 "{\"system\":\"other\",\"code\":\"Testsubstanz\",\"substance\":\"Testsubstanz\"}," +
                                 "{\"system\":\"ATC\",\"code\":\"L01AA01\",\"substance\":\"cyclophosphamide\"}" +