From e10005785ce58eb94f30c97160e3f99235bacc46 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Tue, 22 Oct 2024 16:42:20 +0200 Subject: [PATCH] OZG-6798 add mocked beans for it cases --- nachrichten-manager-server/pom.xml | 4 ++-- .../NachrichtenManagerTestApplication.java | 19 +++++++++++++++++++ .../nachrichten/email/MailServiceITCase.java | 14 +++++++++++--- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/nachrichten-manager-server/pom.xml b/nachrichten-manager-server/pom.xml index 652ded4..6243315 100644 --- a/nachrichten-manager-server/pom.xml +++ b/nachrichten-manager-server/pom.xml @@ -46,9 +46,9 @@ <jaxb-maven-plugin.version>3.0.1</jaxb-maven-plugin.version> <ozg-info-manager-interface.version>1.2.0</ozg-info-manager-interface.version> <bayernid-proxy-interface.version>0.1.0</bayernid-proxy-interface.version> - <vorgang-manager.version>2.15.0</vorgang-manager.version> + <vorgang-manager.version>2.17.0-SNAPSHOT</vorgang-manager.version> <muk-postfach.version>0.1.0-SNAPSHOT</muk-postfach.version> - <ozgcloud-starter.version>0.10.0</ozgcloud-starter.version> + <ozgcloud-starter.version>0.13.0-SNAPSHOT</ozgcloud-starter.version> </properties> <dependencies> diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/NachrichtenManagerTestApplication.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/NachrichtenManagerTestApplication.java index 86b957b..f9223e2 100644 --- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/NachrichtenManagerTestApplication.java +++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/NachrichtenManagerTestApplication.java @@ -1,8 +1,27 @@ package de.ozgcloud.nachrichten; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.ComponentScan; + +import de.ozgcloud.apilib.common.command.OzgCloudCommandService; +import de.ozgcloud.apilib.file.OzgCloudFileService; +import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService; +import de.ozgcloud.nachrichten.postfach.BinaryFileService; @SpringBootApplication +@ComponentScan(basePackages = "de.ozgcloud.*") public class NachrichtenManagerTestApplication { + @MockBean + private OzgCloudCommandService ozgCloudCommandService; + @MockBean + @Qualifier("mukPostfach_OzgCloudFileService") + private OzgCloudFileService ozgCloudFileService; + @MockBean + private GrpcOzgCloudFileService grpcOzgCloudFileService; + @MockBean + private BinaryFileService binaryFileService; + } diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailServiceITCase.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailServiceITCase.java index e223125..3d46051 100644 --- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailServiceITCase.java +++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailServiceITCase.java @@ -2,7 +2,7 @@ package de.ozgcloud.nachrichten.email; import static org.junit.jupiter.api.Assertions.*; -import jakarta.xml.bind.ValidationException; +import jakarta.validation.ConstraintViolationException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -26,11 +26,19 @@ class MailServiceITCase { class TestSendMail { @Test - void shouldThrowValidationException() { + void shouldThrowConstraintViolationException() { Executable callSendMailWithoutRecipients = () -> mailService .sendMail(MailSendRequestTestFactory.createBuilder().clearToAddresses().build()); - assertThrows(ValidationException.class, callSendMailWithoutRecipients); + assertThrows(ConstraintViolationException.class, callSendMailWithoutRecipients); + } + + @Test + void shouldNotThrowException() { + Executable callSendMailWithoutRecipients = () -> mailService + .sendMail(MailSendRequestTestFactory.create()); + + assertDoesNotThrow(callSendMailWithoutRecipients); } } } -- GitLab