From 94af1273328f9f85ed61489ed7ade35e9d9d54fe Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 25 Oct 2024 10:35:02 +0200
Subject: [PATCH] OZG-6798 apply code review comments
---
.../NachrichtenManagerTestApplication.java | 5 -----
.../email/MailSendRequestValidationTest.java | 10 +---------
.../ozgcloud/nachrichten/email/MailServiceITCase.java | 3 +++
.../src/test/resources/application-itcase.yaml | 11 +----------
4 files changed, 5 insertions(+), 24 deletions(-)
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 f9223e2..a17534d 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,13 +1,11 @@
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
@@ -17,11 +15,8 @@ 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/MailSendRequestValidationTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailSendRequestValidationTest.java
index 22d4392..a79763f 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailSendRequestValidationTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailSendRequestValidationTest.java
@@ -6,9 +6,7 @@ import static org.assertj.core.api.Assertions.*;
import jakarta.mail.util.ByteArrayDataSource;
import jakarta.validation.Validation;
import jakarta.validation.Validator;
-import jakarta.validation.ValidatorFactory;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -18,13 +16,7 @@ import de.ozgcloud.nachrichten.email.MailSendRequest.MailAttachment;
class MailSendRequestValidationTest {
- private Validator validator;
-
- @BeforeEach
- public void setUp() {
- ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
- validator = factory.getValidator();
- }
+ private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
@Nested
class TestToAddressesValidation {
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 3d46051..3708772 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
@@ -22,6 +22,9 @@ class MailServiceITCase {
@MockBean
private OzgCloudCallContextAttachingInterceptor interceptor;
+ @MockBean
+ private EmailGrpcService emailGrpcService;
+
@Nested
class TestSendMail {
diff --git a/nachrichten-manager-server/src/test/resources/application-itcase.yaml b/nachrichten-manager-server/src/test/resources/application-itcase.yaml
index cc10fcc..a99534b 100644
--- a/nachrichten-manager-server/src/test/resources/application-itcase.yaml
+++ b/nachrichten-manager-server/src/test/resources/application-itcase.yaml
@@ -2,18 +2,9 @@ grpc:
server:
port: -1
- client:
- command-manager:
- address: self:self
- negotiationType: PLAINTEXT
-
spring:
mail:
host: dummy
username: dummy
password: dummy
- port: -1
-
-ozgcloud:
- notification:
- mail-from: mailFrom
\ No newline at end of file
+ port: -1
\ No newline at end of file
--
GitLab