This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f55d913a07d76fc918a92541665e6b98482afcab Author: Rene Cordier <[email protected]> AuthorDate: Wed Aug 21 15:02:03 2019 +0700 JAMES-2855 Using recursive comparaison on Mail with assertj upgrade --- .../transport/mailets/StripAttachmentTest.java | 5 ++++- .../org/apache/james/server/core/MailImplTest.java | 25 ++++++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java index 4d244c5..4eb7979 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java @@ -108,7 +108,10 @@ class StripAttachmentTest { mailet.service(mail); - assertThat(mail).isEqualToIgnoringGivenFields(expectedMail, "msg"); + assertThat(mail) + .usingRecursiveComparison() + .ignoringFields("msg") + .isEqualTo(expectedMail); assertThat(mail.getMessage().getContent()).isEqualTo("simple text"); } diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MailImplTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MailImplTest.java index 3e0811e..33a51d4 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MailImplTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MailImplTest.java @@ -95,7 +95,10 @@ public class MailImplTest extends ContractMailTest { .build(); MailImpl expected = newMail(); - assertThat(mail).isEqualToIgnoringGivenFields(expected, "sender", "name", "recipients", "lastUpdated"); + assertThat(mail) + .usingRecursiveComparison() + .ignoringFields("sender", "name", "recipients", "lastUpdated") + .isEqualTo(expected); assertThat(mail.getLastUpdated()).isCloseTo(new Date(), TimeUnit.SECONDS.toMillis(1)); } @@ -129,7 +132,10 @@ public class MailImplTest extends ContractMailTest { .mimeMessage(emptyMessage) .build(); - assertThat(mail).isEqualToIgnoringGivenFields(expected, "message", "lastUpdated"); + assertThat(mail) + .usingRecursiveComparison() + .ignoringFields("message", "lastUpdated") + .isEqualTo(expected); assertThat(mail.getLastUpdated()).isCloseTo(new Date(), TimeUnit.SECONDS.toMillis(1)); } @@ -155,7 +161,11 @@ public class MailImplTest extends ContractMailTest { MailImpl duplicate = MailImpl.duplicate(mail); - assertThat(duplicate).isNotSameAs(mail).isEqualToIgnoringGivenFields(mail, "message", "name"); + assertThat(duplicate) + .isNotSameAs(mail) + .usingRecursiveComparison() + .ignoringFields("message", "name") + .isEqualTo(mail); assertThat(duplicate.getName()).isNotEqualTo(name); assertThat(duplicate.getMessage().getInputStream()).hasSameContentAs(mail.getMessage().getInputStream()); } @@ -318,7 +328,8 @@ public class MailImplTest extends ContractMailTest { assertThat(unserialized) .isInstanceOf(MailImpl.class) - .isEqualToComparingFieldByField(mail); + .usingRecursiveComparison() + .isEqualTo(mail); } @Test @@ -339,7 +350,8 @@ public class MailImplTest extends ContractMailTest { assertThat(unserialized) .isInstanceOf(MailImpl.class) - .isEqualToComparingFieldByField(mail); + .usingRecursiveComparison() + .isEqualTo(mail); } @Test @@ -360,6 +372,7 @@ public class MailImplTest extends ContractMailTest { assertThat(unserialized) .isInstanceOf(MailImpl.class) - .isEqualToComparingFieldByField(mail); + .usingRecursiveComparison() + .isEqualTo(mail); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
