Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Bugfix/issue 263 update main tests scenarios #271

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import helpers.TestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.springframework.context.support.ResourceBundleMessageSource;
Expand All @@ -24,7 +23,6 @@

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.doThrow;

Expand Down Expand Up @@ -59,7 +57,7 @@ void sendPasswordRecoverCodeMailException() {
// given
MimeMessage mimeMessage = new MimeMessage((Session)null);
User user = getTestUser();
given(emailTemplateEngine.process(eq(""), any(Context.class)))
given(emailTemplateEngine.process(any(String.class), any(Context.class)))
.willReturn("HTML");
given(mailSender.createMimeMessage())
.willReturn(mimeMessage);
Expand All @@ -77,7 +75,7 @@ void sendPasswordSuccessfullyChangedMailException() {
// given
MimeMessage mimeMessage = new MimeMessage((Session)null);
User user = getTestUser();
given(emailTemplateEngine.process(eq(""), any(Context.class)))
given(emailTemplateEngine.process(any(String.class), any(Context.class)))
.willReturn("HTML");
given(mailSender.createMimeMessage())
.willReturn(mimeMessage);
Expand All @@ -95,7 +93,7 @@ void sendEmailConfirmedMailException() {
// given
MimeMessage mimeMessage = new MimeMessage((Session)null);
User user = getTestUser();
given(emailTemplateEngine.process(eq(""), any(Context.class)))
given(emailTemplateEngine.process(any(String.class), any(Context.class)))
.willReturn("HTML");
given(mailSender.createMimeMessage())
.willReturn(mimeMessage);
Expand All @@ -115,7 +113,7 @@ void sendEmailCreatedMailException() {
token.setToken("token");
MimeMessage mimeMessage = new MimeMessage((Session)null);
User user = getTestUser();
given(emailTemplateEngine.process(eq(""), any(Context.class)))
given(emailTemplateEngine.process(any(String.class), any(Context.class)))
.willReturn("HTML");
given(mailSender.createMimeMessage())
.willReturn(mimeMessage);
Expand Down
21 changes: 1 addition & 20 deletions service/src/test/java/helpers/TestUtils.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package helpers;

import com.myhome.configuration.properties.mail.EmailTemplateLocalizationProperties;
import com.myhome.configuration.properties.mail.EmailTemplateProperties;
import com.myhome.configuration.properties.mail.MailProperties;
import com.myhome.controllers.dto.PaymentDto;
import com.myhome.controllers.dto.UserDto;
Expand All @@ -19,7 +17,6 @@
import java.time.LocalDate;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -184,7 +181,7 @@ public static class MailPropertiesHelper {
public static MailProperties getTestMailProperties() {
MailProperties testMailProperties = new MailProperties();
testMailProperties.setHost("test host");
testMailProperties.setUsername("test username");
testMailProperties.setUsername("testUsername");
testMailProperties.setPassword("test password");
testMailProperties.setPort(0);
testMailProperties.setProtocol("test protocol");
Expand All @@ -193,22 +190,6 @@ public static MailProperties getTestMailProperties() {
return testMailProperties;
}

public static EmailTemplateProperties getTestMailTemplateProperties() {
EmailTemplateProperties testMailTemplate = new EmailTemplateProperties();
testMailTemplate.setPath("test path");
testMailTemplate.setEncoding("test encoding");
testMailTemplate.setMode("test mode");
testMailTemplate.setCache(false);
return testMailTemplate;
}

public static EmailTemplateLocalizationProperties getTestLocalizationMailProperties() {
EmailTemplateLocalizationProperties testTemplatesLocalization = new EmailTemplateLocalizationProperties();
testTemplatesLocalization.setPath("test path");
testTemplatesLocalization.setEncoding("test encodig");
testTemplatesLocalization.setCacheSeconds(0);
return testTemplatesLocalization;
}
}

public static class PaymentHelpers {
Expand Down