diff --git a/nachrichten-manager-server/pom.xml b/nachrichten-manager-server/pom.xml index 652ded4f9986206c079989f9c01c09a08508bcf7..6243315c72d7ee16e4a7568860ead8297e306d7c 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 86b957b710938176bd6af8e304260d4b1308cd88..f9223e2c06d0e95349b37411fab49ec5d6bd6139 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 e2231251ff4e5a65d0fab723728219e5599237fa..3d46051a91c227c72e28b60ee5937d47bb5e360e 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); } } }