From 51964f9040ebb207615d066949a176ecde7a9c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 8 Mar 2025 07:53:11 +0100 Subject: [PATCH] Polish --- .../transport/mail/MailIntegrationTest.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java index e859cd23..5e79ba7f 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java @@ -18,22 +18,18 @@ package org.springframework.ws.transport.mail; import com.icegreen.greenmail.spring.GreenMailBean; import com.icegreen.greenmail.util.GreenMailUtil; -import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.ws.client.core.WebServiceTemplate; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; -@ExtendWith(SpringExtension.class) -@ContextConfiguration("mail-applicationContext.xml") +@SpringJUnitConfig(locations = "mail-applicationContext.xml") public class MailIntegrationTest { @Autowired @@ -43,20 +39,20 @@ public class MailIntegrationTest { private WebServiceTemplate webServiceTemplate; @Test - public void testMailTransport() throws MessagingException { - - String content = ""; + public void testMailTransport() { + String content = """ + + + """; StringResult result = new StringResult(); this.webServiceTemplate.sendSourceAndReceiveToResult(new StringSource(content), result); - MimeMessage[] receivedMessages = this.greenMailBean.getGreenMail().getReceivedMessages(); - - assertThat(receivedMessages).hasSize(1); - - assertThat(GreenMailUtil.getAddressList(receivedMessages[0].getFrom())) - .isEqualTo("Spring-WS SOAP Client "); - assertThat(GreenMailUtil.getAddressList(receivedMessages[0].getAllRecipients())).isEqualTo("server@localhost"); - assertThat(GreenMailUtil.getBody(receivedMessages[0])).contains(content); + assertThat(receivedMessages).singleElement().satisfies((receivedMessage) -> { + assertThat(GreenMailUtil.getAddressList(receivedMessage.getFrom())) + .isEqualTo("Spring-WS SOAP Client "); + assertThat(GreenMailUtil.getAddressList(receivedMessage.getAllRecipients())).isEqualTo("server@localhost"); + assertThat(GreenMailUtil.getBody(receivedMessage)).containsIgnoringWhitespaces(content); + }); } }