diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java index b4e3f19f94a151b974a720e229fa4db5f2a856f8..a0d085e824c2e4558caed9510b5e05b7dab81820 100644 --- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java +++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java @@ -8,6 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.List; +import java.util.function.Predicate; import org.grpcmock.springboot.AutoConfigureGrpcMock; import org.junit.jupiter.api.AfterEach; @@ -23,6 +24,7 @@ import org.springframework.test.context.ActiveProfiles; import de.ozgcloud.eingang.Application; import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc; +import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest; import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileResponse; import de.ozgcloud.vorgang.vorgang.GrpcCreateVorgangRequest; import de.ozgcloud.vorgang.vorgang.GrpcCreateVorgangResponse; @@ -79,7 +81,7 @@ class XtaITCase { void teardown() { try { expectOneVorgangCreateAndFinishCall(); - expectUploadCallForXmlRepresentations(); + expectTwoUploadCallsForXmlRepresentations(); } finally { xtaMocker.teardownServer(); resetMappings(); @@ -98,14 +100,15 @@ class XtaITCase { ); } - private void expectUploadCallForXmlRepresentations() { - // Expect two xml representations: xdomea.xml and antrag.xml + private void expectTwoUploadCallsForXmlRepresentations() { + Predicate<GrpcUploadBinaryFileRequest> hasXMLContentType = request -> + request.hasMetadata() && request + .getMetadata() + .getContentType() + .contains("xml"); verifyThat( calledMethod(BinaryFileServiceGrpc.getUploadBinaryFileAsStreamMethod()) - .withRequestsContaining(request -> - request.hasMetadata() && - request.getMetadata().getContentType().contains("xml") - ), + .withRequestsContaining(hasXMLContentType), times(2) ); } @@ -199,12 +202,12 @@ class XtaITCase { private GrpcEingang captureEingang() { return capturedRequestsFor( - calledMethod(VorgangServiceGrpc.getStartCreationMethod()) + calledMethod(VorgangServiceGrpc.getStartCreationMethod()) ) - .getFirst() - .requests() - .getFirst() - .getEingang(); + .getFirst() + .requests() + .getFirst() + .getEingang(); } }