Skip to content

Commit

Permalink
changes proposed by reviewers.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ben-Draeger
ben-Draeger committed Feb 21, 2024
1 parent 6232841 commit ee64b6d
Showing 1 changed file with 128 additions and 51 deletions.
179 changes: 128 additions & 51 deletions sdccc/src/test/java/com/draeger/medical/sdccc/tests/util/MdibHistorianTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
import static org.mockito.Mockito.when;

import com.draeger.medical.biceps.model.message.EpisodicContextReport;
import com.draeger.medical.biceps.model.message.ObjectFactory;
import com.draeger.medical.biceps.model.message.InvocationError;
import com.draeger.medical.biceps.model.message.InvocationState;
import com.draeger.medical.biceps.model.participant.AlertActivation;
import com.draeger.medical.biceps.model.participant.Mdib;
import com.draeger.medical.biceps.model.participant.MetricAvailability;
Expand Down Expand Up @@ -81,9 +82,7 @@ public class MdibHistorianTest {
private static final String SCO_HANDLE = "sco_what?";
private static final String SET_STRING_HANDLE = "sadString";

private Injector historianInjector;
private MdibHistorianFactory historianFactory;
private Injector marshallingInjector;
private MessageStorageUtil messageStorageUtil;
private MessageBuilder messageBuilder;
private MessageStorage storage;
Expand All @@ -93,10 +92,10 @@ public class MdibHistorianTest {

@BeforeEach
void setUp() throws IOException {
historianInjector = TestClientUtil.createClientInjector();
final Injector historianInjector = TestClientUtil.createClientInjector();
historianFactory = historianInjector.getInstance(MdibHistorianFactory.class);

marshallingInjector = MarshallingUtil.createMarshallingTestInjector(true);
final Injector marshallingInjector = MarshallingUtil.createMarshallingTestInjector(true);
messageStorageUtil = marshallingInjector.getInstance(MessageStorageUtil.class);
messageBuilder = marshallingInjector.getInstance(MessageBuilder.class);
mdibBuilder = marshallingInjector.getInstance(MdibBuilder.class);
Expand Down Expand Up @@ -940,7 +939,7 @@ void testApplyReportOnStorageRegressionCalledWithOperationInvokedReport()
}

/**
* Tests if applyReportOnStorage() can gracefully ignore OperationInvokedReports.
* Tests if applyReportOnStorage() can gracefully ignore SystemErrorReports.
* NOTE: this is a regression test: before it was fixed, applyReportOnStorage() did fail with an Exception
* in this case.
* @throws ReportProcessingException - when applyReportOnStorage() throws it
Expand All @@ -966,29 +965,32 @@ void testApplyReportOnStorageRegressionCalledWithSystemErrorReport()
testApplyReportOnStorage(numericMdibVersion, sequenceId, report);
}

/**
* Tests if uniqueEpisodicReportBasedHistoryUntilTimestamp() gracefully ignores OperationInvokedReports.
* NOTE: this is a regression test as uniqueEpisodicReportBasedHistoryUntilTimestamp() failed in this case
* before.
* @throws ReportProcessingException - when thrown by uniqueEpisodicReportBasedHistoryUntilTimestamp()
* @throws JAXBException - when thrown by the MessageStorage
* @throws PreprocessingException - when thrown by uniqueEpisodicReportBasedHistoryUntilTimestamp()
* @throws IOException - when thrown by the MessageStorage
*/
@Test
void testUniqueEpisodicReportBasedHistoryUntilTimestampRegressionWithOperationInvokedReport()
throws ReportProcessingException, JAXBException, PreprocessingException, IOException {

final BigInteger numericMdibVersion = BigInteger.ZERO;
final String sequenceId = "abc";

final var messageObjectFactory = new ObjectFactory();
final var participantObjectFactory = new com.draeger.medical.biceps.model.participant.ObjectFactory();

final var report = messageObjectFactory.createOperationInvokedReport();
final var part = messageObjectFactory.createOperationInvokedReportReportPart();
final var invInfo = messageObjectFactory.createInvocationInfo();
invInfo.setInvocationError(com.draeger.medical.biceps.model.message.InvocationError.OTH);
invInfo.setInvocationState(com.draeger.medical.biceps.model.message.InvocationState.FAIL);
invInfo.setTransactionId(123);
final var report = messageBuilder.buildOperationInvokedReport(sequenceId);
final var part = messageBuilder.buildOperationInvokedReportReportPart();
final var invInfo = messageBuilder.buildInvocationInfo(123, InvocationState.FAIL);
invInfo.setInvocationError(InvocationError.OTH);
part.setInvocationInfo(invInfo);
part.setOperationTarget("opTarget");
part.setOperationHandleRef("opHandle");

final var invSrc = participantObjectFactory.createInstanceIdentifier();
final var type = participantObjectFactory.createCodedValue();
type.setCode("33");
final var invSrc = mdibBuilder.buildInstanceIdentifier();
final var type = mdibBuilder.buildCodedValue("33");
type.setCodingSystem("JOCS");
type.setCodingSystemVersion("2.0");
invSrc.setType(type);
Expand All @@ -1005,77 +1007,152 @@ void testUniqueEpisodicReportBasedHistoryUntilTimestampRegressionWithOperationIn
testUniqueEpisodicReportBasedHistoryUntilTimestamp(sequenceId, soapMessage);
}

/**
* Tests if uniqueEpisodicReportBasedHistoryUntilTimestamp() gracefully ignores SystemErrorReports.
* NOTE: this is a regression test as uniqueEpisodicReportBasedHistoryUntilTimestamp() failed in this case
* before.
* @throws ReportProcessingException - when thrown by uniqueEpisodicReportBasedHistoryUntilTimestamp()
* @throws JAXBException - when thrown by the MessageStorage
* @throws PreprocessingException - when thrown by uniqueEpisodicReportBasedHistoryUntilTimestamp()
* @throws IOException - when thrown by the MessageStorage
*/
@Test
void testUniqueEpisodicReportBasedHistoryUntilTimestampRegressionWithSystemErrorReport()
throws ReportProcessingException, JAXBException, PreprocessingException, IOException {

final String sequenceId = "abc";

final var part = messageBuilder.buildSystemErrorReportReportPart(mdibBuilder.buildCodedValue("97"));
final var report = messageBuilder.buildSystemErrorReport(sequenceId, List.of(part));
final Envelope soapMessage =
messageBuilder.createSoapMessageWithBody(ActionConstants.ACTION_SYSTEM_ERROR_REPORT, report);

testUniqueEpisodicReportBasedHistoryUntilTimestamp(sequenceId, soapMessage);
}

private void testUniqueEpisodicReportBasedHistoryUntilTimestamp(final String sequenceId, final Envelope soapMessage)
throws IOException, JAXBException, ReportProcessingException, PreprocessingException {
// given
final var mockObserver = mock(TestRunObserver.class);
final var historianUnderTest = historianFactory.createMdibHistorian(storage, mockObserver);

messageStorageUtil.addInboundSecureHttpMessage(storage, buildMdibEnvelope(sequenceId, BigInteger.ZERO));
messageStorageUtil.addInboundSecureHttpMessage(storage, soapMessage);

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
}
lastMdib = mdib;
mdib = result.next();
}
}
}

