Merge branch '6.1.x'

This commit is contained in:
Brian Clozel
2024-09-13 10:21:43 +02:00
2 changed files with 24 additions and 2 deletions

View File

@@ -39,6 +39,7 @@ import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.mail.MailParseException;
import org.springframework.mail.MailSendException;
import org.springframework.mail.SimpleMailMessage;
@@ -270,6 +271,25 @@ class JavaMailSenderTests {
assertThat(sender.transport.getSentMessages()).containsExactly(message.getMimeMessage());
}
@Test
void javaMailSenderWithMimeMessageHelperAndCustomResource() throws Exception {
sender.setHost("host");
sender.setUsername("username");
sender.setPassword("password");
MimeMessageHelper message = new MimeMessageHelper(sender.createMimeMessage(), true);
message.setTo("you@mail.org");
message.addInline("id", new ByteArrayResource(new byte[] {1, 2, 3}));
sender.send(message.getMimeMessage());
assertThat(sender.transport.getConnectedHost()).isEqualTo("host");
assertThat(sender.transport.getConnectedUsername()).isEqualTo("username");
assertThat(sender.transport.getConnectedPassword()).isEqualTo("password");
assertThat(sender.transport.isCloseCalled()).isTrue();
assertThat(sender.transport.getSentMessages()).containsExactly(message.getMimeMessage());
}
@Test
void javaMailSenderWithParseExceptionOnSimpleMessage() {
SimpleMailMessage simpleMessage = new SimpleMailMessage();