spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Polish contribution

Browse Source 
See gh-36626
This commit is contained in:
Sam Brannen
2026-04-08 16:08:09 +02:00
parent 4b0101a9dc
commit f78264d158
2 changed files with 17 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
+1 -2
View File
@@ -195,8 +195,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
target.setBcc(copy(getBcc())); target.setBcc(copy(getBcc()));
} }
if (this.sentDate != null) { if (this.sentDate != null) {
Date sentDate = this.sentDate; target.setSentDate((Date) this.sentDate.clone());
target.setSentDate((Date) sentDate.clone());
} }
if (getSubject() != null) { if (getSubject() != null) {
target.setSubject(getSubject()); target.setSubject(getSubject());
spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java
+16 -61
View File
@@ -21,11 +21,16 @@ import java.util.Date;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/** /**
* Tests for {@link SimpleMailMessage}.
*
* @author Dmitriy Kopylenko * @author Dmitriy Kopylenko
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Rick Evans * @author Rick Evans
@@ -98,7 +103,7 @@ class SimpleMailMessageTests {
assertThat(copy.getBcc()[0]).isEqualTo("us@mail.org"); assertThat(copy.getBcc()[0]).isEqualTo("us@mail.org");
} }
@Test @Test // gh-36626
void setSentDateStoresACopy() { void setSentDateStoresACopy() {
SimpleMailMessage message = new SimpleMailMessage(); SimpleMailMessage message = new SimpleMailMessage();
Date sentDate = new Date(1234L); Date sentDate = new Date(1234L);
@@ -109,7 +114,7 @@ class SimpleMailMessageTests {
assertThat(message.getSentDate()).isEqualTo(new Date(1234L)); assertThat(message.getSentDate()).isEqualTo(new Date(1234L));
} }
@Test @Test // gh-36626
void getSentDateReturnsACopy() { void getSentDateReturnsACopy() {
SimpleMailMessage message = new SimpleMailMessage(); SimpleMailMessage message = new SimpleMailMessage();
Date sentDate = new Date(1234L); Date sentDate = new Date(1234L);
@@ -121,7 +126,7 @@ class SimpleMailMessageTests {
assertThat(message.getSentDate()).isEqualTo(new Date(1234L)); assertThat(message.getSentDate()).isEqualTo(new Date(1234L));
} }
@Test @Test // gh-36626
void copyConstructorCopiesSentDate() { void copyConstructorCopiesSentDate() {
Date sentDate = new Date(1234L); Date sentDate = new Date(1234L);
SimpleMailMessage original = new SimpleMailMessage(); SimpleMailMessage original = new SimpleMailMessage();
@@ -138,16 +143,20 @@ class SimpleMailMessageTests {
assertThat(copy.getSentDate()).isEqualTo(new Date(1234L)); assertThat(copy.getSentDate()).isEqualTo(new Date(1234L));
} }
@Test @Test // gh-36626
void copyToCopiesSentDate() { void copyToCopiesSentDate() {
SimpleMailMessage source = new SimpleMailMessage(); SimpleMailMessage source = new SimpleMailMessage();
source.setSentDate(new Date(1234L)); source.setSentDate(new Date(1234L));
TestMailMessage target = new TestMailMessage(); MailMessage target = mock();
source.copyTo(target); source.copyTo(target);
assertThat(target.getSentDate()).isNotNull(); ArgumentCaptor<Date> dateCaptor = ArgumentCaptor.forClass(Date.class);
target.getSentDate().setTime(0L); verify(target).setSentDate(dateCaptor.capture());
Date copiedDate = dateCaptor.getValue();
assertThat(copiedDate).isNotNull();
copiedDate.setTime(0L);
assertThat(source.getSentDate()).isEqualTo(new Date(1234L)); assertThat(source.getSentDate()).isEqualTo(new Date(1234L));
} }
@@ -220,58 +229,4 @@ class SimpleMailMessageTests {
assertThatIllegalArgumentException().isThrownBy(() -> new SimpleMailMessage().copyTo(null)); assertThatIllegalArgumentException().isThrownBy(() -> new SimpleMailMessage().copyTo(null));
} }
private static class TestMailMessage implements MailMessage {
private Date sentDate;
Date getSentDate() {
return this.sentDate;
}
@Override
public void setFrom(String from) {
}
@Override
public void setReplyTo(String replyTo) {
}
@Override
public void setTo(String to) {
}
@Override
public void setTo(String... to) {
}
@Override
public void setCc(String cc) {
}
@Override
public void setCc(String... cc) {
}
@Override
public void setBcc(String bcc) {
}
@Override
public void setBcc(String... bcc) {
}
@Override
public void setSentDate(Date sentDate) {
this.sentDate = sentDate;
}
@Override
public void setSubject(String subject) {
}
@Override
public void setText(String text) {
}
}
} }