/**
* Tests if episodicReportBasedHistory() gracefully ignores OperationInvokedReports.
* NOTE: this is a regression test as episodicReportBasedHistory() failed in this case before.
* @throws ReportProcessingException - when thrown by episodicReportBasedHistory()
* @throws JAXBException - when thrown by the MessageStorage
* @throws PreprocessingException - when thrown by episodicReportBasedHistory()
* @throws IOException - when thrown by the MessageStorage
*/
@Test
void testEpisodicReportBasedHistoryRegressionWithOperationInvokedReport()
throws ReportProcessingException, JAXBException, PreprocessingException, IOException {

// given
final var messageObjectFactory = new ObjectFactory();
final var participantObjectFactory = new com.draeger.medical.biceps.model.participant.ObjectFactory();
final BigInteger numericMdibVersion = BigInteger.ZERO;
final String sequenceId = "abc";
final var report = messageObjectFactory.createOperationInvokedReport();
final var part = messageObjectFactory.createOperationInvokedReportReportPart();
final var invSrc = participantObjectFactory.createInstanceIdentifier();
final var report = messageBuilder.buildOperationInvokedReport(sequenceId);
final var part = messageBuilder.buildOperationInvokedReportReportPart();
final var invSrc = mdibBuilder.buildInstanceIdentifier();
invSrc.setRootName("rootName");
invSrc.setExtensionName("extName");
final var type = participantObjectFactory.createCodedValue();
type.setCode("33");
final var type = mdibBuilder.buildCodedValue("33");
type.setCodingSystem("JOCS");
type.setCodingSystemVersion("2.0");
invSrc.setType(type);
part.setInvocationSource(invSrc);
final var invInfo = messageObjectFactory.createInvocationInfo();
invInfo.setTransactionId(123);
invInfo.setInvocationError(com.draeger.medical.biceps.model.message.InvocationError.OTH);
invInfo.setInvocationState(com.draeger.medical.biceps.model.message.InvocationState.FAIL);
final var invInfo = messageBuilder.buildInvocationInfo(123, InvocationState.FAIL);
invInfo.setInvocationError(InvocationError.OTH);
part.setInvocationInfo(invInfo);
part.setOperationTarget("opTarget");
part.setOperationHandleRef("opHandle");
part.setSourceMds("sourceMds");

report.getReportPart().add(part);
report.setMdibVersion(numericMdibVersion);
report.setSequenceId(sequenceId);
final Envelope soapMessage =
messageBuilder.createSoapMessageWithBody(ActionConstants.ACTION_OPERATION_INVOKED_REPORT, report);

testEpisodicReportBasedHistory(soapMessage, sequenceId);
}

