From 5483f7a5c7a0885fc60db95047b72ff7da54fa36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Thu, 22 Feb 2024 09:53:32 +0100
Subject: [PATCH] changes proposed by reviewers.

---
 .../sdccc/tests/util/MdibHistorianTest.java   | 57 ++++++++++---------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/sdccc/src/test/java/com/draeger/medical/sdccc/tests/util/MdibHistorianTest.java b/sdccc/src/test/java/com/draeger/medical/sdccc/tests/util/MdibHistorianTest.java
index dcdc08d0..9c1be56a 100644
--- a/sdccc/src/test/java/com/draeger/medical/sdccc/tests/util/MdibHistorianTest.java
+++ b/sdccc/src/test/java/com/draeger/medical/sdccc/tests/util/MdibHistorianTest.java
@@ -7,6 +7,7 @@
 
 package com.draeger.medical.sdccc.tests.util;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -1000,7 +1001,6 @@ void testUniqueEpisodicReportBasedHistoryUntilTimestampRegressionWithOperationIn
         part.setSourceMds("sourceMds");
         report.getReportPart().add(part);
         report.setMdibVersion(numericMdibVersion);
-        report.setSequenceId(sequenceId);
         final Envelope soapMessage =
                 messageBuilder.createSoapMessageWithBody(ActionConstants.ACTION_OPERATION_INVOKED_REPORT, report);
 
@@ -1041,19 +1041,22 @@ private void testUniqueEpisodicReportBasedHistoryUntilTimestamp(final String seq
 
         final long timestamp = System.nanoTime();
 
-        // when
-        try (var result = historianUnderTest.uniqueEpisodicReportBasedHistoryUntilTimestamp(sequenceId, timestamp)) {
-            // then
-            RemoteMdibAccess lastMdib = null;
-            RemoteMdibAccess mdib = result.next();
-            while (mdib != null) {
-                if (lastMdib != null) {
-                    assertEquals(lastMdib, mdib); // nothing changed
+        // when & then
+        assertDoesNotThrow(() -> {
+            try (var result =
+                    historianUnderTest.uniqueEpisodicReportBasedHistoryUntilTimestamp(sequenceId, timestamp)) {
+                // then
+                RemoteMdibAccess lastMdib = null;
+                RemoteMdibAccess mdib = result.next();
+                while (mdib != null) {
+                    if (lastMdib != null) {
+                        assertEquals(lastMdib, mdib); // nothing changed
+                    }
+                    lastMdib = mdib;
+                    mdib = result.next();
                 }
-                lastMdib = mdib;
-                mdib = result.next();
             }
-        }
+        });
     }
 
     /**
@@ -1140,20 +1143,22 @@ void testEpisodicReportBasedHistory(final Envelope report, final String sequence
         messageStorageUtil.addInboundSecureHttpMessage(storage, buildMdibEnvelope(sequenceId, BigInteger.ZERO));
         messageStorageUtil.addInboundSecureHttpMessage(storage, report);
 
-        // when
-        try (MdibHistorian.HistorianResult historianResult =
-                historianUnderTest.episodicReportBasedHistory(sequenceId)) {
-            // then
-            RemoteMdibAccess lastMdib = null;
-            RemoteMdibAccess mdib = historianResult.next();
-            while (mdib != null) {
-                if (lastMdib != null) {
-                    assertEquals(lastMdib, mdib); // nothing changed
+        // when & then
+        assertDoesNotThrow(() -> {
+            try (MdibHistorian.HistorianResult historianResult =
+                    historianUnderTest.episodicReportBasedHistory(sequenceId)) {
+                // then
+                RemoteMdibAccess lastMdib = null;
+                RemoteMdibAccess mdib = historianResult.next();
+                while (mdib != null) {
+                    if (lastMdib != null) {
+                        assertEquals(lastMdib, mdib); // nothing changed
+                    }
+                    lastMdib = mdib;
+                    mdib = historianResult.next();
                 }
-                lastMdib = mdib;
-                mdib = historianResult.next();
             }
-        }
+        });
     }
 
     private static LocalizedText createLocalizedText(
@@ -1190,8 +1195,8 @@ private void testApplyReportOnStorage(
 
         when(mdibAccess.getMdibVersion()).thenReturn(mdibVersion);
 
-        // when
-        historianUnderTest.applyReportOnStorage(mdibAccess, report);
+        // when & then
+        assertDoesNotThrow(() -> historianUnderTest.applyReportOnStorage(mdibAccess, report));
     }
 
     Envelope buildMdibEnvelope(final String sequenceId, @Nullable final BigInteger mdibVersion) {