@SuppressWarnings({"EmptyBlock"})
void testEpisodicReportBasedHistory(final Envelope report, final String sequenceId)
throws ReportProcessingException, PreprocessingException, JAXBException, IOException {
final var mockObserver = mock(TestRunObserver.class);
final var historianUnderTest = historianFactory.createMdibHistorian(storage, mockObserver);
/**
* Tests if episodicReportBasedHistory() gracefully ignores SystemErrorReports.
* NOTE: this is a regression test as episodicReportBasedHistory() failed in this case before.
* @throws ReportProcessingException - when thrown by episodicReportBasedHistory()
* @throws JAXBException - when thrown by the MessageStorage
* @throws PreprocessingException - when thrown by episodicReportBasedHistory()
* @throws IOException - when thrown by the MessageStorage
*/
@Test
void testEpisodicReportBasedHistoryRegressionWithSystemErrorReport()
throws ReportProcessingException, JAXBException, PreprocessingException, IOException {

messageStorageUtil.addInboundSecureHttpMessage(storage, buildMdibEnvelope(sequenceId, BigInteger.ZERO));
messageStorageUtil.addInboundSecureHttpMessage(storage, report);
// given
final BigInteger numericMdibVersion = BigInteger.ZERO;
final String sequenceId = "abc";

try (MdibHistorian.HistorianResult historianResult =
historianUnderTest.episodicReportBasedHistory(sequenceId)) {
while (historianResult.next() != null) {
// query all of them
final var ignored = false; // make Checkstyle happy
}
}
final var part = messageBuilder.buildSystemErrorReportReportPart(mdibBuilder.buildCodedValue("97"));
final var report = messageBuilder.buildSystemErrorReport(sequenceId, List.of(part));
report.setMdibVersion(numericMdibVersion);

final Envelope soapMessage =
messageBuilder.createSoapMessageWithBody(ActionConstants.ACTION_OPERATION_INVOKED_REPORT, report);

testEpisodicReportBasedHistory(soapMessage, sequenceId);
}

/**
* Tests if episodicReportBasedHistory() gracefully ignores a given report.
* @param report - the report to ignore
* @param sequenceId - the sequenceId of the report
* @throws ReportProcessingException - when thrown by episodicReportBasedHistory()
* @throws JAXBException - when thrown by the MessageStorage
* @throws PreprocessingException - when thrown by episodicReportBasedHistory()
* @throws IOException - when thrown by the MessageStorage
*/
@SuppressWarnings({"EmptyBlock"})
private void testUniqueEpisodicReportBasedHistoryUntilTimestamp(final String sequenceId, final Envelope report)
void testEpisodicReportBasedHistory(final Envelope report, final String sequenceId)
throws ReportProcessingException, PreprocessingException, JAXBException, IOException {
// given
final var mockObserver = mock(TestRunObserver.class);
final var historianUnderTest = historianFactory.createMdibHistorian(storage, mockObserver);

messageStorageUtil.addInboundSecureHttpMessage(storage, buildMdibEnvelope(sequenceId, BigInteger.ZERO));
messageStorageUtil.addInboundSecureHttpMessage(storage, report);

final long timestamp = System.nanoTime();

try (var result = historianUnderTest.uniqueEpisodicReportBasedHistoryUntilTimestamp(sequenceId, timestamp)) {
while (result.next() != null) {
// query them all
final var ignored = false; // make Checkstyle happy
// 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
}
lastMdib = mdib;
mdib = historianResult.next();
}
}
}
Expand Down

0 comments on commit ee64b6d

Please sign in to comment.